diff options
Diffstat (limited to 'sfx2/source')
-rw-r--r-- | sfx2/source/appl/appbaslib.cxx | 12 | ||||
-rw-r--r-- | sfx2/source/appl/childwin.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/control/ctrlitem.cxx | 59 | ||||
-rw-r--r-- | sfx2/source/control/msgpool.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/control/request.cxx | 23 | ||||
-rw-r--r-- | sfx2/source/control/shell.cxx | 53 | ||||
-rw-r--r-- | sfx2/source/dialog/mailmodel.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/dialog/passwd.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/dialog/tabdlg.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/doc/docfile.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 35 | ||||
-rw-r--r-- | sfx2/source/doc/oleprops.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/inc/appbaslib.hxx | 5 | ||||
-rw-r--r-- | sfx2/source/notify/hintpost.cxx | 7 | ||||
-rw-r--r-- | sfx2/source/toolbox/tbxitem.cxx | 9 | ||||
-rw-r--r-- | sfx2/source/view/frame.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/view/ipclient.cxx | 21 | ||||
-rw-r--r-- | sfx2/source/view/viewfac.cxx | 5 | ||||
-rw-r--r-- | sfx2/source/view/viewfrm.cxx | 8 |
19 files changed, 0 insertions, 318 deletions
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index f630d8898124..a5b6e337ff6e 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -76,18 +76,6 @@ void SfxBasicManagerHolder::reset( BasicManager* _pBasicManager ) } } -bool SfxBasicManagerHolder::isAnyContainerModified() const -{ - OSL_PRECOND( isValid(), "SfxBasicManagerHolder::isAnyContainerModified: not initialized!" ); - - if ( mxBasicContainer.is() && mxBasicContainer->isModified() ) - return true; - if ( mxDialogContainer.is() && mxDialogContainer->isModified() ) - return true; - - return false; -} - void SfxBasicManagerHolder::storeAllLibraries() { OSL_PRECOND( isValid(), "SfxBasicManagerHolder::storeAllLibraries: not initialized!" ); diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 8a555d557e96..ab61c0f88872 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -534,22 +534,6 @@ FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const } } -SfxChildAlignment SfxChildWindowContext::GetAlignment() const -{ - Window *pParent = pWindow->GetParent(); - if ( pParent->GetType() == RSC_DOCKINGWINDOW ) - { - return ((SfxDockingWindow*)pParent)->GetAlignment(); - } - else if ( pParent->GetType() == RSC_TOOLBOX ) - { - HACK(noch nicht verwendet und noch nicht implementiert); - return SFX_ALIGN_NOALIGNMENT; - } - else - return SFX_ALIGN_NOALIGNMENT; -} - void SfxChildWindowContext::Resizing( Size& ) { } diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index d6dda852fa89..905c9dd4976b 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -168,26 +168,6 @@ DBG_CHKTHIS(SfxControllerItem, 0); pBindings->Register(*this); } -//==================================================================== - -void SfxControllerItem::UpdateSlot() - -/* [Description] - - Get the Status again. - - [Cross-reference] - - <SfxControllerItem::ClearCache()> -*/ - -{ - DBG_CHKTHIS(SfxControllerItem, 0); - DBG_ASSERT(pBindings, "No Bindings"); - - pBindings->Update( GetId() ); -} - //-------------------------------------------------------------------- void SfxControllerItem::ClearCache() @@ -382,45 +362,6 @@ SfxItemState SfxControllerItem::GetItemState : SFX_ITEM_AVAILABLE; } -//-------------------------------------------------------------------- - -SfxMapUnit SfxControllerItem::GetCoreMetric() const - -/* [Description] - - Gets the measurement unit from the competent pool, in which the Status - item exist. -*/ - -{ - SfxStateCache *pCache = pBindings->GetStateCache( nId ); - SfxDispatcher *pDispat = pBindings->GetDispatcher_Impl(); - - if ( !pDispat ) - { - SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - if ( !pViewFrame ) - SfxViewFrame::GetFirst(); - if ( pViewFrame ) - pDispat = pViewFrame->GetDispatcher(); - } - - if ( pDispat && pCache ) - { - const SfxSlotServer *pServer = pCache->GetSlotServer( *pDispat ); - if ( pServer ) - { - SfxShell *pSh = pDispat->GetShell( pServer->GetShellLevel() ); - SfxItemPool &rPool = pSh->GetPool(); - sal_uInt16 nWhich = rPool.GetWhich( nId ); - return rPool.GetMetric( nWhich ); - } - } - - DBG_WARNING( "W1: Can not find ItemPool!" ); - return SFX_MAPUNIT_100TH_MM; -} - //------------------------------------------------------------------------ #ifdef _MSC_VER diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx index 8b6cee9291b5..76b0e5e14dee 100644 --- a/sfx2/source/control/msgpool.cxx +++ b/sfx2/source/control/msgpool.cxx @@ -301,16 +301,6 @@ SfxInterface* SfxSlotPool::FirstInterface() //-------------------------------------------------------------------- -SfxInterface* SfxSlotPool::NextInterface() -{ - _nCurInterface++; - sal_uInt16 nFirstInterface = _pParentPool ? _pParentPool->_pInterfaces->size() : 0; - if ( _nCurInterface < nFirstInterface ) - return (*_pParentPool->_pInterfaces)[_nCurInterface]; - sal_uInt16 nInterface = _nCurInterface - nFirstInterface; - return nInterface < _pInterfaces->size() ? (*_pInterfaces)[nInterface] : 0; -} - const SfxSlot* SfxSlotPool::GetUnoSlot( const String& rName ) { const SfxSlot *pSlot = NULL; diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index d4a8786d32ee..2bdc5d16e3a0 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -870,29 +870,6 @@ sal_uInt16 SfxRequest::GetModifier() const //-------------------------------------------------------------------- -void SfxRequest::SetTarget( const String &rTarget ) - -/* [Description] - - With this method the recording of the target object can be implemented. - - [Example] - - The BASIC-Methode 'Open' is although executed by the Shell 'Application' - but recorded on the Objekt 'Documents' (global): - - rReq.SetTarget( "Documents" ); - - This then leads to: - - Documents.Open( ... ) -*/ - -{ - pImp->aTarget = rTarget; - pImp->bUseTarget = sal_True; -} - void SfxRequest::AllowRecording( sal_Bool bSet ) { pImp->bAllowRecording = bSet; diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index ecc5fb4cc03e..ecda3acd192c 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -308,45 +308,6 @@ const SfxPoolItem* SfxShell::GetItem //-------------------------------------------------------------------- -void SfxShell::RemoveItem -( - sal_uInt16 nSlotId // Slot-Id of the deleting <SfxPoolItem>s -) - -/* [Description] - - With this method the general available subclasses instances of - <cSfxPoolItem> from the SfxShell are removed. - - The stored instance is deleted. - - [Cross-reference] - - <SfxShell::PutItem(const SfxPoolItem&)> - <SfxShell::GetItem(sal_uInt16)> -*/ - -{ - for ( sal_uInt16 nPos = 0; nPos < pImp->aItems.Count(); ++nPos ) - if ( pImp->aItems.GetObject(nPos)->Which() == nSlotId ) - { - // Remove and delete Item - SfxPoolItem *pItem = pImp->aItems.GetObject(nPos); - delete pItem; - pImp->aItems.Remove(nPos); - - // if active, notify Bindings - SfxDispatcher *pDispat = GetDispatcher(); - if ( pDispat ) - { - SfxVoidItem aVoid( nSlotId ); - pDispat->GetBindings()->Broadcast( SfxPoolItemHint( &aVoid ) ); - } - } -} - -//-------------------------------------------------------------------- - void SfxShell::PutItem ( const SfxPoolItem& rItem /* Instance, of which a copy is created, @@ -430,20 +391,6 @@ SfxInterface* SfxShell::GetInterface() const //-------------------------------------------------------------------- -SfxBroadcaster* SfxShell::GetBroadcaster() - -/* [Description] - - Returns a SfxBroadcaster for this SfxShell instance until the class of - SfxShell is derived by SfxBroadcaster. -*/ - -{ - return pImp; -} - -//-------------------------------------------------------------------- - ::svl::IUndoManager* SfxShell::GetUndoManager() /* [Description] diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 0284df0bb5f4..73723b4b2bdd 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -307,11 +307,6 @@ SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( return eRet; } -sal_Int32 SfxMailModel::GetCount() const -{ - return maAttachedDocuments.size(); -} - sal_Bool SfxMailModel::IsEmpty() const { return maAttachedDocuments.empty(); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 98bcc1fe825f..d66d14281dfd 100644 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -224,15 +224,6 @@ void SfxPasswordDialog::SetMinLen( sal_uInt16 nLen ) // ----------------------------------------------------------------------- -void SfxPasswordDialog::SetMaxLen( sal_uInt16 nLen ) -{ - maPasswordED.SetMaxTextLen( nLen ); - maConfirmED.SetMaxTextLen( nLen ); - EditModifyHdl( NULL ); -} - -// ----------------------------------------------------------------------- - short SfxPasswordDialog::Execute() { maUserFT.Hide(); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index fece88584918..8fd76ed79929 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -620,17 +620,6 @@ void SfxTabDialog::SetApplyHandler(const Link& _rHdl) // ----------------------------------------------------------------------- -Link SfxTabDialog::GetApplyHandler() const -{ - DBG_ASSERT( pImpl->pApplyButton, "SfxTabDialog::GetApplyHandler: no button enabled!" ); - if ( !pImpl->pApplyButton ) - return Link(); - - return pImpl->pApplyButton->GetClickHdl(); -} - -// ----------------------------------------------------------------------- - void SfxTabDialog::EnableApplyButton(sal_Bool bEnable) { if ( IsApplyButtonEnabled() == bEnable ) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index c4685aba1e1e..c7e60dada5c4 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2959,12 +2959,6 @@ void SfxMedium::SetReferer( const String& rRefer ) { pImp->aReferer = rRefer; } -//---------------------------------------------------------------- - -const String& SfxMedium::GetReferer( ) const -{ - return pImp->aReferer; -} //---------------------------------------------------------------- diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 81da3e86da75..760869ffe58b 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -89,12 +89,6 @@ void SfxFrameDescriptor::SetURL( const String& rURL ) SetActualURL( aURL ); } -void SfxFrameDescriptor::SetURL( const INetURLObject& rURL ) -{ - aURL = rURL.GetMainURL( INetURLObject::DECODE_TO_IURI ); - SetActualURL( aURL ); -} - void SfxFrameDescriptor::SetActualURL( const String& rURL ) { aActualURL = INetURLObject(rURL); @@ -151,30 +145,11 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( sal_Bool bWithIds ) const return pFrame; } -sal_uInt16 SfxFrameDescriptor::GetWinBits() const -{ - sal_uInt16 nBits = 0; - if ( eSizeSelector == SIZE_REL ) - nBits |= SWIB_RELATIVESIZE; - if ( eSizeSelector == SIZE_PERCENT ) - nBits |= SWIB_PERCENTSIZE; - if ( !IsResizable() ) - nBits |= SWIB_FIXED; - if ( !nWidth ) - nBits |= SWIB_INVISIBLE; - return nBits; -} - sal_Bool SfxFrameDescriptor::HasFrameBorder() const { return (nHasBorder & BORDER_YES) != 0; } -long SfxFrameDescriptor::GetSize() const -{ - return nWidth; -} - void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper ) { DELETEZ( pImp->pWallpaper ); @@ -183,16 +158,6 @@ void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper ) pImp->pWallpaper = new Wallpaper( rWallpaper ); } -const Wallpaper* SfxFrameDescriptor::GetWallpaper() const -{ - return pImp->pWallpaper; -} - -sal_uInt16 SfxFrameDescriptor::GetItemPos() const -{ - return USHRT_MAX; -} - SfxFrameProperties& SfxFrameProperties::operator =( const SfxFrameProperties &rProp ) { diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 91d9c5bce5ac..9c111a05d2a8 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -181,7 +181,6 @@ class SfxOleString16Property : public SfxOleStringPropertyBase { public: explicit SfxOleString16Property( sal_Int32 nPropId ); - explicit SfxOleString16Property( sal_Int32 nPropId, const String& rValue ); private: virtual void ImplLoad( SvStream& rStrm ); @@ -216,8 +215,6 @@ class SfxOleDateProperty : public SfxOlePropertyBase { public: explicit SfxOleDateProperty( sal_Int32 nPropId ); - /** @param rDate Date as LOCAL time. */ - explicit SfxOleDateProperty( sal_Int32 nPropId, const util::Date& rDate ); /** Returns the date value as LOCAL time. */ inline const util::Date& GetValue() const { return maDate; } @@ -571,11 +568,6 @@ SfxOleString16Property::SfxOleString16Property( sal_Int32 nPropId ) : { } -SfxOleString16Property::SfxOleString16Property( sal_Int32 nPropId, const String& rValue ) : - SfxOleStringPropertyBase( nPropId, PROPTYPE_STRING16, RTL_TEXTENCODING_UCS2, rValue ) -{ -} - void SfxOleString16Property::ImplLoad( SvStream& rStrm ) { SetValue( LoadString16( rStrm ) ); @@ -648,12 +640,6 @@ SfxOleDateProperty::SfxOleDateProperty( sal_Int32 nPropId ) : { } -SfxOleDateProperty::SfxOleDateProperty( sal_Int32 nPropId, const util::Date& rDate ) : - SfxOlePropertyBase( nPropId, PROPTYPE_DATE ), - maDate( rDate ) -{ -} - void SfxOleDateProperty::ImplLoad( SvStream& rStrm ) { double fValue(0.0); diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx index dd47c79273aa..820102251d3d 100644 --- a/sfx2/source/inc/appbaslib.hxx +++ b/sfx2/source/inc/appbaslib.hxx @@ -73,11 +73,6 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::script::XLibraryContainer > getLibraryContainer( ContainerType _eType ); - /** determines whether any of our library containers is modified, i.e. returns <TRUE/> - in its isContainerModified call. - */ - bool isAnyContainerModified() const; - /** calls the storeLibraries at both our script and basic library container */ void storeAllLibraries(); diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx index aa69f37c15b9..3c849c5fe254 100644 --- a/sfx2/source/notify/hintpost.cxx +++ b/sfx2/source/notify/hintpost.cxx @@ -40,13 +40,6 @@ void SfxHintPoster::RegisterEvent() //-------------------------------------------------------------------- -SfxHintPoster::SfxHintPoster() -{ - RegisterEvent(); -} - -//-------------------------------------------------------------------- - SfxHintPoster::SfxHintPoster( const GenLink& rLink ): aLink(rLink) { diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 3f6ec91ac7f0..1cc71f228c51 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1286,15 +1286,6 @@ void SfxPopupWindow::AddStatusListener( const rtl::OUString& rCommandURL ) //-------------------------------------------------------------------- -void SfxPopupWindow::RemoveStatusListener( const rtl::OUString& rCommandURL ) -{ - GetOrCreateStatusListener(); - if ( m_xStatusListener.is() ) - m_pStatusListener->removeStatusListener( rCommandURL ); -} - -//-------------------------------------------------------------------- - sal_Bool SfxPopupWindow::Close() { m_bFloating = sal_False; diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index d2705599dd2c..2e1c16861f84 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -496,11 +496,6 @@ void SfxFrame::GetTargetList( TargetList& rList ) const //------------------------------------------------------------------------- -SfxBroadcaster& SfxFrame::GetBroadcaster() const -{ - return *pImp; -} - sal_Bool SfxFrame::IsParent( SfxFrame *pFrame ) const { SfxFrame *pParent = pParentFrame; @@ -703,11 +698,6 @@ SfxFrame* SfxFrameIterator::NextSibling_Impl( SfxFrame& rPrev ) return pRet; } -sal_Bool SfxFrame::IsTop() const -{ - return GetFrameInterface().is() ? GetFrameInterface()->isTop() : sal_False; -} - sal_Bool SfxFrame::HasComponent() const { return sal_False; diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 1f5d49dafaae..ac7dea2116e6 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -876,27 +876,6 @@ sal_Bool SfxInPlaceClient::IsObjectInPlaceActive() const } //-------------------------------------------------------------------- -sal_Bool SfxInPlaceClient::IsObjectActive() const -{ - try { - return ( m_pImp->m_xObject.is() && ( m_pImp->m_xObject->getCurrentState() == embed::EmbedStates::ACTIVE ) ); - } - catch( uno::Exception& ) - {} - - return sal_False; -} - -//-------------------------------------------------------------------- -Window* SfxInPlaceClient::GetActiveWindow( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject ) -{ - SfxInPlaceClient* pClient = GetClient( pDoc, xObject ); - if ( pClient ) - return pClient->GetEditWin(); - return NULL; -} - -//-------------------------------------------------------------------- SfxInPlaceClient* SfxInPlaceClient::GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject ) { for ( SfxViewFrame* pFrame = SfxViewFrame::GetFirst(pDoc); pFrame; pFrame=SfxViewFrame::GetNext(*pFrame,pDoc) ) diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx index 639495336ece..948811542633 100644 --- a/sfx2/source/view/viewfac.cxx +++ b/sfx2/source/view/viewfac.cxx @@ -73,10 +73,5 @@ SfxViewFactory::SfxViewFactory( SfxViewCtor fnC, SfxViewInit fnI, DBG_CTOR(SfxViewFactory, 0); } -SfxViewFactory::~SfxViewFactory() -{ - DBG_DTOR(SfxViewFactory, 0); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index e342fadc29c2..af22c83a823d 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1784,14 +1784,6 @@ sal_Bool SfxViewFrame::IsVisible() const } //-------------------------------------------------------------------- -void SfxViewFrame::Hide() -{ - GetWindow().Hide(); - if ( pImp->bObjLocked ) - LockObjectShell_Impl( sal_False ); -} - -//-------------------------------------------------------------------- void SfxViewFrame::LockObjectShell_Impl( sal_Bool bLock ) { DBG_ASSERT( pImp->bObjLocked != bLock, "Wrong Locked status!" ); |