connectivity/source/drivers/mozab/MTable.cxx | 6 - connectivity/source/drivers/mozab/MTable.hxx | 1 oox/inc/oox/dump/dumperbase.hxx | 2 oox/inc/oox/ole/olehelper.hxx | 8 - oox/source/dump/dumperbase.cxx | 10 -- oox/source/ole/olehelper.cxx | 97 ---------------------- sc/source/filter/inc/biffhelper.hxx | 3 sc/source/filter/oox/biffhelper.cxx | 98 ----------------------- toolkit/inc/toolkit/controls/unocontrolmodel.hxx | 1 toolkit/inc/toolkit/helper/macros.hxx | 7 + toolkit/source/controls/unocontrolmodel.cxx | 8 - unusedcode.easy | 5 - vcl/inc/vcl/pdfwriter.hxx | 3 vcl/inc/vcl/slider.hxx | 1 vcl/source/control/slider.cxx | 19 ---- vcl/source/gdi/pdfwriter.cxx | 5 - vcl/source/gdi/pdfwriter_impl.cxx | 42 --------- vcl/source/gdi/pdfwriter_impl.hxx | 1 18 files changed, 6 insertions(+), 311 deletions(-)
New commits: commit aefbfc7101bb9b4ef20968d45306ab97573f6597 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Apr 7 15:53:56 2012 +0100 callcatcher: update and remove newly unused methods diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx index 755e4bd..47f7107 100644 --- a/connectivity/source/drivers/mozab/MTable.cxx +++ b/connectivity/source/drivers/mozab/MTable.cxx @@ -55,12 +55,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection) - :OTable_Base( _pTables, _pConnection, sal_True ) - ,m_pConnection( _pConnection ) -{ - construct(); -} // ------------------------------------------------------------------------- OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, const ::rtl::OUString& _Description ) diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx index 3cc6728..a47725f 100644 --- a/connectivity/source/drivers/mozab/MTable.hxx +++ b/connectivity/source/drivers/mozab/MTable.hxx @@ -44,7 +44,6 @@ namespace connectivity OConnection* m_pConnection; public: - OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection); OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, const ::rtl::OUString& _Name, diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx index 68df688..fb1ede5 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 933d4a5..c7f3960 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 1f1cbc2..0d8039d 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 dd9676e..dcd3982 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 ) { diff --git a/sc/source/filter/inc/biffhelper.hxx b/sc/source/filter/inc/biffhelper.hxx index 5f390fa..e22f3b4 100644 --- a/sc/source/filter/inc/biffhelper.hxx +++ b/sc/source/filter/inc/biffhelper.hxx @@ -641,9 +641,6 @@ public: */ static bool skipRecordBlock( BiffInputStream& rStrm, sal_uInt16 nEndRecId ); - /** Imports a picture from an IMGDATA record. */ - static void importImgData( StreamDataSequence& orDataSeq, BiffInputStream& rStrm, BiffType eBiff ); - private: BiffHelper(); // not implemented ~BiffHelper(); // not implemented diff --git a/sc/source/filter/oox/biffhelper.cxx b/sc/source/filter/oox/biffhelper.cxx index ec61539..b7241a9 100644 --- a/sc/source/filter/oox/biffhelper.cxx +++ b/sc/source/filter/oox/biffhelper.cxx @@ -69,84 +69,6 @@ union DecodedDouble inline explicit DecodedDouble( double fValue ) : mfValue( fValue ) {} }; -// ---------------------------------------------------------------------------- - -void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm, sal_Int32 nBytes, BiffType eBiff ) -{ - /* The IMGDATA record for bitmap format contains a Windows DIB (a bitmap - file without the 'BITMAPFILEHEADER' header structure). Usually, the DIB - header consists of 12 bytes (called 'OS/2 V1 header' or - 'BITMAPCOREHEADER', see http://en.wikipedia.org/wiki/BMP_file_format) - followed by the remaining pixel data, but the 'Windows V3' or - 'BITMAPINFOHEADER' is also supported here. This function creates a - complete 'BMP file' that can be read by the OOo graphic provider used - to import graphic objects. For that, the BITMAPFILEHEADER has to be - inserted before the DIB data, and it has to contain the correct offset - to the pixel data. Currently, in real life there are only 24-bit and - 32-bit DIBs (without color palette) in use. This code relies on this - fact and calculates the offset to the pixel data according to the size - of the DIB header. - Remaining tasks are (if really used somewhere): - - Support of DIBs with color palette, - - Support of 'Windows V4' and 'Windows V5' DIB header. */ - - // read and check validity of DIB header - sal_Int64 nInStrmPos = rStrm.tell(); - sal_Int32 nDibHdrSize = rStrm.readInt32(); - sal_uInt16 nPlanes = 0, nDepth = 0; - switch( nDibHdrSize ) - { - case BITMAPCOREHEADER_SIZE: - rStrm.skip( 4 ); // width/height as 16-bit integer - rStrm >> nPlanes >> nDepth; - break; - case BITMAPINFOHEADER_SIZE: - rStrm.skip( 8 ); // width/height as 32-bit integer - rStrm >> nPlanes >> nDepth; - break; - } - rStrm.seek( nInStrmPos ); - - if( (nPlanes == 1) && ((nDepth == 24) || (nDepth == 32)) ) - { - // allocate enough space for the BITMAPFILEHEADER and the DIB data - orDataSeq.realloc( BITMAPFILEHEADER_SIZE + nBytes ); - SequenceOutputStream aOutStrm( orDataSeq ); - - // write the BITMAPFILEHEADER of a regular BMP file - sal_Int32 nBmpSize = BITMAPFILEHEADER_SIZE + nBytes; - sal_Int32 nOffset = BITMAPFILEHEADER_SIZE + nDibHdrSize; - aOutStrm << sal_uInt16( 0x4D42 ) << nBmpSize << sal_Int32( 0 ) << nOffset; - - // copy the DIB header - rStrm.copyToStream( aOutStrm, nDibHdrSize ); - nBytes -= nDibHdrSize; - - /* Excel 3.x and Excel 4.x seem to write broken or out-dated DIB data. - Usually they write a BITMAPCOREHEADER containing width, height, - planes as usual. The pixel depth field is set to 32 bit (though - this is not allowed according to documentation). Between that - header and the actual pixel data, 3 unused bytes are inserted. This - does even confuse Excel 5.x and later, which cannot read the image - data correctly. */ - if( (eBiff <= BIFF4) && (nDibHdrSize == BITMAPCOREHEADER_SIZE) && (nDepth == 32) ) - { - // skip the dummy bytes in input stream - rStrm.skip( 3 ); - nBytes -= 3; - // correct the total BMP file size in output stream - sal_Int64 nOutStrmPos = aOutStrm.tell(); - aOutStrm.seek( 2 ); - aOutStrm << sal_Int32( nBmpSize - 3 ); - aOutStrm.seek( nOutStrmPos ); - } - - // copy remaining pixel data to output stream - rStrm.copyToStream( aOutStrm, nBytes ); - } - rStrm.seek( nInStrmPos + nBytes ); -} - } // namespace // ============================================================================ @@ -248,26 +170,6 @@ void lclImportImgDataDib( StreamDataSequence& orDataSeq, BiffInputStream& rStrm, return !rStrm.isEof() && (rStrm.getRecId() == nEndRecId); } -/*static*/ void BiffHelper::importImgData( StreamDataSequence& orDataSeq, BiffInputStream& rStrm, BiffType eBiff ) -{ - sal_uInt16 nFormat, nEnv; - sal_Int32 nBytes; - rStrm >> nFormat >> nEnv >> nBytes; - OSL_ENSURE( nBytes > 0, "BiffHelper::importImgData - invalid data size" ); - if( (0 < nBytes) && (nBytes <= rStrm.getRemaining()) ) - { - switch( nFormat ) - { -// case BIFF_IMGDATA_WMF: /* TODO */ break; - case BIFF_IMGDATA_DIB: lclImportImgDataDib( orDataSeq, rStrm, nBytes, eBiff ); break; -// case BIFF_IMGDATA_NATIVE: /* TODO */ break; - default: OSL_FAIL( "BiffHelper::importImgData - unknown image format" ); - } - } -} - -// ============================================================================ - } // namespace xls } // namespace oox diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx index 13c3b38..99722b7 100644 --- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx +++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx @@ -126,7 +126,6 @@ public: // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& GetUnoTunnelId() throw(); - static UnoControlModel* GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw(); sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::util::XCloneable diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index 7275b8a..b2acbf2 100644 --- a/toolkit/inc/toolkit/helper/macros.hxx +++ b/toolkit/inc/toolkit/helper/macros.hxx @@ -31,7 +31,7 @@ #include <comphelper/servicehelper.hxx> -#define IMPL_XUNOTUNNEL( ClassName ) \ +#define IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException) \ { \ if( ( rIdentifier.getLength() == 16 ) && ( 0 == rtl_compareMemory( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \ @@ -47,7 +47,10 @@ namespace \ const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() throw() \ { \ return the##ClassName##UnoTunnelId::get().getSeq(); \ -} \ +} + +#define IMPL_XUNOTUNNEL( ClassName ) \ +IMPL_XUNOTUNNEL_MINIMAL( ClassName ) \ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw() \ { \ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \ diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 75e7882..2d0a2fd 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -448,7 +448,7 @@ void UnoControlModel::ImplRegisterProperties( const std::list< sal_uInt16 > &rId } // ::com::sun::star::lang::XUnoTunnel -IMPL_XUNOTUNNEL( UnoControlModel ) +IMPL_XUNOTUNNEL_MINIMAL( UnoControlModel ) // XInterface IMPLEMENT_FORWARD_REFCOUNT( UnoControlModel, UnoControlModel_Base ) diff --git a/unusedcode.easy b/unusedcode.easy index e7ff3fb..4140104 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -294,8 +294,6 @@ TextEngine::GetLeftMargin() const TransferableDataHelper::GetInterface(com::sun::star::datatransfer::DataFlavor const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&) TypeDescriptor_Init_Impl::~TypeDescriptor_Init_Impl() UnoControlBase::UnoControlBase() -UnoControlModel::Clone() const -UnoControlModel::GetImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&) UnoControlModel::UnoControlModel() VCLUnoHelper::CreatePointer() VCLXDevice::IsCreatedWithToolkit() const @@ -758,7 +756,6 @@ connectivity::mozab::MQueryHelper::next() connectivity::mozab::MQueryHelper::rewind() connectivity::mozab::OCatalog::getDot() connectivity::mozab::OResultSet::initializeRow(rtl::Reference<connectivity::ODeleteVector<connectivity::ORowSetValue> >&, int) -connectivity::mozab::OTable::OTable(connectivity::sdbcx::OCollection*, connectivity::mozab::OConnection*) connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) connectivity::toString(com::sun::star::uno::Any const&) @@ -801,7 +798,6 @@ oox::core::FilterBase::requestEncryptionData(comphelper::IDocPasswordVerifier&) oox::dump::SequenceRecordObjectBase::construct(oox::dump::OutputObjectBase const&, oox::dump::BinaryInputStreamRef const&, oox::dump::String const&, oox::dump::String const&) oox::dump::StringHelper::appendRange(rtl::OUStringBuffer&, oox::dump::TokenRange const&, bool) oox::dump::StringHelper::appendRangeList(rtl::OUStringBuffer&, std::__debug::vector<oox::dump::Range, std::allocator<oox::dump::Range> > const&) -oox::ole::OleHelper::importStdHlink(oox::ole::StdHlinkInfo&, oox::BinaryInputStream&, bool) oox::xls::BiffAutoFilterContext::BiffAutoFilterContext(oox::xls::WorksheetHelper const&, oox::xls::AutoFilter&) oox::xls::BiffCodecHelper::implReadFilePass(oox::xls::BiffInputStream&, oox::xls::BiffType) oox::xls::BiffDrawingBase::importObj(oox::xls::BiffInputStream&) @@ -886,4 +882,3 @@ svxform::SvLBoxEntrySortedArray::Insert(SvLBoxEntry* const*, unsigned short) svxform::SvLBoxEntrySortedArray::Insert(svxform::SvLBoxEntrySortedArray const*, unsigned short, unsigned short) svxform::SvLBoxEntrySortedArray::Remove(SvLBoxEntry* const&, unsigned short) sw::mark::MarkManager::dumpFieldmarks() const -vcl::PDFWriter::DrawPixel(Polygon const&, Color const*) diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index b14ebd5..cb6d271 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -763,9 +763,6 @@ The following structure describes the permissions used in PDF security void DrawPixel( const Point& rPt, const Color& rColor ); void DrawPixel( const Point& rPt ) { DrawPixel( rPt, Color( COL_TRANSPARENT ) ); } - void DrawPixel( const Polygon& rPts, const Color* pColors = NULL ); - void DrawPixel( const Polygon& rPts, const Color& rColor ) - { Push(); SetLineColor( rColor ); DrawPixel( rPts ); Pop(); } void DrawLine( const Point& rStartPt, const Point& rEndPt ); void DrawLine( const Point& rStartPt, const Point& rEndPt, diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx index c29959c..aadc70f 100644 --- a/vcl/inc/vcl/slider.hxx +++ b/vcl/inc/vcl/slider.hxx @@ -71,7 +71,6 @@ private: using Control::ImplInitSettings; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplInitSettings(); SAL_DLLPRIVATE void ImplUpdateRects( sal_Bool bUpdate = sal_True ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index dc79ca7..c49f4cb 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -104,25 +104,6 @@ Slider::Slider( Window* pParent, WinBits nStyle ) : // ----------------------------------------------------------------------- -void Slider::ImplLoadRes( const ResId& rResId ) -{ - Control::ImplLoadRes( rResId ); - - sal_Int16 nMin = ReadShortRes(); - sal_Int16 nMax = ReadShortRes(); - sal_Int16 nThumbPos = ReadShortRes(); - sal_Int16 nPage = ReadShortRes(); - sal_Int16 nStep = ReadShortRes(); - /* sal_Int16 nVisibleSize = */ ReadShortRes(); - - SetRange( Range( nMin, nMax ) ); - SetLineSize( nStep ); - SetPageSize( nPage ); - SetThumbPos( nThumbPos ); -} - -// ----------------------------------------------------------------------- - void Slider::ImplInitSettings() { Window* pParent = GetParent(); diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx index 41b8b95..8392dc1 100644 --- a/vcl/source/gdi/pdfwriter.cxx +++ b/vcl/source/gdi/pdfwriter.cxx @@ -186,11 +186,6 @@ void PDFWriter::DrawPixel( const Point& rPos, const Color& rColor ) pImplementation->drawPixel( rPos, rColor ); } -void PDFWriter::DrawPixel( const Polygon& rPts, const Color* pColors ) -{ - pImplementation->drawPixel( rPts, pColors ); -} - void PDFWriter::DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap ) { pImplementation->drawBitmap( rDestPt, rDestSize, rBitmap ); diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 243d728..953dc65 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -9131,48 +9131,6 @@ void PDFWriterImpl::drawPixel( const Point& rPoint, const Color& rColor ) setFillColor( aOldFillColor ); } -void PDFWriterImpl::drawPixel( const Polygon& rPoints, const Color* pColors ) -{ - MARK( "drawPixel with Polygon" ); - - updateGraphicsState(); - - if( m_aGraphicsStack.front().m_aLineColor == Color( COL_TRANSPARENT ) && ! pColors ) - return; - - sal_uInt16 nPoints = rPoints.GetSize(); - OStringBuffer aLine( nPoints*40 ); - aLine.append( "q " ); - if( ! pColors ) - { - appendNonStrokingColor( m_aGraphicsStack.front().m_aLineColor, aLine ); - aLine.append( ' ' ); - } - - OStringBuffer aPixel(32); - aPixel.append( ' ' ); - appendDouble( 1.0/double(getReferenceDevice()->ImplGetDPIX()), aPixel ); - aPixel.append( ' ' ); - appendDouble( 1.0/double(getReferenceDevice()->ImplGetDPIY()), aPixel ); - OString aPixelStr = aPixel.makeStringAndClear(); - for( sal_uInt16 i = 0; i < nPoints; i++ ) - { - if( pColors ) - { - if( pColors[i] == Color( COL_TRANSPARENT ) ) - continue; - - appendNonStrokingColor( pColors[i], aLine ); - aLine.append( ' ' ); - } - m_aPages.back().appendPoint( rPoints[i], aLine ); - aLine.append( aPixelStr ); - aLine.append( " re f\n" ); - } - aLine.append( "Q\n" ); - writeBuffer( aLine.getStr(), aLine.getLength() ); -} - class AccessReleaser { BitmapReadAccess* m_pAccess; diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index b5f1167..8e1ba1d 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -1231,7 +1231,6 @@ public: void drawPolyLine( const Polygon& rPoly, const PDFWriter::ExtLineInfo& rInfo ); void drawPixel( const Point& rPt, const Color& rColor ); - void drawPixel( const Polygon& rPts, const Color* pColors = NULL ); void drawRectangle( const Rectangle& rRect ); void drawRectangle( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); commit 3f2b771e5f53a7f079416ae6fc42625420b725d7 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Apr 7 13:25:05 2012 +0100 don't need this pure virtual impl diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index c58a88a..75e7882 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -155,12 +155,6 @@ UnoControlModel::UnoControlModel( const UnoControlModel& rModel ) { } -UnoControlModel* UnoControlModel::Clone() const -{ - OSL_FAIL( "UnoControlModel::Clone() ?!" ); - return NULL; -} - ::com::sun::star::uno::Sequence<sal_Int32> UnoControlModel::ImplGetPropertyIds() const { sal_uInt32 nIDs = maData.size();
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits