diff options
-rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 6 | ||||
-rw-r--r-- | dbaccess/source/ui/app/AppController.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inc/ReportController.hxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 6 | ||||
-rw-r--r-- | unusedcode.easy | 3 |
5 files changed, 8 insertions, 11 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 89cbc28b2068..3fd0762bcf87 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2315,16 +2315,16 @@ void OApplicationController::showPreviewFor(const ElementType _eType,const ::rtl //------------------------------------------------------------------------------ IMPL_LINK( OApplicationController, OnClipboardChanged, void*, EMPTYARG ) { - return OnInvalidateClipboard( NULL ); + OnInvalidateClipboard(); + return 0L; } //------------------------------------------------------------------------------ -IMPL_LINK(OApplicationController, OnInvalidateClipboard, void*, EMPTYARG) +void OApplicationController::OnInvalidateClipboard() { InvalidateFeature(ID_BROWSER_CUT); InvalidateFeature(ID_BROWSER_COPY); InvalidateFeature(ID_BROWSER_PASTE); InvalidateFeature(SID_DB_APP_PASTE_SPECIAL); - return 0L; } // ----------------------------------------------------------------------------- void OApplicationController::onCutEntry() diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index a0a13fe0ecb4..644de951d7c1 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -549,7 +549,7 @@ namespace dbaui virtual ::com::sun::star::uno::Any getCurrentSelection( Control& _rControl ) const; - DECL_LINK( OnInvalidateClipboard, void* ); + void OnInvalidateClipboard(); DECL_LINK( OnClipboardChanged, void* ); DECL_LINK( OnAsyncDrop, void* ); DECL_LINK( OnCreateWithPilot, void* ); diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 007b42d225fb..fa734c125e15 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -329,7 +329,7 @@ namespace rptui ,const ::com::sun::star::uno::Any& _aValue ,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _aArgs); - DECL_LINK( OnInvalidateClipboard, void* ); + void OnInvalidateClipboard(); DECL_LINK( OnClipboardChanged, void* ); DECL_LINK( OnExecuteReport, void* ); DECL_LINK( OnOpenHelpAgent, void* ); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 24a44f29cedb..ded47ec89da2 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2369,15 +2369,15 @@ void OReportController::groupChange( const uno::Reference< report::XGroup>& _xGr //------------------------------------------------------------------------------ IMPL_LINK( OReportController, OnClipboardChanged, void*, EMPTYARG ) { - return OnInvalidateClipboard( NULL ); + OnInvalidateClipboard(); + return 0; } //------------------------------------------------------------------------------ -IMPL_LINK(OReportController, OnInvalidateClipboard, void*, EMPTYARG) +void OReportController::OnInvalidateClipboard() { InvalidateFeature(SID_CUT); InvalidateFeature(SID_COPY); InvalidateFeature(SID_PASTE); - return 0L; } // ----------------------------------------------------------------------------- void OReportController::openPageDialog(const uno::Reference<report::XSection>& _xSection) diff --git a/unusedcode.easy b/unusedcode.easy index 33bfd14d380f..3c824f0a8ee9 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1536,7 +1536,6 @@ cppcanvas::internal::TransparencyGroupActionFactory::createTransparencyGroupActi cppcanvas::tools::modifyClip(com::sun::star::rendering::RenderState&, cppcanvas::internal::OutDevState const&, boost::shared_ptr<cppcanvas::Canvas> const&, Point const&, basegfx::B2DVector const*, double const*) cppcanvas::tools::modifyClip(com::sun::star::rendering::RenderState&, cppcanvas::internal::OutDevState const&, boost::shared_ptr<cppcanvas::Canvas> const&, basegfx::B2DHomMatrix const&) dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) -dbaui::OApplicationController::LinkStubOnInvalidateClipboard(void*, void*) dbaui::OFieldDescControl::LinkStubDelayedGrabFocus(void*, void*) dbaui::OTableDesignView::LinkStubSwitchHdl(void*, void*) dbaui::OTableEditorCtrl::LinkStubEntryNotFound(void*, void*) @@ -1590,7 +1589,6 @@ formula::FormulaTokenIterator::First() formula::ResourceManager::loadString(unsigned short, char const*, rtl::OUString const&) formula::StructPage::GetSelectedEntryText() formula::StructPage::GetSelectedToken() -framework::ShareableMutex::getShareableOslMutex() framework::TabWindow::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) framework::UIConfigElementWrapperBase::dispose() framework::UIElementWrapperBase::dispose() @@ -1771,7 +1769,6 @@ pyuno::Runtime::finalize() pyuno::importToGlobal(_object*, _object*, _object*) rptui::OFieldExpressionControl::LinkStubAsynchActivate(void*, void*) rptui::OFieldExpressionControl::LinkStubAsynchDeactivate(void*, void*) -rptui::OReportController::LinkStubOnInvalidateClipboard(void*, void*) salhelper::ORealDynamicLoader::acquire() salhelper::ORealDynamicLoader::getApi() const salhelper::ORealDynamicLoader::newInstance(salhelper::ORealDynamicLoader**, rtl::OUString const&, rtl::OUString const&) |