basctl/source/basicide/baside2.cxx | 5 ----- basctl/source/basicide/baside2.hxx | 2 -- connectivity/source/drivers/kab/KCatalog.cxx | 7 ------- connectivity/source/drivers/kab/KCatalog.hxx | 2 -- connectivity/source/drivers/kab/KTable.cxx | 7 ------- connectivity/source/drivers/kab/KTable.hxx | 1 - sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 5 +++-- sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 2 +- unusedcode.easy | 6 +----- 9 files changed, 5 insertions(+), 32 deletions(-)
New commits: commit 7887a4e0adb0d60e6b013808dc27eccddd1c0324 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Aug 22 11:46:50 2012 +0100 Resolves: rhbz#846775 Clipboard must be disposed before Selection Change-Id: I968bc6da85cd444d504b08f85300a1fe251cdeee diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 10ca623..ae9a6e9 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -110,10 +110,10 @@ SlideSorterController::SlideSorterController (SlideSorter& rSlideSorter) mpPageSelector(), mpFocusManager(), mpSlotManager(), - mpClipboard(), mpScrollBarManager(), mpCurrentSlideManager(), mpSelectionManager(), + mpClipboard(), mpInsertionIndicatorHandler(new InsertionIndicatorHandler(rSlideSorter)), mpAnimator(new Animator(rSlideSorter)), mpVisibleAreaManager(new VisibleAreaManager(rSlideSorter)), @@ -156,9 +156,9 @@ void SlideSorterController::Init (void) mpPageSelector.reset(new PageSelector(mrSlideSorter)); mpFocusManager.reset(new FocusManager(mrSlideSorter)); mpSlotManager.reset(new SlotManager(mrSlideSorter)); - mpClipboard.reset(new Clipboard(mrSlideSorter)); mpScrollBarManager.reset(new ScrollBarManager(mrSlideSorter)); mpSelectionManager.reset(new SelectionManager(mrSlideSorter)); + mpClipboard.reset(new Clipboard(mrSlideSorter)); mpScrollBarManager->LateInitialization(); @@ -202,6 +202,7 @@ SlideSorterController::~SlideSorterController (void) void SlideSorterController::Dispose (void) { mpInsertionIndicatorHandler->End(Animator::AM_Immediate); + mpClipboard.reset(); mpSelectionManager.reset(); mpAnimator->Dispose(); } diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index f456cb4..bf3d844 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -243,10 +243,10 @@ private: ::boost::scoped_ptr<PageSelector> mpPageSelector; ::boost::scoped_ptr<FocusManager> mpFocusManager; ::boost::shared_ptr<SlotManager> mpSlotManager; - ::boost::scoped_ptr<controller::Clipboard> mpClipboard; ::boost::scoped_ptr<ScrollBarManager> mpScrollBarManager; mutable ::boost::shared_ptr<CurrentSlideManager> mpCurrentSlideManager; ::boost::shared_ptr<SelectionManager> mpSelectionManager; + ::boost::scoped_ptr<controller::Clipboard> mpClipboard; ::boost::shared_ptr<InsertionIndicatorHandler> mpInsertionIndicatorHandler; ::boost::shared_ptr<Animator> mpAnimator; ::boost::scoped_ptr<VisibleAreaManager> mpVisibleAreaManager; commit 78b2d4d00dfaebb42417a527e01a33ef24e34b7b Author: Caolán McNamara <caol...@redhat.com> Date: Wed Aug 22 10:14:17 2012 +0100 callcatcher: update list Change-Id: Id297f32de5fba9d17fec89d2f8ea21c5d1a2a4bc diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 95201da..2475ef6 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -1417,11 +1417,6 @@ bool ModulWindow::IsReadOnly() return GetEditView() && GetEditView()->IsReadOnly(); } -void ModulWindow::SetLineNumberDisplay(bool b) -{ - aXEditorWindow.SetLineNumberDisplay(b); -} - bool ModulWindow::IsPasteAllowed() { bool bPaste = false; diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index 0319dd2..0ad755c 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -353,8 +353,6 @@ public: virtual void SetReadOnly (bool bReadOnly); virtual bool IsReadOnly(); - void SetLineNumberDisplay(bool); - StarBASIC* GetBasic() { XModule(); return xBasic; } SbModule* GetSbModule() { return xModule; } diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index e772300..7c5ec0d 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -54,7 +54,6 @@ void KabCatalog::refreshTables() { Reference< XRow > xRow(xResult,UNO_QUERY); ::rtl::OUString aName; - // const ::rtl::OUString& sDot = KabCatalog::getDot(); while (xResult->next()) { @@ -81,12 +80,6 @@ void KabCatalog::refreshGroups() void KabCatalog::refreshUsers() { } -// ------------------------------------------------------------------------- -const ::rtl::OUString& KabCatalog::getDot() -{ - static const ::rtl::OUString sDot = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(".")); - return sDot; -} // ----------------------------------------------------------------------------- // XTablesSupplier diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index 4ed8cce..e73dd4b 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -38,8 +38,6 @@ namespace connectivity inline KabConnection* getConnection() const { return m_pConnection; } - static const ::rtl::OUString& getDot(); - // implementation of the pure virtual methods virtual void refreshTables(); virtual void refreshViews(); diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx index 1a7689f..89c04ec 100644 --- a/connectivity/source/drivers/kab/KTable.cxx +++ b/connectivity/source/drivers/kab/KTable.cxx @@ -34,13 +34,6 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -KabTable::KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection) - : KabTable_TYPEDEF(_pTables, sal_True), - m_pConnection(_pConnection) -{ - construct(); -} -// ------------------------------------------------------------------------- KabTable::KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection, const ::rtl::OUString& _Name, diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx index 49d4f7b..63c33d1 100644 --- a/connectivity/source/drivers/kab/KTable.hxx +++ b/connectivity/source/drivers/kab/KTable.hxx @@ -37,7 +37,6 @@ namespace connectivity KabConnection* m_pConnection; public: - KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection); KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection, const ::rtl::OUString& _Name, diff --git a/unusedcode.easy b/unusedcode.easy index 984dff6..136657f 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -12,10 +12,8 @@ SvtSlideSorterBarOptions::AddListenerLink(Link const&) SvtSlideSorterBarOptions::RemoveListenerLink(Link const&) TextEngine::GetLeftMargin() const ThumbnailView::GetItemCount() const +ThumbnailView::ImplScroll(Point const&) ThumbnailView::InsertItem(unsigned short, BitmapEx const&, rtl::OUString const&, unsigned long) -ThumbnailView::LinkStubImplTimerHdl(void*, void*) -ThumbnailView::SetColCount(unsigned short) -ThumbnailView::SetLineCount(unsigned short) ThumbnailViewItemAcc::FireAccessibleEvent(short, com::sun::star::uno::Any const&, com::sun::star::uno::Any const&) ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&) VCLXPrinterServer::getImplementationId() @@ -24,7 +22,6 @@ VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction cons Window::PostUserEvent(unsigned long&, unsigned long, void*) X11SalGraphics::Clip(int&, int&, unsigned int&, unsigned int&, int&, int&) const XclExpPivotCache::GetFieldAcc(rtl::OUString const&) -basctl::ModulWindow::SetLineNumberDisplay(bool) binfilter::ImpSvtData::~ImpSvtData() binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer() binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize() @@ -42,7 +39,6 @@ binfilter::ScMySharedData::~ScMySharedData() binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short) binfilter::ShellResource::~ShellResource() binfilter::SoDll::~SoDll() -binfilter::String::Search(unsigned short const*, unsigned short) const binfilter::SvObjectServerList::Remove(SvGlobalName const&) binfilter::SvStringsISort::DeleteAndDestroy(unsigned short, unsigned short) binfilter::SvStringsISort::Seek_Entry(binfilter::String*, unsigned short*) const
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits