diff options
-rw-r--r-- | dbaccess/source/ui/browser/brwctrlr.cxx | 137 | ||||
-rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 10 | ||||
-rw-r--r-- | desktop/source/app/cmdlineargs.hxx | 1 | ||||
-rw-r--r-- | editeng/inc/editeng/editview.hxx | 3 | ||||
-rw-r--r-- | editeng/source/editeng/editview.cxx | 16 | ||||
-rw-r--r-- | rsc/inc/rsclst.hxx | 1 | ||||
-rw-r--r-- | rsc/source/misc/rsclst.cxx | 6 | ||||
-rw-r--r-- | sfx2/inc/sfx2/basedlgs.hxx | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/dialog/basedlgs.cxx | 53 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 47 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 7 | ||||
-rw-r--r-- | starmath/inc/symbol.hxx | 3 | ||||
-rw-r--r-- | starmath/source/symbol.cxx | 14 | ||||
-rw-r--r-- | unusedcode.easy | 10 |
15 files changed, 0 insertions, 314 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index d2ca1ccedc5a..b43aa535bb98 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2840,143 +2840,6 @@ sal_Bool SbaXDataBrowserController::isValidCursor() const return bIsValid; } -//================================================================== -// LoadFormHelper -//================================================================== - -class LoadFormHelper :public ::cppu::WeakImplHelper2< ::com::sun::star::form::XLoadListener, - XRowSetListener> -{ - enum STATE { STARTED, LOADED, POSITIONED, DISPOSED }; - STATE m_eState; - - Reference< XRowSet > m_xForm; - - ::osl::Mutex m_aAccessSafety; - -public: - LoadFormHelper(const Reference< XRowSet > & _rxForm); - - // ::com::sun::star::form::XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException ); - virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException ); - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException ); - virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException ); - virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw( RuntimeException ); - - // XRowSetListener - virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw( RuntimeException ); - virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw( RuntimeException ); - virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw( RuntimeException ); - - // ::com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( RuntimeException ); - - void cancel(); - -protected: - ~LoadFormHelper(); - - void implDispose(); -}; - -DBG_NAME(LoadFormHelper) -//------------------------------------------------------------------------------ -LoadFormHelper::LoadFormHelper(const Reference< XRowSet > & _rxForm) - :m_eState(STARTED) - ,m_xForm(_rxForm) -{ - DBG_CTOR(LoadFormHelper,NULL); - - Reference< ::com::sun::star::form::XLoadable > (m_xForm, UNO_QUERY)->addLoadListener(this); - m_xForm->addRowSetListener(this); -} - -//------------------------------------------------------------------------------ -LoadFormHelper::~LoadFormHelper() -{ - ::osl::MutexGuard aGuard(m_aAccessSafety); - implDispose(); - - DBG_DTOR(LoadFormHelper,NULL); -} - -//------------------------------------------------------------------------------ -void LoadFormHelper::implDispose() -{ - if (DISPOSED != m_eState) - { - - Reference< ::com::sun::star::form::XLoadable > (m_xForm, UNO_QUERY)->removeLoadListener(this); - m_xForm->removeRowSetListener(this); - m_xForm = NULL; - m_eState = DISPOSED; - } -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::loaded(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException ) -{ - ::osl::MutexGuard aGuard(m_aAccessSafety); - OSL_ENSURE(m_eState == STARTED || m_eState == DISPOSED, "LoadFormHelper::loaded : wrong call !"); - if (m_eState == STARTED) - m_eState = LOADED; -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::unloaded(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException ) -{ - ::osl::MutexGuard aGuard(m_aAccessSafety); - OSL_FAIL("LoadFormHelper::unloaded : shouldn't be called !"); - implDispose(); -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::unloading(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException ) -{ -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::reloading(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException ) -{ -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::reloaded(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException ) -{ -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::cursorMoved(const ::com::sun::star::lang::EventObject& /*event*/) throw( RuntimeException ) -{ - ::osl::MutexGuard aGuard(m_aAccessSafety); - if (m_eState == LOADED) - m_eState = POSITIONED; -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::rowChanged(const ::com::sun::star::lang::EventObject& /*event*/) throw( RuntimeException ) -{ -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::rowSetChanged(const ::com::sun::star::lang::EventObject& /*event*/) throw( RuntimeException ) -{ -} - -//------------------------------------------------------------------------------ -void SAL_CALL LoadFormHelper::disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( RuntimeException ) -{ - ::osl::MutexGuard aGuard(m_aAccessSafety); - implDispose(); -} - -//------------------------------------------------------------------------------ -void LoadFormHelper::cancel() -{ - implDispose(); -} - // ----------------------------------------------------------------------------- sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() { diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 6885021718bc..f2555623c560 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -987,16 +987,6 @@ sal_Bool CommandLineArgs::IsEmpty() const return m_eArgumentCount == NONE; } -sal_Bool CommandLineArgs::IsEmptyOrAcceptOnly() const -{ - osl::MutexGuard aMutexGuard( m_aMutex ); - - return m_eArgumentCount == NONE || - ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_SPLASHPIPE ].getLength() )) || - ( ( m_eArgumentCount == ONE ) && ( m_aStrParams[ CMD_STRINGPARAM_ACCEPT ].getLength() )) || - ( ( m_eArgumentCount == ONE ) && m_aBoolParams[ CMD_BOOLPARAM_PSN ] ); -} - sal_Bool CommandLineArgs::WantsToLoadDocument() const { osl::MutexGuard aMutexGuard( m_aMutex ); diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index bd7e24a81147..9eb554cb172c 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -188,7 +188,6 @@ class CommandLineArgs // Special analyzed states (does not match directly to a command line parameter!) sal_Bool IsPrinting() const; sal_Bool IsEmpty() const; - sal_Bool IsEmptyOrAcceptOnly() const; private: enum Count { NONE, ONE, MANY }; diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx index 801a2dcbcf4a..09ad527f4a43 100644 --- a/editeng/inc/editeng/editview.hxx +++ b/editeng/inc/editeng/editview.hxx @@ -114,9 +114,6 @@ public: void SetSelection( const ESelection& rNewSel ); sal_Bool SelectCurrentWord( sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); - void IndentBlock(); - void UnindentBlock(); - sal_Bool IsInsertMode() const; void SetInsertMode( sal_Bool bInsert ); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 9f7b2c494d7d..57efd1e5f70d 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -665,22 +665,6 @@ sal_uInt16 EditView::GetParagraph( const Point& rMousePosPixel ) return nParagraph; } -void EditView::IndentBlock() -{ - DBG_CHKTHIS( EditView, 0 ); - DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); - - PIMPEE->IndentBlock( this, sal_True ); -} - -void EditView::UnindentBlock() -{ - DBG_CHKTHIS( EditView, 0 ); - DBG_CHKOBJ( pImpEditView->pEditEngine, EditEngine, 0 ); - - PIMPEE->IndentBlock( this, sal_False ); -} - EESelectionMode EditView::GetSelectionMode() const { DBG_CHKTHIS( EditView, 0 ); diff --git a/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx index 32d64d424006..d26cbb298180 100644 --- a/rsc/inc/rsclst.hxx +++ b/rsc/inc/rsclst.hxx @@ -42,7 +42,6 @@ protected: sal_Bool bVisible; public: - REResourceList(); REResourceList( REResourceList * pParentList, ByteString& rClassName, const RscId & rResourceID, diff --git a/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx index 132b0ae1bcd3..bd360abd1215 100644 --- a/rsc/source/misc/rsclst.cxx +++ b/rsc/source/misc/rsclst.cxx @@ -31,12 +31,6 @@ #include "rsclst.hxx" -REResourceList :: REResourceList() -{ - bVisible = sal_False; - pParent = NULL; -} - REResourceList :: REResourceList( REResourceList* pParentList, ByteString& rClassName, const RscId & rResourceID, sal_Bool bVis ) diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index a29c04eecfd7..14f4f17bcf66 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -196,9 +196,6 @@ public: void SetTabPage( SfxTabPage* pTabPage, GetTabPageRanges pRangesFunc = 0 ); SfxTabPage* GetTabPage() const { return pImpl->m_pSfxPage; } - const sal_uInt16* GetInputRanges( const SfxItemPool& rPool ); -// void SetInputSet( const SfxItemSet* pInSet ) { pOptions = pInSet; } -// const SfxItemSet* GetOutputItemSet() const { return pOutSet; } OKButton* GetOKButton() const { return pOKBtn; } CancelButton* GetCancelButton() const { return pCancelBtn; } void SetInfoLink( const Link& rLink ); diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index 40959524bc02..eecb8bea58e3 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -252,14 +252,12 @@ public: const TypeId* pType = 0, sal_Bool bOnlyVisible = sal_True ); static SfxObjectShell* Current(); - static sal_uInt16 Count(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > GetCurrentComponent(); static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); virtual void Invalidate(sal_uInt16 nId = 0); - void SetFlags( SfxObjectShellFlags eFlags ); SfxObjectShellFlags GetFlags( ) const ; SfxModule* GetModule() const; @@ -287,7 +285,6 @@ public: sal_Bool IsDocShared() const; ::rtl::OUString GetSharedFileURL() const; sal_Bool SwitchToShared( sal_Bool bShared, sal_Bool bSave ); - void DisconnectFromShared(); SAL_DLLPRIVATE void FreeSharedFile(); SAL_DLLPRIVATE void FreeSharedFile( const ::rtl::OUString& aTempFileURL ); SAL_DLLPRIVATE void DoNotCleanShareControlFile(); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 2635aba3f0d6..e1d90733c480 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -965,57 +965,4 @@ void SfxSingleTabDialog::SetInfoLink( const Link& rLink ) pImpl->m_aInfoLink = rLink; } -//-------------------------------------------------------------------- -// Comparison function for qsort - -extern "C" int SAL_CALL BaseDlgsCmpUS_Impl( const void* p1, const void* p2 ) -{ - return *(sal_uInt16*)p1 - *(sal_uInt16*)p2; -} - -// ----------------------------------------------------------------------- - -/* - Creates the set over the Page range. the page must register the static - method for querys on the range in SetTabPage, so the Set is delivered - onDemand. - */ -const sal_uInt16* SfxSingleTabDialog::GetInputRanges( const SfxItemPool& rPool ) -{ - if ( GetInputItemSet() ) - { - OSL_FAIL( "Set already exists!" ); - return GetInputItemSet()->GetRanges(); - } - - if ( pRanges ) - return pRanges; - SvUShorts aUS(16, 16); - - if ( fnGetRanges) - { - const sal_uInt16 *pTmpRanges = (fnGetRanges)(); - const sal_uInt16 *pIter = pTmpRanges; - sal_uInt16 nLen; - for ( nLen = 0; *pIter; ++nLen, ++pIter ) - ; - aUS.Insert( pTmpRanges, nLen, aUS.Count() ); - } - - //! Remove duplicate IDs? - sal_uInt16 nCount = aUS.Count(); - - for ( sal_uInt16 i = 0; i < nCount; ++i ) - aUS[i] = rPool.GetWhich( aUS[i]) ; - - // sort - if ( aUS.Count() > 1 ) - qsort( (void*)aUS.GetData(), aUS.Count(), sizeof(sal_uInt16), BaseDlgsCmpUS_Impl ); - - pRanges = new sal_uInt16[aUS.Count() + 1]; - memcpy( pRanges, aUS.GetData(), sizeof(sal_uInt16) * aUS.Count() ); - pRanges[aUS.Count()] = 0; - return pRanges; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index c559e61f4254..1594060befbd 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -618,48 +618,6 @@ sal_Bool SfxObjectShell::SwitchToShared( sal_Bool bShared, sal_Bool bSave ) //-------------------------------------------------------------------- -void SfxObjectShell::DisconnectFromShared() -{ - if ( IsDocShared() ) - { - if ( pMedium && pMedium->GetStorage().is() ) - { - // set medium to noname - pMedium->SetName( String(), sal_True ); - pMedium->Init_Impl(); - - // drop resource - SetNoName(); - InvalidateName(); - - // untitled document must be based on temporary storage - // the medium should not dispose the storage in this case - if ( pMedium->GetStorage() == GetStorage() ) - ConnectTmpStorage_Impl( pMedium->GetStorage(), pMedium ); - - pMedium->Close(); - FreeSharedFile(); - - SfxMedium* pTmpMedium = pMedium; - ForgetMedium(); - if( !DoSaveCompleted( pTmpMedium ) ) - SetError( ERRCODE_IO_GENERAL, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); - else - { - // the medium should not dispose the storage, DoSaveCompleted() has let it to do so - pMedium->CanDisposeStorage_Impl( sal_False ); - } - - pMedium->GetItemSet()->ClearItem( SID_DOC_READONLY ); - pMedium->SetOpenMode( SFX_STREAM_READWRITE, sal_True, sal_True ); - - SetTitle( String() ); - } - } -} - -//-------------------------------------------------------------------- - void SfxObjectShell::FreeSharedFile() { if ( pMedium ) @@ -1680,11 +1638,6 @@ SfxObjectShellFlags SfxObjectShell::GetFlags() const return pImp->eFlags; } -void SfxObjectShell::SetFlags( SfxObjectShellFlags eFlags ) -{ - pImp->eFlags = eFlags; -} - void SfxHeaderAttributes_Impl::SetAttributes() { bAlert = sal_True; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index fd1566b685c0..990eb6ec7e1c 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -856,13 +856,6 @@ void SfxObjectShell::InitBasicManager_Impl() //-------------------------------------------------------------------- -sal_uInt16 SfxObjectShell::Count() -{ - return SFX_APP()->GetObjectShells_Impl().Count(); -} - -//-------------------------------------------------------------------- - sal_Bool SfxObjectShell::DoClose() { return Close(); diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx index fab52c33b48a..d72df3416415 100644 --- a/starmath/inc/symbol.hxx +++ b/starmath/inc/symbol.hxx @@ -154,9 +154,6 @@ private: virtual void SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType); - void Init(); - void Exit(); - public: SmSymbolManager(); SmSymbolManager(const SmSymbolManager& rSymbolSetManager); diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index 21b9051d64b9..c3b8a7497dec 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -127,20 +127,6 @@ void SmSymbolManager::SFX_NOTIFY(SfxBroadcaster& /*rBC*/, const TypeId& rBCType, } -void SmSymbolManager::Init() -{ - SmModule *pp = SM_MOD(); - StartListening(*pp->GetConfig()); -} - - -void SmSymbolManager::Exit() -{ - SmModule *pp = SM_MOD(); - EndListening(*pp->GetConfig()); -} - - SmSymbolManager::SmSymbolManager() { m_bModified = false; diff --git a/unusedcode.easy b/unusedcode.easy index c88e255e193f..dd2473d7e3e6 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -144,14 +144,12 @@ EditView::Drop(DropEvent const&) EditView::GetDropPos() EditView::GetSelectionMode() const EditView::GetWordUnderMousePointer() const -EditView::IndentBlock() EditView::IsPasteEnabled() const EditView::MatchGroup() EditView::QueryDrop(DropEvent&) EditView::SetCursor(Cursor const&) EditView::SetParaAttribs(SfxItemSet const&, unsigned short) EditView::SetPointer(Pointer const&) -EditView::UnindentBlock() ElementCollector::isAbleToNotify() const ElementCollector::setSecurityId(int) EnhWMFReader::ReadGDIComment() @@ -830,9 +828,6 @@ SfxMedium::GetHdl() SfxMedium::GetReferer() const SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short) SfxNavigatorWrapper::GetChildWindowId() -SfxObjectShell::Count() -SfxObjectShell::DisconnectFromShared() -SfxObjectShell::SetFlags(unsigned int) SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*) SfxOleDateProperty::SfxOleDateProperty(int, com::sun::star::util::Date const&) SfxOleString16Property::SfxOleString16Property(int, String const&) @@ -890,8 +885,6 @@ Slider::SetRangeMax(long) Slider::SetRangeMin(long) Slider::Slider(Window*, ResId const&) SmFilterDetect::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&) -SmSymbolManager::Exit() -SmSymbolManager::Init() SortedPositions::Insert(SortedPositions const*, unsigned short, unsigned short) SortedPositions::Insert(unsigned int const&, unsigned short&) SortedPositions::Insert(unsigned int const*, unsigned short) @@ -2367,8 +2360,6 @@ cppu::createOneInstanceRegistryFactory(com::sun::star::uno::Reference<com::sun:: cppu::invokeStaticComponentFactory(void (*)(), rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&, rtl::OUString const&) dbaccess::ORowSetNotifier::getChangedBookmarks() const dbaccess::OptimisticSet::getComposedTableName(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&) -dbaui::LoadFormHelper::LoadFormHelper(com::sun::star::uno::Reference<com::sun::star::sdbc::XRowSet> const&) -dbaui::LoadFormHelper::cancel() dbaui::OApplicationController::LinkStubOnInvalidateClipboard(void*, void*) dbaui::OFieldDescControl::LinkStubDelayedGrabFocus(void*, void*) dbaui::OTableDesignView::LinkStubSwitchHdl(void*, void*) @@ -2383,7 +2374,6 @@ dbtools::StatementComposer::getDisposeComposer() const dbtools::getComposedRowSetStatement(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, unsigned char, 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::throwFunctionNotSupportedException(rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface> const&, com::sun::star::uno::Any const&) -desktop::CommandLineArgs::IsEmptyOrAcceptOnly() const desktop::Lockfile::clean() dlgprov::DialogProviderImpl::createControlModel() dp_info::singleton_entries(com::sun::star::uno::Reference<com::sun::star::registry::XRegistryKey> const&) |