diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-27 00:06:55 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-29 09:56:06 +0100 |
commit | fa19c5ec0844456a485cb7eb4a64f9d9c6d678bf (patch) | |
tree | a2426854601f2dff447fee8438badd1397959667 /sfx2 | |
parent | honour AR the same as CXX/CC (diff) | |
download | core-fa19c5ec0844456a485cb7eb4a64f9d9c6d678bf.tar.gz core-fa19c5ec0844456a485cb7eb4a64f9d9c6d678bf.zip |
callcatcher: various
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/inc/sfx2/frmdescr.hxx | 6 | ||||
-rw-r--r-- | sfx2/inc/sfx2/imgmgr.hxx | 3 | ||||
-rw-r--r-- | sfx2/inc/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | sfx2/inc/sfx2/progress.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/bastyp/progress.cxx | 58 | ||||
-rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 25 | ||||
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 11 | ||||
-rw-r--r-- | sfx2/source/doc/objxtor.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/toolbox/imgmgr.cxx | 15 |
9 files changed, 0 insertions, 129 deletions
diff --git a/sfx2/inc/sfx2/frmdescr.hxx b/sfx2/inc/sfx2/frmdescr.hxx index 168a30202ffd..a0748d65a94b 100644 --- a/sfx2/inc/sfx2/frmdescr.hxx +++ b/sfx2/inc/sfx2/frmdescr.hxx @@ -235,7 +235,6 @@ public: bHasBorderInherited( sal_True ), pFrame( 0 ) {} - SfxFrameProperties( const SfxFrameDescriptor *pD ); ~SfxFrameProperties() { delete pFrame; } int operator ==( const SfxFrameProperties& ) const; @@ -248,11 +247,6 @@ class SfxFrameDescriptorItem : public SfxPoolItem public: TYPEINFO(); - SfxFrameDescriptorItem ( const SfxFrameDescriptor *pD, const sal_uInt16 nId = SID_FRAMEDESCRIPTOR ) - : SfxPoolItem( nId ) - , aProperties( pD ) - {} - SfxFrameDescriptorItem ( const sal_uInt16 nId = SID_FRAMEDESCRIPTOR ) : SfxPoolItem( nId ) {} diff --git a/sfx2/inc/sfx2/imgmgr.hxx b/sfx2/inc/sfx2/imgmgr.hxx index de3c9b55ecfc..7cc90c0326bb 100644 --- a/sfx2/inc/sfx2/imgmgr.hxx +++ b/sfx2/inc/sfx2/imgmgr.hxx @@ -52,9 +52,6 @@ public: void RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF); void ReleaseToolBox( ToolBox *pBox ); - // get images from resources - void SetImages( ToolBox& rToolBox ); - void SetImages( ToolBox& rToolBox, bool bLarge ); void SetImagesForceSize( ToolBox& rToolBox, bool bLarge ); Image GetImage( sal_uInt16 nId, bool bLarge ) const; diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx index d1c58e3e2523..40959524bc02 100644 --- a/sfx2/inc/sfx2/objsh.hxx +++ b/sfx2/inc/sfx2/objsh.hxx @@ -395,7 +395,6 @@ public: void SetHeaderAttributesForSourceViewHack(); sal_Bool IsTemplate() const; - void SetTemplate(sal_Bool bIs); sal_Bool IsQueryLoadTemplate() const; sal_Bool IsUseUserData() const; @@ -570,7 +569,6 @@ public: String UpdateTitle( SfxMedium* pMed=NULL, sal_uInt16 nDocViewNo=0 ); static SfxObjectShell* CreateObject( const String& rServiceName, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); static SfxObjectShell* CreateObjectByFactoryName( const String& rURL, SfxObjectCreateMode = SFX_CREATE_MODE_STANDARD ); - static SfxObjectShell* CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame=0 ); static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame = NULL ); static SfxObjectShell* GetShellFromComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xComp ); diff --git a/sfx2/inc/sfx2/progress.hxx b/sfx2/inc/sfx2/progress.hxx index 4b1fb074e4b8..6eefe5382970 100644 --- a/sfx2/inc/sfx2/progress.hxx +++ b/sfx2/inc/sfx2/progress.hxx @@ -73,9 +73,6 @@ public: void Stop(); - void SetWaitMode( sal_Bool bWait ); - sal_Bool GetWaitMode() const; - static SfxProgress* GetActiveProgress( SfxObjectShell *pDocSh = 0 ); static void EnterLock(); static void LeaveLock(); diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx index 534abbfe8c89..2ea27dc1de01 100644 --- a/sfx2/source/bastyp/progress.cxx +++ b/sfx2/source/bastyp/progress.cxx @@ -541,64 +541,6 @@ void SfxProgress::Reschedule() // ----------------------------------------------------------------------- -void SfxProgress::SetWaitMode -( - sal_Bool bWait /* TRUE - - FALSE Wait-cursor not used */ -) - -/* [Description] - - Switch Wait-mode. -*/ - -{ - if( pImp->pActiveProgress ) return; - if ( !bSuspended && pImp->bWaitMode != bWait ) - { - if ( bWait ) - { - if ( pImp->xObjSh.Is() && !pImp->bAllDocs ) - { - for ( SfxViewFrame *pFrame = - SfxViewFrame::GetFirst(pImp->xObjSh); - pFrame; - pFrame = SfxViewFrame::GetNext( *pFrame, pImp->xObjSh ) ) - pFrame->GetWindow().EnterWait(); - } - } - else - { - if ( pImp->xObjSh.Is() && !pImp->bAllDocs ) - { - for ( SfxViewFrame *pFrame = - SfxViewFrame::GetFirst(pImp->xObjSh); - pFrame; - pFrame = SfxViewFrame::GetNext( *pFrame, pImp->xObjSh ) ) - pFrame->GetWindow().LeaveWait(); - } - } - } - - pImp->bWaitMode = bWait; -} - -// ----------------------------------------------------------------------- - -sal_Bool SfxProgress::GetWaitMode() const - -/* [Description] - - Get Wait-cursor mode. -*/ - -{ - return pImp->bWaitMode; -} - -// ----------------------------------------------------------------------- - SfxProgress* SfxProgress::GetActiveProgress ( SfxObjectShell* pDocSh /* the <SfxObjectShell>, which should be diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 51057306d26b..383c843ab158 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -201,31 +201,6 @@ sal_uInt16 SfxFrameDescriptor::GetItemPos() const return USHRT_MAX; } - -SfxFrameProperties::SfxFrameProperties( const SfxFrameDescriptor *pD ) - : aURL( pD->GetURL().GetMainURL( INetURLObject::DECODE_TO_IURI ) ) - , aName( pD->GetName() ) - , lMarginWidth( pD->GetMargin().Width() ) - , lMarginHeight( pD->GetMargin().Height() ) - , lSize( pD->GetWidth() ) - , lSetSize( SIZE_NOT_SET ) - , lFrameSpacing( SPACING_NOT_SET ) - , lInheritedFrameSpacing( SPACING_NOT_SET ) - , eScroll( pD->GetScrollingMode() ) - , eSizeSelector( pD->GetSizeSelector() ) - , eSetSizeSelector( SIZE_REL ) - , bHasBorder( pD->HasFrameBorder() ) - , bBorderSet( pD->IsFrameBorderSet() ) - , bResizable( pD->IsResizable() ) - , bSetResizable( sal_False ) - , bIsRootSet( sal_False ) - , bIsInColSet( sal_False ) - , bHasBorderInherited( sal_False ) - , pFrame( pD->Clone() ) -{ - bBorderSet = sal_True; -} - SfxFrameProperties& SfxFrameProperties::operator =( const SfxFrameProperties &rProp ) { diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 30205131d1ac..c559e61f4254 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -281,17 +281,6 @@ sal_Bool SfxObjectShell::IsTemplate() const //------------------------------------------------------------------------- -void SfxObjectShell::SetTemplate(sal_Bool bIs) -{ - pImp->bIsTemplate=bIs; - SfxFilterMatcher aMatcher( GetFactory().GetFactoryName() ); - SfxFilterMatcherIter aIter( aMatcher, SFX_FILTER_TEMPLATEPATH ); - SfxMedium* pMed = GetMedium(); - if( pMed ) pMed->SetFilter( aIter.First() ); -} - -//------------------------------------------------------------------------- - void SfxObjectShell::EnableSetModified( sal_Bool bEnable ) { #ifdef DBG_UTIL diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index afa666c168f2..fd1566b685c0 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -1072,12 +1072,6 @@ SfxObjectShell* SfxObjectShell::CreateObject( const String& rServiceName, SfxObj return 0; } -SfxObjectShell* SfxObjectShell::CreateAndLoadObject( const SfxItemSet& rSet, SfxFrame* pFrame ) -{ - Reference<lang::XComponent> xComp = CreateAndLoadComponent(rSet, pFrame); - return GetShellFromComponent(xComp); -} - Reference<lang::XComponent> SfxObjectShell::CreateAndLoadComponent( const SfxItemSet& rSet, SfxFrame* pFrame ) { uno::Sequence < beans::PropertyValue > aProps; diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index e6419cc09ee3..c9faccf1802d 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -400,15 +400,6 @@ void SfxImageManager::ReleaseToolBox( ToolBox *pBox ) } } -//------------------------------------------------------------------------- - -void SfxImageManager::SetImages( ToolBox& rToolBox, bool bLarge ) -{ - SetImagesForceSize( rToolBox, bLarge ); -} - -//------------------------------------------------------------------------- - void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, bool bLarge ) { ImageList* pImageList = pImp->GetImageList( bLarge ); @@ -436,10 +427,4 @@ void SfxImageManager::SetImagesForceSize( ToolBox& rToolBox, bool bLarge ) } } -void SfxImageManager::SetImages( ToolBox& rToolBox ) -{ - sal_Bool bLarge = ( pImp->m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE ); - SetImagesForceSize( rToolBox, bLarge ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |