diff options
-rw-r--r-- | editeng/inc/editeng/editeng.hxx | 1 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 6 | ||||
-rw-r--r-- | svx/inc/svx/sdrpagewindow.hxx | 1 | ||||
-rw-r--r-- | svx/inc/svx/svdobj.hxx | 2 | ||||
-rw-r--r-- | svx/inc/svx/svdpntv.hxx | 7 | ||||
-rw-r--r-- | svx/source/svdraw/sdrpagewindow.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdobj.cxx | 53 | ||||
-rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 6 | ||||
-rw-r--r-- | unusedcode.easy | 5 | ||||
-rw-r--r-- | vcl/inc/vcl/animate.hxx | 6 | ||||
-rw-r--r-- | vcl/source/gdi/animate.cxx | 8 |
11 files changed, 2 insertions, 97 deletions
diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index f23223e0e435..88111b3378d0 100644 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -320,7 +320,6 @@ public: void SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 ); void GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ); - void DoStretchChars( sal_uInt16 nX, sal_uInt16 nY ); void SetEditTextObjectPool( SfxItemPool* pPool ); SfxItemPool* GetEditTextObjectPool() const; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index cfbf1b845f63..b7b939739921 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2030,12 +2030,6 @@ void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) pImpEditEngine->GetCharStretching( rX, rY ); } -void EditEngine::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY ) -{ - DBG_CHKTHIS( EditEngine, 0 ); - pImpEditEngine->DoStretchChars( nX, nY ); -} - sal_Bool EditEngine::ShouldCreateBigTextObject() const { DBG_CHKTHIS( EditEngine, 0 ); diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index c073a91fd77f..7498c3278652 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -117,7 +117,6 @@ public: void PrepareRedraw(const Region& rReg); void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const; void RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const; - void PostPaint(); // Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...) void InvalidatePageWindow(const basegfx::B2DRange& rRange); diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index eeef220c33ee..1bac35e49232 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -1101,8 +1101,6 @@ public: // to use (0,0) as upper left and will be scaled to the given size in the matrix. virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); - sal_Bool IsTransparent( sal_Bool bCheckForAlphaChannel = sal_False ) const; - // #116168# // Give info if object is in destruction sal_Bool IsInDestruction() const; diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 927f96ca9e1e..761e5d3d056a 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -476,13 +476,6 @@ public: void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll); void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; - // Aufziehen eines animierten Rechtecks fuer Applikationsspeziefische - // Verwendung. Alle Positionsangaben in logischen View-Koordinaten. - // pOut bezeichnet das OutputDevice, in das animierte Rechteck dargestellt - // werden soll. Wird NULL uebergeben, wird es in allen an der View - // angemeldeten OutputDevices gleichzeitig dargestellt. - void MovEncirclement(const Point& rPnt); - // use this mode as mode to draw all internal GraphicManager objects with sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; } void SetGraphicManagerDrawMode( sal_uIntPtr nMode ) { nGraphicManagerDrawMode = nMode; } diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 5630043039f4..86d269e2eda6 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -193,10 +193,6 @@ void SdrPageWindow::PrePaint() } } -void SdrPageWindow::PostPaint() -{ -} - void SdrPageWindow::PrepareRedraw(const Region& rReg) { // evtl. give OC the chance to do ProcessDisplay preparations diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index be6700955f09..3340c2da4880 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2734,59 +2734,6 @@ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, S } } -sal_Bool SdrObject::IsTransparent( sal_Bool /*bCheckForAlphaChannel*/) const -{ - bool bRet = false; - - if( IsGroupObject() ) - { - SdrObjListIter aIter( *GetSubList(), IM_DEEPNOGROUPS ); - - for( SdrObject* pO = aIter.Next(); pO && !bRet; pO = aIter.Next() ) - { - const SfxItemSet& rAttr = pO->GetMergedItemSet(); - - if( ( ( (const XFillTransparenceItem&) rAttr.Get( XATTR_FILLTRANSPARENCE ) ).GetValue() || - ( (const XLineTransparenceItem&) rAttr.Get( XATTR_LINETRANSPARENCE ) ).GetValue() ) || - ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) && - ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) ) - { - bRet = sal_True; - } - else if( pO->ISA( SdrGrafObj ) ) - { - SdrGrafObj* pGrafObj = (SdrGrafObj*) pO; - if( ( (const SdrGrafTransparenceItem&) rAttr.Get( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() || - ( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP && pGrafObj->GetGraphic().GetBitmapEx().IsAlpha() ) ) - { - bRet = sal_True; - } - } - } - } - else - { - const SfxItemSet& rAttr = GetMergedItemSet(); - - if( ( ( (const XFillTransparenceItem&) rAttr.Get( XATTR_FILLTRANSPARENCE ) ).GetValue() || - ( (const XLineTransparenceItem&) rAttr.Get( XATTR_LINETRANSPARENCE ) ).GetValue() ) || - ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) && - ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) ) - { - bRet = sal_True; - } - else if( ISA( SdrGrafObj ) ) - { - SdrGrafObj* pGrafObj = (SdrGrafObj*) this; - - // #i25616# - bRet = pGrafObj->IsObjectTransparent(); - } - } - - return bRet; -} - void SdrObject::impl_setUnoShape( const uno::Reference< uno::XInterface >& _rxUnoShape ) { maWeakUnoShape = _rxUnoShape; diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 4e669395fb40..e88931ddf961 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -429,12 +429,6 @@ void SdrPaintView::SetActualWin(const OutputDevice* pWin) //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrPaintView::MovEncirclement(const Point&) -{ -} - -//////////////////////////////////////////////////////////////////////////////////////////////////// - void SdrPaintView::ClearPageView() { BrkAction(); diff --git a/unusedcode.easy b/unusedcode.easy index fc8834cc53a0..6bb28a255436 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -7,6 +7,8 @@ AtomPubSession::~AtomPubSession() BufferNode::childAt(int) const ByteString::Assign(char const*, unsigned short) ByteString::Assign(char) +ByteString::EraseLeadingChars(char) +ByteString::EraseTrailingChars(char) CIccCLUT::Interp3dTetra(float*, float const*) CIccCLUT::Iterate(IIccCLUTExec*) CIccFormulaCurveSegment::SetFunction(unsigned short, unsigned char, float*) @@ -397,7 +399,6 @@ ScHTMLColOffset_SAR::Replace(unsigned long const&, unsigned short) ScHTMLColOffset_SAR::Replace(unsigned long const*, unsigned short, unsigned short) ScHTMLColOffset_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned long const&, void*), void*) ScInputBarGroup::GainFocus() -ScInputBarGroup::LinkStubImpl_ScrollHdl(void*, void*) ScJobSetup::ScJobSetup(SfxPrinter*) ScLeftFooterEditPage::GetRanges() ScLeftHeaderEditPage::GetRanges() @@ -2028,7 +2029,6 @@ oox::ole::VbaProject::hasDialog(rtl::OUString const&) const oox::ole::VbaProject::hasModule(rtl::OUString const&) const oox::ole::VbaSiteModel::isVisible() const oox::ppt::PPTShape::findPlaceholder(int, int, std::__debug::vector<boost::shared_ptr<oox::drawingml::Shape>, std::allocator<boost::shared_ptr<oox::drawingml::Shape> > >&) -oox::ppt::lclDebugSubType(int) oox::vml::(anonymous namespace)::lclInsertTextFrame(oox::core::XmlFilterBase const&, com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&) oox::vml::(anonymous namespace)::lclSetXShapeRect(com::sun::star::uno::Reference<com::sun::star::drawing::XShape> const&, com::sun::star::awt::Rectangle const&) oox::xls::(anonymous namespace)::lclCalcEmu(oox::xls::UnitConverter const&, long, oox::xls::Unit) @@ -2225,7 +2225,6 @@ std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector() std::__cxx1998::vector<SotFactory*, std::allocator<SotFactory*> >::~vector() std::__cxx1998::vector<com::sun::star::datatransfer::DataFlavor*, std::allocator<com::sun::star::datatransfer::DataFlavor*> >::~vector() svgi::(anonymous namespace)::appendChar(std::basic_string<char, std::char_traits<char>, std::allocator<char> >&, char) -svgi::getTokenName(int) svx::SvxShowCharSetItem::~SvxShowCharSetItem() svxform::DataNavigatorManager::GetChildWindowId() svxform::FmFilterNavigatorWinMgr::GetChildWindowId() diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx index 956f63f330f8..c77587d29214 100644 --- a/vcl/inc/vcl/animate.hxx +++ b/vcl/inc/vcl/animate.hxx @@ -200,12 +200,6 @@ public: sal_Bool Start( OutputDevice* pOutDev, const Point& rDestPt, - long nExtraData = 0, - OutputDevice* pFirstFrameOutDev = NULL - ); - sal_Bool Start( - OutputDevice* pOutDev, - const Point& rDestPt, const Size& rDestSz, long nExtraData = 0, OutputDevice* pFirstFrameOutDev = NULL diff --git a/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx index b4de8f90df42..aba1f5379191 100644 --- a/vcl/source/gdi/animate.cxx +++ b/vcl/source/gdi/animate.cxx @@ -295,14 +295,6 @@ sal_uLong Animation::GetChecksum() const // ----------------------------------------------------------------------- -sal_Bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, long nExtraData, - OutputDevice* pFirstFrameOutDev ) -{ - return Start( pOut, rDestPt, pOut->PixelToLogic( maGlobalSize ), nExtraData, pFirstFrameOutDev ); -} - -// ----------------------------------------------------------------------- - sal_Bool Animation::Start( OutputDevice* pOut, const Point& rDestPt, const Size& rDestSz, long nExtraData, OutputDevice* pFirstFrameOutDev ) { |