unusedcode.easy | 2 - vcl/inc/outfont.hxx | 3 -- vcl/inc/vcl/arrange.hxx | 1 vcl/inc/vcl/outdev.hxx | 14 ----------- vcl/inc/vcl/window.hxx | 16 ------------ vcl/source/gdi/outdev3.cxx | 52 ------------------------------------------ vcl/source/window/arrange.cxx | 12 --------- vcl/source/window/window4.cxx | 32 ------------------------- 8 files changed, 2 insertions(+), 130 deletions(-)
New commits: commit 190bfac40e1b7a3b32793ac82eb3e67aefd6c785 Author: Caolán McNamara <[email protected]> Date: Sat Oct 6 15:56:30 2012 +0100 callcatcher: update unused code list and drop more old-layouting unuseds Change-Id: I1096ea50a23040090c9ee2975a4165c6de238497 diff --git a/unusedcode.easy b/unusedcode.easy index 9b3b630..733c720 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -78,7 +78,7 @@ connectivity::mork::ProfileAccess::isProfileLocked(com::sun::star::mozilla::Mozi connectivity::mozab::MQueryHelper::next() connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, unsigned char) connectivity::sdbcx::OGroup::OGroup(unsigned char) -dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) +dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&) formula::FormulaTokenIterator::First() framework::OReadMenuDocumentHandler::getServiceFactory() jfw_plugin::VendorBase::createInstance() diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 90316bd..5d99723 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -317,7 +317,6 @@ namespace vcl // returns the index of the added label size_t addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> const& i_rElement, long i_nIndent = 0 ); - size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0, const Size& i_rElementMinSize = Size() ); }; class VCL_DLLPUBLIC Indenter : public WindowArranger diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 0de41b6..a70ff66 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -126,7 +126,6 @@ namespace dnd { namespace vcl { struct ControlLayoutData; - class WindowArranger; struct ExtWindowImpl; } @@ -1313,20 +1312,7 @@ public: // ExtImpl - // layouting - boost::shared_ptr< vcl::WindowArranger > getLayout(); - - /* add a child Window - addWindow will do the following things - - insert the passed window into the child list (equivalent to i_pWin->SetParent( this )) - - mark the window as "owned", meaning that the added Window will be destroyed by - the parent's desctructor. - This means: do not pass in member windows or stack objects here. Do not cause - the destructor of the added window to be called in any way. - - to avoid ownership pass i_bTakeOwnership as "false" - */ - void addWindow( Window* i_pWin, bool i_bTakeOwnership = true ); + // old layouting, in-process-of-removal /* return the identifier of this window */ diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx index 56ad168..d7f79a0 100644 --- a/vcl/source/window/arrange.cxx +++ b/vcl/source/window/arrange.cxx @@ -730,18 +730,6 @@ size_t LabelColumn::addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> return nIndex; } -size_t LabelColumn::addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent, const Size& i_rElementMinSize ) -{ - boost::shared_ptr< LabeledElement > xLabel( new LabeledElement( this, 1 ) ); - xLabel->setLabel( i_pLabel ); - xLabel->setBorders( 0, i_nIndent, 0, 0, 0 ); - xLabel->setElement( i_pElement ); - xLabel->setMinimumSize( 1, i_rElementMinSize ); - size_t nIndex = addChild( xLabel ); - resize(); - return nIndex; -} - // ---------------------------------------- // vcl::Indenter //----------------------------------------- diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx index f0d8f47..af22d66 100644 --- a/vcl/source/window/window4.cxx +++ b/vcl/source/window/window4.cxx @@ -100,38 +100,6 @@ void Window::ImplExtResize() } } -boost::shared_ptr< vcl::WindowArranger > Window::getLayout() -{ - boost::shared_ptr< vcl::WindowArranger > xRet; - vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - if( pImpl ) - { - if( ! pImpl->mxLayout.get() ) - { - pImpl->mxLayout.reset( new vcl::LabelColumn() ); - pImpl->mxLayout->setParentWindow( this ); - pImpl->mxLayout->setOuterBorder( -1 ); - } - xRet = pImpl->mxLayout; - } - - return xRet; -} - -void Window::addWindow( Window* i_pWin, bool i_bTakeOwnership ) -{ - vcl::ExtWindowImpl* pImpl = ImplGetExtWindowImpl(); - if( pImpl && i_pWin ) - { - vcl::ExtWindowImpl* pChildImpl = i_pWin->ImplGetExtWindowImpl(); - if( pChildImpl ) - { - i_pWin->SetParent( this ); - pChildImpl->mbOwnedByParent = i_bTakeOwnership; - } - } -} - Window* Window::findWindow( const rtl::OUString& i_rIdentifier ) const { if( getIdentifier() == i_rIdentifier ) commit 0f6dbd1b1762e0b273046a045eb902475fc6890b Author: Caolán McNamara <[email protected]> Date: Sat Oct 6 15:55:28 2012 +0100 callcatcher: GetKerningPair* is now unused since commit c4008ef54630b560792aa288437db1179ad96095 Change-Id: I0cef8db6b59774c804a6a5589f258a55bfc64592 diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index bb40f86..39bc2a2 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -269,9 +269,6 @@ private: // -------------------- // - ImplKernPairData - // -------------------- -// TODO: get rid of ImplKernPairData and use outdev.hxx's KerningPair struct -// the problem is that outdev.hxx is too high level for the device layers -// and outdev.hxx's customers depend on KerningPair being defined there struct ImplKernPairData { diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index e1721e9..fabeb78 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -134,17 +134,6 @@ struct ImplThresholdRes long mnThresPixToLogY; // "" }; -// --------------- -// - KerningPair - -// --------------- - -struct KerningPair -{ - sal_Unicode nChar1; - sal_Unicode nChar2; - long nKern; -}; - // ---------------------- // - OutputDevice-Types - // ---------------------- @@ -650,9 +639,6 @@ public: static XubString GetNonMnemonicString( const XubString& rStr ) { xub_StrLen nDummy; return GetNonMnemonicString( rStr, nDummy ); } - sal_uLong GetKerningPairCount() const; - void GetKerningPairs( sal_uLong nPairs, KerningPair* pKernPairs ) const; - sal_Bool GetTextBoundRect( Rectangle& rRect, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index d0428a7..d743b4d 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -7624,58 +7624,6 @@ xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt, return nDropped; } - - -// ----------------------------------------------------------------------- - - -// TODO: best is to get rid of this method completely -sal_uLong OutputDevice::GetKerningPairCount() const -{ - OSL_TRACE( "OutputDevice::GetKerningPairCount()" ); - DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); - - if( mbNewFont && !ImplNewFont() ) - return 0; - if( mbInitFont ) - ImplInitFont(); - - if( mpPDFWriter && mpPDFWriter->isBuiltinFont( mpFontEntry->maFontSelData.mpFontData ) ) - return 0; - - // get the kerning pair count from the device layer - int nKernPairs = mpGraphics->GetKernPairs( 0, NULL ); - return nKernPairs; -} - -// ----------------------------------------------------------------------- - -inline bool CmpKernData( const KerningPair& a, const KerningPair& b ) -{ - return (a.nChar1 < b.nChar1) || ((a.nChar1 == b.nChar1) && (a.nChar2 < b.nChar2)); -} - -// TODO: best is to get rid of this method completely -void OutputDevice::GetKerningPairs( sal_uLong nRequestedPairs, KerningPair* pKernPairs ) const -{ - OSL_TRACE( "OutputDevice::GetKerningPairs()" ); - DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice ); - - if( mbNewFont && !ImplNewFont() ) - return; - if( mbInitFont ) - ImplInitFont(); - - if( mpPDFWriter && mpPDFWriter->isBuiltinFont( mpFontEntry->maFontSelData.mpFontData ) ) - return; - - // get the kerning pairs directly from the device layer - int nKernPairs = mpGraphics->GetKernPairs( nRequestedPairs, (ImplKernPairData*)pKernPairs ); - - // sort kerning pairs - std::sort( pKernPairs, pKernPairs+nKernPairs, CmpKernData ); -} - // ----------------------------------------------------------------------- sal_Bool OutputDevice::GetGlyphBoundRects( const Point& rOrigin, const String& rStr,
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
