summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-08-24 22:31:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-08-25 09:42:06 +0100
commitac1530a37e4544378c22c9358e57ca8a596c1aa8 (patch)
treeb9380514932038897631b6e9f7e509c4fc7f8129 /sfx2
parent798496c5be43771ee478a0ee4288188b28583a8d (diff)
callcatcher: yet more unused code
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/sfx2/basedlgs.hxx2
-rw-r--r--sfx2/inc/sfx2/minarray.hxx4
-rw-r--r--sfx2/inc/sfx2/minstack.hxx2
-rw-r--r--sfx2/inc/sfx2/mnuitem.hxx3
-rw-r--r--sfx2/inc/sfx2/module.hxx2
-rw-r--r--sfx2/inc/sfx2/new.hxx13
-rw-r--r--sfx2/inc/sfx2/tbxctrl.hxx6
-rw-r--r--sfx2/inc/sfx2/viewfac.hxx1
-rw-r--r--sfx2/source/appl/module.cxx31
-rw-r--r--sfx2/source/bastyp/minarray.cxx20
-rw-r--r--sfx2/source/dialog/basedlgs.cxx19
-rw-r--r--sfx2/source/doc/new.cxx52
-rw-r--r--sfx2/source/menu/mnuitem.cxx21
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx35
-rw-r--r--sfx2/source/view/viewfac.cxx6
15 files changed, 0 insertions, 217 deletions
diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx
index 428e4865aa9c..a29c04eecfd7 100644
--- a/sfx2/inc/sfx2/basedlgs.hxx
+++ b/sfx2/inc/sfx2/basedlgs.hxx
@@ -109,8 +109,6 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog
protected:
SfxModelessDialog( SfxBindings*, SfxChildWindow*,
Window*, const ResId& );
- SfxModelessDialog( SfxBindings*, SfxChildWindow*,
- Window*, WinBits nWinStyle = WB_STDMODELESS );
~SfxModelessDialog();
virtual sal_Bool Close();
virtual void Resize();
diff --git a/sfx2/inc/sfx2/minarray.hxx b/sfx2/inc/sfx2/minarray.hxx
index d17151dbe273..bcaa79234fd3 100644
--- a/sfx2/inc/sfx2/minarray.hxx
+++ b/sfx2/inc/sfx2/minarray.hxx
@@ -324,7 +324,6 @@ public:
void*& GetObject( sal_uInt16 nPos ) { return operator[](nPos); }
void Insert( sal_uInt16 nPos, void* rElem );
void Append( void* rElem );
- sal_Bool Replace( void* pOldElem, void* pNewElem );
sal_Bool Remove( void* rElem );
sal_uInt16 Remove( sal_uInt16 nPos, sal_uInt16 nLen );
sal_uInt16 Count() const { return nUsed; }
@@ -371,9 +370,6 @@ public:\
void Append( T aElement ) {\
SfxPtrArr::Append((void *)aElement);\
}\
- sal_Bool Replace( T aOldElem, T aNewElem ) {\
- return SfxPtrArr::Replace((void *)aOldElem, (void*) aNewElem);\
- }\
void Remove( T aElement ) {\
SfxPtrArr::Remove((void*)aElement);\
}\
diff --git a/sfx2/inc/sfx2/minstack.hxx b/sfx2/inc/sfx2/minstack.hxx
index 4c98ec5ef0f2..5a64e31cbee1 100644
--- a/sfx2/inc/sfx2/minstack.hxx
+++ b/sfx2/inc/sfx2/minstack.hxx
@@ -78,8 +78,6 @@ public: \
\
sal_uInt16 Count() const { return ARR##arr_::Count(); } \
void Push( T rElem ) { Append( rElem ); } \
- sal_Bool Replace( T rOldElem, T rNewElem ) \
- { return ARR##arr_::Replace( rOldElem, rNewElem ); } \
T Top( sal_uInt16 nLevel = 0 ) const \
{ return (*this)[Count()-nLevel-1]; } \
T Bottom() const { return (*this)[0]; } \
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index 5d39f178fbee..49051160d761 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -70,14 +70,11 @@ public:
String GetTitle() const;
SfxVirtualMenu* GetPopupMenu() const;
virtual PopupMenu* GetPopup() const;
- void SetOwnMenu( SfxVirtualMenu* pMenu );
- void RemovePopup();
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
- static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* );
static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* );
static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*);
diff --git a/sfx2/inc/sfx2/module.hxx b/sfx2/inc/sfx2/module.hxx
index 4dcd035fd49f..98fff6619b36 100644
--- a/sfx2/inc/sfx2/module.hxx
+++ b/sfx2/inc/sfx2/module.hxx
@@ -86,7 +86,6 @@ public:
void RegisterToolBoxControl(SfxTbxCtrlFactory*);
void RegisterChildWindow(SfxChildWinFactory*);
- void RegisterChildWindowContext( sal_uInt16, SfxChildWinContextFactory* );
void RegisterStatusBarControl(SfxStbCtrlFactory*);
void RegisterMenuControl(SfxMenuCtrlFactory*);
@@ -94,7 +93,6 @@ public:
Window* pParent,
const SfxItemSet& rSet );
virtual void Invalidate(sal_uInt16 nId = 0);
- sal_Bool IsActive() const;
/*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const;
diff --git a/sfx2/inc/sfx2/new.hxx b/sfx2/inc/sfx2/new.hxx
index bb1250a43a21..fbff13ae5b7e 100644
--- a/sfx2/inc/sfx2/new.hxx
+++ b/sfx2/inc/sfx2/new.hxx
@@ -56,19 +56,6 @@ class MoreButton;
#define RET_TEMPLATE_LOAD 100
-class SFX2_DLLPUBLIC SfxPreviewWin: public Window
-{
- SfxObjectShellLock &rDocShell;
-protected:
- virtual void Paint( const Rectangle& rRect );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
-
-public:
- SfxPreviewWin( Window* pParent,
- const ResId& rResId,
- SfxObjectShellLock &rDocSh );
-};
-
class SfxNewFileDialog_Impl;
class SFX2_DLLPUBLIC SfxNewFileDialog : public SfxModalDialog
{
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index cef2730687d5..d8f35b3581ff 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -142,7 +142,6 @@ protected:
void UnbindListener();
void AddStatusListener( const rtl::OUString& rCommandURL );
void RemoveStatusListener( const rtl::OUString& rCommandURL );
- void UpdateStatus( const rtl::OUString& rCommandURL );
// SfxStatusListenerInterface
using FloatingWindow::StateChanged;
@@ -159,10 +158,6 @@ public:
SfxPopupWindow( sal_uInt16 nId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
Window* pParentWindow,
- const ResId &rId );
- SfxPopupWindow( sal_uInt16 nId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- Window* pParentWindow,
WinBits nBits );
~SfxPopupWindow();
@@ -170,7 +165,6 @@ public:
virtual void MouseMove( const MouseEvent& rMEvt );
void StartCascading();
- void EndCascading();
SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link& rLink )
{
m_aDeleteLink = rLink;
diff --git a/sfx2/inc/sfx2/viewfac.hxx b/sfx2/inc/sfx2/viewfac.hxx
index da4d7902c30a..590dc5d065ca 100644
--- a/sfx2/inc/sfx2/viewfac.hxx
+++ b/sfx2/inc/sfx2/viewfac.hxx
@@ -49,7 +49,6 @@ public:
~SfxViewFactory();
SfxViewShell *CreateInstance(SfxViewFrame *pViewFrame, SfxViewShell *pOldSh);
- void InitFactory();
sal_uInt16 GetOrdinal() const { return nOrd; }
/// returns a legacy view name. This is "view" with an appended ordinal/ID.
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 8048e4b85a55..8fa50b38077a 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -219,29 +219,6 @@ void SfxModule::RegisterChildWindow(SfxChildWinFactory *pFact)
//-------------------------------------------------------------------------
-void SfxModule::RegisterChildWindowContext( sal_uInt16 nId,
- SfxChildWinContextFactory *pFact)
-{
- DBG_ASSERT( pImpl, "No real Module!" );
-
- sal_uInt16 nCount = pImpl->pFactArr->Count();
- for (sal_uInt16 nFactory=0; nFactory<nCount; ++nFactory)
- {
- SfxChildWinFactory *pF = (*pImpl->pFactArr)[nFactory];
- if ( nId == pF->nId )
- {
- if ( !pF->pArr )
- pF->pArr = new SfxChildWinContextArr_Impl;
- pF->pArr->C40_INSERT( SfxChildWinContextFactory, pFact, pF->pArr->Count() );
- return;
- }
- }
-
- OSL_FAIL( "No ChildWindow for this Context!" );
-}
-
-//-------------------------------------------------------------------------
-
void SfxModule::RegisterToolBoxControl( SfxTbxCtrlFactory *pFact )
{
if (!pImpl->pTbxCtrlFac)
@@ -372,14 +349,6 @@ void SfxModule::Invalidate( sal_uInt16 nId )
Invalidate_Impl( pFrame->GetBindings(), nId );
}
-sal_Bool SfxModule::IsActive() const
-{
- SfxViewFrame* pFrame = SfxViewFrame::Current();
- if ( pFrame && pFrame->GetObjectShell()->GetFactory().GetModule() == this )
- return sal_True;
- return sal_False;
-}
-
bool SfxModule::IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const
{
if ( i_nId != SID_TASKPANE )
diff --git a/sfx2/source/bastyp/minarray.cxx b/sfx2/source/bastyp/minarray.cxx
index 70e4bfbfc6ca..891baa74aa8e 100644
--- a/sfx2/source/bastyp/minarray.cxx
+++ b/sfx2/source/bastyp/minarray.cxx
@@ -198,26 +198,6 @@ sal_Bool SfxPtrArr::Remove( void* aElem )
// -----------------------------------------------------------------------
-sal_Bool SfxPtrArr::Replace( void* aOldElem, void* aNewElem )
-{
- DBG_MEMTEST();
- // simple tasks ...
- if ( nUsed == 0 )
- return sal_False;
-
- // backwards, since most of the last is first removed
- void* *pIter = pData + nUsed - 1;
- for ( sal_uInt16 n = 0; n < nUsed; ++n, --pIter )
- if ( *pIter == aOldElem )
- {
- pData[nUsed-n-1] = aNewElem;
- return sal_True;
- }
- return sal_False;
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool SfxPtrArr::Contains( const void* rItem ) const
{
DBG_MEMTEST();
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 81f0d6ece67f..2635aba3f0d6 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -345,25 +345,6 @@ IMPL_LINK( SfxModelessDialog, TimerHdl, Timer*, EMPTYARG)
// -----------------------------------------------------------------------
SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
- SfxChildWindow *pCW,
- Window* pParent, WinBits nWinBits ) :
- ModelessDialog (pParent, nWinBits),
- pBindings(pBindinx),
- pImp( new SfxModelessDialog_Impl )
-{
- pImp->pMgr = pCW;
- pImp->bConstructed = sal_False;
- SetUniqueId( GetHelpId() );
- SetHelpId("");
- if ( pBindinx )
- pImp->StartListening( *pBindinx );
- pImp->aMoveTimer.SetTimeout(50);
- pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxModelessDialog,TimerHdl));
-}
-
-// -----------------------------------------------------------------------
-
-SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx,
SfxChildWindow *pCW, Window *pParent,
const ResId& rResId ) :
ModelessDialog(pParent, rResId),
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index b54b292f20d7..cc7c0040f328 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -147,58 +147,6 @@ void SfxPreviewWin_Impl::Paint( const Rectangle& rRect )
ImpPaint( rRect, pMetaFile.get(), this );
}
-SfxPreviewWin::SfxPreviewWin(
- Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh )
- : Window(pParent, rResId), rDocShell( rDocSh )
-{
- SetHelpId( HID_PREVIEW_FRAME );
-
- // adjust contrast mode initially
- SetDrawMode( OUTPUT_DRAWMODE_COLOR );
-
- // This preview window is for document previews. Therefore
- // right-to-left mode should be off
- EnableRTL( sal_False );
-}
-
-void SfxPreviewWin::Paint( const Rectangle& rRect )
-{
- SfxViewFrame *pFrame = SfxViewFrame::GetFirst( &rDocShell );
- if ( pFrame && pFrame->GetViewShell() &&
- pFrame->GetViewShell()->GetPrinter() &&
- pFrame->GetViewShell()->GetPrinter()->IsPrinting() )
- {
- return;
- }
-
- Size aTmpSize( rDocShell->GetFirstPageSize() );
- GDIMetaFile aMtf;
- VirtualDevice aDevice;
-
- DBG_ASSERT( aTmpSize.Height() * aTmpSize.Width(), "size of first page is 0, overload GetFirstPageSize or set vis-area!" );
-
- aMtf.SetPrefSize( aTmpSize );
- aDevice.EnableOutput( sal_False );
- aDevice.SetMapMode( rDocShell->GetMapUnit() );
- aDevice.SetDrawMode( GetDrawMode() );
- aMtf.Record( &aDevice );
- rDocShell->DoDraw( &aDevice, Point(0,0), aTmpSize, JobSetup(), ASPECT_THUMBNAIL );
- aMtf.Stop();
- aMtf.WindStart();
- SfxPreviewWin_Impl::ImpPaint( rRect, &aMtf, this );
-}
-
-void SfxPreviewWin::DataChanged( const DataChangedEvent& rDCEvt )
-{
- Window::DataChanged( rDCEvt );
-
- if( (rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
- (rDCEvt.GetFlags() & SETTINGS_STYLE) )
- {
- SetDrawMode( OUTPUT_DRAWMODE_COLOR );
- }
-}
-
class SfxNewFileDialog_Impl
{
FixedText aRegionFt;
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 62e88fe01068..560f51af4a5c 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -122,16 +122,6 @@ void SfxEnumMenu::Select()
//--------------------------------------------------------------------
-void SfxMenuControl::SetOwnMenu( SfxVirtualMenu* pMenu )
-{
- pOwnMenu = pMenu;
- if ( pSubMenu )
- pSubMenu->SetParentMenu( pMenu );
-}
-
-
-//--------------------------------------------------------------------
-
// binds the instance to the specified id and assignes the title
void SfxMenuControl::Bind(
@@ -221,11 +211,6 @@ SfxMenuControl::~SfxMenuControl()
delete pSubMenu;
}
-void SfxMenuControl::RemovePopup()
-{
- DELETEZ( pSubMenu );
-}
-
//--------------------------------------------------------------------
// changes the state in the virtual menu
@@ -478,12 +463,6 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
}
SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
- sal_uInt16 nId, Menu& rMenu, SfxBindings &rBindings, SfxVirtualMenu* pVirt )
-{
- return new SfxUnoMenuControl( rCmd, nId, rMenu, rBindings, pVirt );
-}
-
-SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
sal_uInt16 nId, Menu& rMenu, const String& sItemText,
SfxBindings& rBindings, SfxVirtualMenu* pVirt)
{
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index da3042599ae7..24b1f897f2b4 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1271,27 +1271,6 @@ SfxPopupWindow::SfxPopupWindow(
//--------------------------------------------------------------------
-SfxPopupWindow::SfxPopupWindow(
- sal_uInt16 nId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
- Window* pParentWindow,
- const ResId &rId ) :
- FloatingWindow( pParentWindow, rId )
- , m_bFloating(sal_False)
- , m_bCascading( sal_False )
- , m_nId( nId )
- , m_xFrame( rFrame )
- , m_pStatusListener( 0 )
-{
- m_xServiceManager = ::comphelper::getProcessServiceFactory();
-
- Window* pWindow = GetTopMostParentSystemWindow( this );
- if ( pWindow )
- ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
-}
-
-//--------------------------------------------------------------------
-
SfxPopupWindow::~SfxPopupWindow()
{
if ( m_xStatusListener.is() )
@@ -1360,15 +1339,6 @@ void SfxPopupWindow::RemoveStatusListener( const rtl::OUString& rCommandURL )
//--------------------------------------------------------------------
-void SfxPopupWindow::UpdateStatus( const rtl::OUString& rCommandURL )
-{
- GetOrCreateStatusListener();
- if ( m_xStatusListener.is() )
- m_pStatusListener->updateStatus( rCommandURL );
-}
-
-//--------------------------------------------------------------------
-
sal_Bool SfxPopupWindow::Close()
{
m_bFloating = sal_False;
@@ -1439,11 +1409,6 @@ void SfxPopupWindow::StartCascading()
m_bCascading= sal_True;
}
-void SfxPopupWindow::EndCascading()
-{
- m_bCascading = sal_False;
-}
-
//--------------------------------------------------------------------
SfxPopupWindow* SfxPopupWindow::Clone() const
diff --git a/sfx2/source/view/viewfac.cxx b/sfx2/source/view/viewfac.cxx
index 16fd68505ad9..1514c574c644 100644
--- a/sfx2/source/view/viewfac.cxx
+++ b/sfx2/source/view/viewfac.cxx
@@ -44,12 +44,6 @@ SfxViewShell *SfxViewFactory::CreateInstance(SfxViewFrame *pFrame, SfxViewShell
return (*fnCreate)(pFrame, pOldSh);
}
-void SfxViewFactory::InitFactory()
-{
- DBG_CHKTHIS(SfxViewFactory, 0);
- (*fnInit)();
-}
-
String SfxViewFactory::GetLegacyViewName() const
{
::rtl::OUStringBuffer aViewName;