cui/source/inc/transfrm.hxx | 1 cui/source/tabpages/transfrm.cxx | 64 ----------------- tools/inc/tools/contnr.hxx | 1 tools/source/memtools/contnr.cxx | 140 --------------------------------------- unusedcode.easy | 6 + vcl/inc/vcl/split.hxx | 3 vcl/source/window/split.cxx | 7 - 7 files changed, 5 insertions(+), 217 deletions(-)
New commits: commit 0c0d24589f167f5f77f3d955ebfa3fc807ad38c4 Author: Caolán McNamara <[email protected]> Date: Fri Aug 10 15:17:51 2012 +0100 callcatcher: reduce Container, update unused code list Change-Id: I11733daf2668c4142052ceb4498f5500e7e291ef diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index bb54fc7..cdcf618 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -157,7 +157,6 @@ private: DECL_LINK( ClickAutoHdl, void * ); void SetMaxSize( Rectangle aRect ); - Rectangle GetRect(); #endif public: diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 8f29c9d..57daf10 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1535,70 +1535,6 @@ void SvxPositionSizeTabPage::DisableProtect() //------------------------------------------------------------------------ -Rectangle SvxPositionSizeTabPage::GetRect() -{ - double fLeft(maRange.getMinX()); - double fTop(maRange.getMinY()); - double fRight(fLeft + (double)maMtrWidth.GetValue()); - double fBottom(fTop + (double)maMtrHeight.GetValue()); - - switch ( maCtlSize.GetActualRP() ) - { - case RP_LT: - { - break; - } - case RP_MT: - { - fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0; - break; - } - case RP_RT: - { - fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ); - break; - } - case RP_LM: - { - fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0; - break; - } - case RP_MM: - { - fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0; - fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0; - break; - } - case RP_RM: - { - fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ); - fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0; - break; - } - case RP_LB: - { - fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ); - break; - } - case RP_MB: - { - fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0; - fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ); - break; - } - case RP_RB: - { - fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ); - fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ); - break; - } - } - - return Rectangle(basegfx::fround(fLeft), basegfx::fround(fTop), basegfx::fround(fRight), basegfx::fround(fBottom)); -} - -//------------------------------------------------------------------------ - IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl) { if( maCbxScale.IsChecked() && maCbxScale.IsEnabled() ) diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx index 5096596..bf505f0 100644 --- a/tools/inc/tools/contnr.hxx +++ b/tools/inc/tools/contnr.hxx @@ -81,7 +81,6 @@ public: void* Replace( void* pNew, void* pOld ) { return Replace( pNew, GetPos( pOld ) ); } - void SetSize( sal_uIntPtr nNewSize ); sal_uIntPtr GetSize() const { return nCount; } sal_uIntPtr Count() const { return nCount; } diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx index 00c62aa..0b7c0d1 100644 --- a/tools/source/memtools/contnr.cxx +++ b/tools/source/memtools/contnr.cxx @@ -955,146 +955,6 @@ void* Container::Replace( void* p, sal_uIntPtr nIndex ) /************************************************************************* |* -|* Container::SetSize() -|* -*************************************************************************/ - -void Container::SetSize( sal_uIntPtr nNewSize ) -{ - DBG_CHKTHIS( Container, DbgCheckContainer ); - - if ( nNewSize ) - { - // Unterscheiden sich die Groessen - if ( nNewSize != nCount ) - { - CBlock* pTemp; - sal_uIntPtr nTemp; - - // Wird verkleinert - if ( nNewSize < nCount ) - { - pTemp = pFirstBlock; - nTemp = 0; - while ( (nTemp+pTemp->Count()) < nNewSize ) - { - nTemp += pTemp->Count(); - pTemp = pTemp->GetNextBlock(); - } - - // Alle folgenden Bloecke loeschen - sal_Bool bLast = sal_False; - CBlock* pDelNext; - CBlock* pDelBlock = pTemp->GetNextBlock(); - while ( pDelBlock ) - { - // Muss CurrentBlock umgesetzt werden - if ( pDelBlock == pCurBlock ) - bLast = sal_True; - pDelNext = pDelBlock->GetNextBlock(); - delete pDelBlock; - pDelBlock = pDelNext; - } - - // Block in der Groesse anpassen, oder bei Groesse 0 loeschen - if ( nNewSize > nTemp ) - { - pLastBlock = pTemp; - pTemp->SetNextBlock( NULL ); - pTemp->SetSize( (sal_uInt16)(nNewSize-nTemp) ); - } - else - { - pLastBlock = pTemp->GetPrevBlock(); - pLastBlock->SetNextBlock( NULL ); - delete pTemp; - } - - nCount = nNewSize; - if ( bLast ) - { - pCurBlock = pLastBlock; - nCurIndex = pCurBlock->Count()-1; - } - } - else - { - // Auf den letzen Puffer setzen - pTemp = pLastBlock; - nTemp = nNewSize - nCount; - - if ( !pTemp ) - { - // Muss mehr als ein Block angelegt werden - if ( nNewSize <= nBlockSize ) - { - pFirstBlock = new CBlock( (sal_uInt16)nNewSize, NULL ); - pLastBlock = pFirstBlock; - } - else - { - CBlock* pBlock1; - CBlock* pBlock2; - - pFirstBlock = new CBlock( nBlockSize, NULL ); - pBlock1 = pFirstBlock; - nNewSize -= nBlockSize; - - // Solange die Blockgroesse ueberschritten wird, neue Bloecke anlegen - while ( nNewSize > nBlockSize ) - { - pBlock2 = new CBlock( nBlockSize, pBlock1 ); - pBlock1->SetNextBlock( pBlock2 ); - pBlock1 = pBlock2; - nNewSize -= nBlockSize; - } - - pLastBlock = new CBlock( (sal_uInt16)nNewSize, pBlock1 ); - pBlock1->SetNextBlock( pLastBlock ); - } - - pCurBlock = pFirstBlock; - } - // Reicht es, den letzen Puffer in der Groesse anzupassen - else if ( (nTemp+pTemp->Count()) <= nBlockSize ) - pTemp->SetSize( (sal_uInt16)(nTemp+pTemp->Count()) ); - else - { - // Puffer auf max. Blockgroesse setzen - nTemp -= nBlockSize - pTemp->GetSize(); - pTemp->SetSize( nBlockSize ); - - CBlock* pTemp2; - // Solange die Blockgroesse ueberschritten wird, - // neue Bloecke anlegen - while ( nTemp > nBlockSize ) - { - pTemp2 = new CBlock( nBlockSize, pTemp ); - pTemp->SetNextBlock( pTemp2 ); - pTemp = pTemp2; - nTemp -= nBlockSize; - } - - // Den letzten Block anlegen - if ( nTemp ) - { - pLastBlock = new CBlock( (sal_uInt16)nTemp, pTemp ); - pTemp->SetNextBlock( pLastBlock ); - } - else - pLastBlock = pTemp; - } - - nCount = nNewSize; - } - } - } - else - Clear(); -} - -/************************************************************************* -|* |* Container::Clear() |* *************************************************************************/ diff --git a/unusedcode.easy b/unusedcode.easy index f69d520..abe2b56 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,5 +1,8 @@ +BasicDockingWindow::BasicDockingWindow(Window*, ResId const&) FontSelectPattern::FontSelectPattern(PhysicalFontFace const&, Size const&, float, int, bool) +PlaceEditDialog::GetResId(unsigned short) PopupMenu::SetSelectedEntry(unsigned short) +RtfAttributeOutput::WriteHex(int) SanExtensionImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char) SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) ScCompressedArray<int, unsigned char>::GetEntryCount() const @@ -22,7 +25,6 @@ SpinButton::SpinButton(Window*, ResId const&) StgCache::Pos2Page(int) SvtSlideSorterBarOptions::AddListenerLink(Link const&) SvtSlideSorterBarOptions::RemoveListenerLink(Link const&) -SvxPositionSizeTabPage::GetRect() TempFile::IsValid() const TextEngine::GetLeftMargin() const ThumbnailView::GetItemCount() const @@ -106,8 +108,10 @@ nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas: nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx::B2DRange const&, basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&) oox::drawingml::TextParagraphProperties::dump() const oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&) +sd::ImagePreparer::notesToHtml(unsigned int) sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) +sd::RemoteServer::pairClient() sd::ToolPanelPaneShell::RegisterInterface(SfxModule*) sd::ViewShellBase::RegisterFactory(unsigned short) std::__cxx1998::vector<SfxFilter*, std::allocator<SfxFilter*> >::~vector() diff --git a/vcl/inc/vcl/split.hxx b/vcl/inc/vcl/split.hxx index 3faa181..5a8999d 100644 --- a/vcl/inc/vcl/split.hxx +++ b/vcl/inc/vcl/split.hxx @@ -106,9 +106,6 @@ public: virtual void SetSplitPosPixel( long nPos ); long GetSplitPosPixel() const { return mnSplitPos; } - void SetLastSplitPosPixel( long nNewPos ); - long GetLastSplitPosPixel() const { return mnLastSplitPos; } - sal_Bool IsHorizontal() const { return mbHorzSplit; } // set the stepsize of the splitter for cursor movement diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index a13e4fa..ac2e9f7 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -507,13 +507,6 @@ void Splitter::SetSplitPosPixel( long nNewPos ) // ----------------------------------------------------------------------- -void Splitter::SetLastSplitPosPixel( long nNewPos ) -{ - mnLastSplitPos = nNewPos; -} - -// ----------------------------------------------------------------------- - void Splitter::StartDrag() { if ( IsTracking() )
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
