diff options
-rw-r--r-- | lotuswordpro/source/filter/lwpfilter.cxx | 5 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwpfilter.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/mnumgr.hxx | 4 | ||||
-rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 31 | ||||
-rw-r--r-- | unusedcode.easy | 27 |
5 files changed, 2 insertions, 67 deletions
diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index 99dd4ed05fd1..453322254758 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -181,11 +181,6 @@ void LWPFilterImportFilter::setTargetDocument( const uno::Reference< XComponent rImporter->setTargetDocument( xDoc ); } -OUString LWPFilterImportFilter::getImplementationName_Static() throw() -{ - return OUString(RTL_CONSTASCII_USTRINGPARAM( STR_IMPLEMENTATION_NAME )); -} - OUString LWPFilterImportFilter::getImplementationName() throw() { return OUString(RTL_CONSTASCII_USTRINGPARAM( STR_IMPLEMENTATION_NAME )); diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index c95619255ab4..8d50f3c54982 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -137,8 +137,6 @@ public: ~LWPFilterImportFilter(); public: - static OUString getImplementationName_Static() throw(); -public: /** * @descr see LWPFilterReader::filter. */ diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index e1fff9a494fb..58d412b35408 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -28,8 +28,6 @@ #ifndef _SFXMNUMGR_HXX #define _SFXMNUMGR_HXX -#include <stdarg.h> - #include <vcl/menu.hxx> #include <tools/wintypes.hxx> #include <tools/link.hxx> @@ -69,7 +67,6 @@ friend class SfxPopupMenuManager; protected: SfxMenuManager( Menu*, SfxBindings& ); - SfxMenuManager( const ResId&, SfxBindings& ); ~SfxMenuManager(); sal_uInt16 GetItemPos( sal_uInt16 nId ); sal_uInt32 GetType() { return nType; } @@ -114,7 +111,6 @@ public: static SfxPopupMenuManager* Popup( const ResId& rResId, SfxViewFrame* pFrame,const Point& rPoint, Window* pWindow ); sal_uInt16 Execute( const Point& rPos, Window *pWindow ); - sal_uInt16 Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ); void RemoveDisabledEntries(); Menu* GetSVMenu(); diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 454b2ee17d05..fc42a3e71e68 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -105,19 +105,6 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu ) } } -//------------------------------------------------------------------------- - -SfxMenuManager::SfxMenuManager( const ResId& rResId, SfxBindings &rBindings ) -: pMenu(0), - pOldMenu(0), - pBindings(&rBindings), - pResMgr(rResId.GetResMgr()), - nType( rResId.GetId() ) -{ - bAddClipboardFuncs = sal_False; - DBG_MEMTEST(); -} - //-------------------------------------------------------------------- SfxMenuManager::~SfxMenuManager() @@ -328,24 +315,6 @@ IMPL_LINK_INLINE_START( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG ) } IMPL_LINK_INLINE_END( SfxPopupMenuManager, SelectHdl, void *, EMPTYARG ) - -//-------------------------------------------------------------------- - -sal_uInt16 SfxPopupMenuManager::Execute( const Point& rPoint, Window* pWindow, va_list pArgs, const SfxPoolItem *pArg1 ) -{ - DBG_MEMTEST(); - - PopupMenu* pPopMenu = ( (PopupMenu*)GetMenu()->GetSVMenu() ); - pPopMenu->SetSelectHdl( LINK( this, SfxPopupMenuManager, SelectHdl ) ); - sal_uInt16 nId = pPopMenu->Execute( pWindow, rPoint ); - pPopMenu->SetSelectHdl( Link() ); - - if ( nId ) - GetBindings().GetDispatcher()->_Execute( nId, SFX_CALLMODE_RECORD, pArgs, pArg1 ); - - return nId; -} - //------------------------------------------------------------------------- SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) diff --git a/unusedcode.easy b/unusedcode.easy index 6322620364a5..d5fc25fafdd3 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,6 +1,5 @@ (anonymous namespace)::getState(std::vector<cppcanvas::internal::OutDevState, std::allocator<cppcanvas::internal::OutDevState> > const&) (anonymous namespace)::writeInfo(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&, rtl::OUString const&) -BasicIDEDLL::~BasicIDEDLL() BitmapEx::Draw(OutputDevice*, Point const&, Size const&, Point const&, Size const&) const BitmapLB::SelectEntryByList(XBitmapList const*, String const&, Bitmap const&) BitmapPalette::IsGreyPalette() const @@ -1334,7 +1333,6 @@ SvxMSConvertOCXControls::OCX_Factory(String const&) SvxMSConvertOCXControls::WriteOCXExcelKludgeStream(SotStorageStreamRef&, com::sun::star::uno::Reference<com::sun::star::awt::XControlModel> const&, com::sun::star::awt::Size const&, String&) SvxMSDffManager::GetAutoForm(MSO_SPT) const SvxMSDffManager::ImportFontWork(SvStream&, SfxItemSet&, Rectangle&) const -SvxMSDffManager::ReadObjText(SvStream&, SdrObject*) SvxMSDffManager::Scale(PolyPolygon&) const SvxMSDffManager::Scale(Rectangle&) const SvxMSDffShapeInfos::Insert(SvxMSDffShapeInfo* const&, unsigned short&) @@ -2688,29 +2686,8 @@ framework::UIElementWrapperBase::dispose() gcc3::RTTI::~RTTI() graphite2::Segment::append(graphite2::Segment const&) graphite2::Slot::update(int, int, graphite2::Position&) -graphite2::TtfUtil::FontAscent(void const*) -graphite2::TtfUtil::FontDescent(void const*) -graphite2::TtfUtil::FontOs2Style(void const*, bool&, bool&) -graphite2::TtfUtil::Get30EngFamilyInfo(void const*, unsigned long&, unsigned long&) -graphite2::TtfUtil::Get30EngFullFontInfo(void const*, unsigned long&, unsigned long&) -graphite2::TtfUtil::Get31EngFamilyInfo(void const*, unsigned long&, unsigned long&) -graphite2::TtfUtil::Get31EngFullFontInfo(void const*, unsigned long&, unsigned long&) -graphite2::TtfUtil::GetLangsForNames(void const*, int, int, int*, int, short*) -graphite2::TtfUtil::GlyfBox(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int&, int&, int&, int&) -graphite2::TtfUtil::GlyfContourCount(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, unsigned long&) -graphite2::TtfUtil::GlyfContourEndPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int*, unsigned long) -graphite2::TtfUtil::GlyfPoints(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*, int const*, unsigned long, int*, int*, bool*, unsigned long) -graphite2::TtfUtil::HeadTableCheckSum(void const*) -graphite2::TtfUtil::HeadTableCreateTime(void const*, unsigned int*, unsigned int*) -graphite2::TtfUtil::HeadTableModifyTime(void const*, unsigned int*, unsigned int*) -graphite2::TtfUtil::IsDeepComposite(unsigned short, void const*, void const*, unsigned long, long, void const*) -graphite2::TtfUtil::IsItalic(void const*) -graphite2::TtfUtil::LocaGlyphCount(unsigned long, void const*) -graphite2::TtfUtil::MaxCompositeComponentCount(void const*) -graphite2::TtfUtil::MaxCompositeLevelCount(void const*) -graphite2::TtfUtil::PostLookup(void const*, unsigned long, void const*, char const*) -graphite2::TtfUtil::SwapWString(void*, unsigned long) -graphite2::TtfUtil::TableIdTag(graphite2::TtfUtil::TableId) +graphite2::TtfUtil::GetNameInfo(void const*, int, int, int, int, unsigned long&, unsigned long&) +graphite2::TtfUtil::GlyfLookup(unsigned short, void const*, void const*, unsigned long, unsigned long, void const*) jfw_plugin::VendorBase::createInstance() jfw_plugin::VendorBase::getJavaExePaths(int*) jvmaccess::ClassPath::doLoadClass(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, void*, rtl::OUString const&, rtl::OUString const&) |