summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-07-28 22:47:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-07-29 10:56:17 +0100
commite6d15541d60a778424a9f4e135881bae5978b417 (patch)
treebb69d904ad58b0e795e34b04f1bfca8fb3d45821 /sfx2
parented43eb0264d2690d0b7128513682854765ec8238 (diff)
callcatcher: ditch various unused methods
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/guisaveas.hxx6
-rw-r--r--sfx2/inc/sfx2/app.hxx1
-rw-r--r--sfx2/inc/sfx2/bindings.hxx2
-rw-r--r--sfx2/inc/sfx2/dinfedt.hxx28
-rw-r--r--sfx2/inc/sfx2/docfac.hxx2
-rw-r--r--sfx2/inc/sfx2/frame.hxx1
-rw-r--r--sfx2/inc/sfx2/mailmodelapi.hxx1
-rw-r--r--sfx2/source/appl/app.cxx19
-rw-r--r--sfx2/source/appl/workwin.cxx11
-rw-r--r--sfx2/source/control/bindings.cxx14
-rw-r--r--sfx2/source/dialog/dinfedt.cxx19
-rw-r--r--sfx2/source/dialog/mailmodel.cxx14
-rw-r--r--sfx2/source/doc/docfac.cxx13
-rw-r--r--sfx2/source/doc/guisaveas.cxx10
-rw-r--r--sfx2/source/inc/mailmodel.hxx1
-rw-r--r--sfx2/source/inc/workwin.hxx11
-rw-r--r--sfx2/source/view/frame2.cxx24
17 files changed, 0 insertions, 177 deletions
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index 0b442a34a7..e456794319 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -96,12 +96,6 @@ public:
::rtl::OUString aDefUIName,
sal_Bool bCanProceedFurther );
- static void ExecuteFilterDialog( SfxStoringHelper& _rStorageHelper
- ,const ::rtl::OUString& sFilterName
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel
- ,/*OUT*/::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgsSequence
- );
-
static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
};
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 47b6175497..3ed4975bc2 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -143,7 +143,6 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
SfxAppData_Impl* pAppData_Impl;
DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC* );
- SAL_DLLPRIVATE short QuerySave_Impl(SfxObjectShell &, sal_Bool bAutoSave = sal_False);
static SfxApplication* Create();
void Init();
diff --git a/sfx2/inc/sfx2/bindings.hxx b/sfx2/inc/sfx2/bindings.hxx
index 9a402853de..2f5cffa750 100644
--- a/sfx2/inc/sfx2/bindings.hxx
+++ b/sfx2/inc/sfx2/bindings.hxx
@@ -195,7 +195,6 @@ public:
SAL_DLLPRIVATE void ContextChanged_Impl();
SAL_DLLPRIVATE void Execute_Impl( SfxRequest& rReq, const SfxSlot* pSlot, SfxShell* pShell );
SAL_DLLPRIVATE void DeleteControllers_Impl();
- SAL_DLLPRIVATE SfxPopupAction GetPopupAction_Impl() const;
SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl() { return pDispatcher; }
SAL_DLLPRIVATE void ClearCache_Impl( sal_uInt16 nSlotId );
SAL_DLLPRIVATE sal_Bool IsInUpdate_Impl() const{ return IsInUpdate(); }
@@ -209,7 +208,6 @@ public:
SAL_DLLPRIVATE void ReleaseUnoController_Impl( SfxUnoControllerItem* );
SAL_DLLPRIVATE sal_Bool ExecuteCommand_Impl( const String& rCommand );
SAL_DLLPRIVATE void SetRecorder_Impl( com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder >& );
- SAL_DLLPRIVATE void ExecuteGlobal_Impl( sal_uInt16 nId );
SAL_DLLPRIVATE void InvalidateSlotsInMap_Impl();
SAL_DLLPRIVATE void AddSlotToInvalidateSlotsMap_Impl( sal_uInt16 nId );
};
diff --git a/sfx2/inc/sfx2/dinfedt.hxx b/sfx2/inc/sfx2/dinfedt.hxx
index 8d5827c4b6..1e34ff8693 100644
--- a/sfx2/inc/sfx2/dinfedt.hxx
+++ b/sfx2/inc/sfx2/dinfedt.hxx
@@ -46,34 +46,6 @@ public:
virtual void KeyInput( const KeyEvent& rKEvent );
};
-// class SfxDocInfoEditDlg -----------------------------------------------
-
-class SfxDocInfoEditDlg : public ModalDialog
-{
-private:
- FixedLine aInfoFL;
- InfoEdit_Impl aInfo1ED;
- InfoEdit_Impl aInfo2ED;
- InfoEdit_Impl aInfo3ED;
- InfoEdit_Impl aInfo4ED;
- OKButton aOkBT;
- CancelButton aCancelBT;
- HelpButton aHelpBtn;
-
-public:
- SfxDocInfoEditDlg( Window* pParent );
-
- void SetText1( const String &rStr) { aInfo1ED.SetText( rStr ); }
- void SetText2( const String &rStr) { aInfo2ED.SetText( rStr ); }
- void SetText3( const String &rStr) { aInfo3ED.SetText( rStr ); }
- void SetText4( const String &rStr) { aInfo4ED.SetText( rStr ); }
-
- String GetText1() const { return aInfo1ED.GetText(); }
- String GetText2() const { return aInfo2ED.GetText(); }
- String GetText3() const { return aInfo3ED.GetText(); }
- String GetText4() const { return aInfo4ED.GetText(); }
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/docfac.hxx b/sfx2/inc/sfx2/docfac.hxx
index fb89ea4cdb..2841927511 100644
--- a/sfx2/inc/sfx2/docfac.hxx
+++ b/sfx2/inc/sfx2/docfac.hxx
@@ -86,8 +86,6 @@ public:
String GetFactoryURL() const; // shortcut for "private:factory/GetShortName()"
String GetFactoryName() const { return String::CreateFromAscii( pShortName ); }
String GetModuleName() const;
- void SetDocumentTypeNameResource( const ResId& rId );
- String GetDocumentTypeName() const;
SfxFilterContainer *GetFilterContainer( sal_Bool bForceLoad = sal_True) const;
// Views
diff --git a/sfx2/inc/sfx2/frame.hxx b/sfx2/inc/sfx2/frame.hxx
index c62690b7a6..afe9a7c6c3 100644
--- a/sfx2/inc/sfx2/frame.hxx
+++ b/sfx2/inc/sfx2/frame.hxx
@@ -222,7 +222,6 @@ public:
SAL_DLLPRIVATE void SetMenuBarOn_Impl( sal_Bool bOn );
SAL_DLLPRIVATE sal_Bool IsMenuBarOn_Impl() const;
SAL_DLLPRIVATE SystemWindow* GetTopWindow_Impl() const;
- SAL_DLLPRIVATE void PositionWindow_Impl( const Rectangle& rWinArea ) const;
SAL_DLLPRIVATE bool IsMarkedHidden_Impl() const;
private:
SAL_DLLPRIVATE void Construct_Impl();
diff --git a/sfx2/inc/sfx2/mailmodelapi.hxx b/sfx2/inc/sfx2/mailmodelapi.hxx
index 3e0caa30d7..47e6798cb4 100644
--- a/sfx2/inc/sfx2/mailmodelapi.hxx
+++ b/sfx2/inc/sfx2/mailmodelapi.hxx
@@ -85,7 +85,6 @@ private:
sal_Bool mbLoadDone;
void ClearList( AddressList_Impl* pList );
- void MakeValueList( AddressList_Impl* pList, String& rValueList );
SaveResult SaveDocumentAsFormat( const rtl::OUString& aSaveFileName,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xFrameOrModel,
const rtl::OUString& rType,
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 918e654563..9397f08da5 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -505,25 +505,6 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
pFrame->GetViewShell()->SetCurrentDocument();
}
-//--------------------------------------------------------------------
-
-short SfxApplication::QuerySave_Impl( SfxObjectShell& rDoc, sal_Bool /*bAutoSave*/ )
-{
- if ( !rDoc.IsModified() )
- return RET_NO;
-
- String aMsg( SfxResId( STR_ISMODIFIED ) );
- aMsg.SearchAndReplaceAscii( "%1", rDoc.GetTitle() );
-
- SfxFrame& rFrame = SfxViewFrame::GetFirst(&rDoc)->GetFrame();
- rFrame.Appear();
-
- WinBits nBits = WB_YES_NO_CANCEL | WB_DEF_NO;
- QueryBox aBox( &rFrame.GetWindow(), nBits, aMsg );
-
- return aBox.Execute();
-}
-
//---------------------------------------------------------------------
ResMgr* SfxApplication::CreateResManager( const char *pPrefix )
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 8402a6b93d..32bf16ff93 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -2753,17 +2753,6 @@ Rectangle SfxWorkWindow::GetFreeArea( sal_Bool bAutoHide ) const
return aClientArea;
}
-SfxChildWinController_Impl::SfxChildWinController_Impl( sal_uInt16 nID, SfxWorkWindow *pWork )
- : SfxControllerItem( nID, pWork->GetBindings() )
- , pWorkwin( pWork )
-{}
-
-void SfxChildWinController_Impl::StateChanged(
- sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* )
-{
- pWorkwin->DisableChildWindow_Impl( nSID, eState == SFX_ITEM_DISABLED );
-}
-
void SfxWorkWindow::DisableChildWindow_Impl( sal_uInt16 nId, sal_Bool bDisable )
{
sal_uInt16 nCount = pChildWins->Count();
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 2da67793cd..db06b536ec 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -345,14 +345,6 @@ void SfxBindings::DeleteControllers_Impl()
//--------------------------------------------------------------------
-SfxPopupAction SfxBindings::GetPopupAction_Impl() const
-{
- return pImp->ePopupAction;
-}
-
-
-//--------------------------------------------------------------------
-
void SfxBindings::HidePopups( bool bHide )
{
// Hide SfxPopupWindows
@@ -1119,12 +1111,6 @@ sal_Bool SfxBindings::Execute( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_
return ( pRet != 0 );
}
-void SfxBindings::ExecuteGlobal_Impl( sal_uInt16 nId )
-{
- if( nId && pDispatcher )
- Execute_Impl( nId, NULL, 0, SFX_CALLMODE_ASYNCHRON, NULL, sal_True );
-}
-
const SfxPoolItem* SfxBindings::Execute_Impl( sal_uInt16 nId, const SfxPoolItem** ppItems, sal_uInt16 nModi, SfxCallMode nCallMode,
const SfxPoolItem **ppInternalArgs, sal_Bool bGlobalOnly )
{
diff --git a/sfx2/source/dialog/dinfedt.cxx b/sfx2/source/dialog/dinfedt.cxx
index aceeb17b02..6885fbbf4f 100644
--- a/sfx2/source/dialog/dinfedt.cxx
+++ b/sfx2/source/dialog/dinfedt.cxx
@@ -43,23 +43,4 @@ void InfoEdit_Impl::KeyInput( const KeyEvent& rKEvent )
Edit::KeyInput( rKEvent );
}
-// class SfxDocInfoEditDlg -----------------------------------------------
-
-SfxDocInfoEditDlg::SfxDocInfoEditDlg( Window* pParent ) :
-
- ModalDialog( pParent, SfxResId( DLG_DOCINFO_EDT ) ),
-
- aInfoFL ( this, SfxResId( FL_INFO ) ),
- aInfo1ED ( this, SfxResId( ED_INFO1 ) ),
- aInfo2ED ( this, SfxResId( ED_INFO2 ) ),
- aInfo3ED ( this, SfxResId( ED_INFO3 ) ),
- aInfo4ED ( this, SfxResId( ED_INFO4 ) ),
- aOkBT ( this, SfxResId( BT_OK ) ),
- aCancelBT ( this, SfxResId( BT_CANCEL ) ),
- aHelpBtn ( this, SfxResId( BTN_HELP ) )
-
-{
- FreeResource();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 819e774db1..9730933dad 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -160,20 +160,6 @@ void SfxMailModel::ClearList( AddressList_Impl* pList )
}
}
-void SfxMailModel::MakeValueList( AddressList_Impl* pList, String& rValueList )
-{
- rValueList.Erase();
- if ( pList )
- {
- for( size_t i = 0, n = pList->size(); i < n; ++i )
- {
- if ( rValueList.Len() > 0 )
- rValueList += ',';
- rValueList += *pList->at(i);
- }
- }
-}
-
sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XModel >& xModel )
{
try
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index f9ce9effc1..a82c4ee7d9 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -372,19 +372,6 @@ const SfxFilter* SfxObjectFactory::GetTemplateFilter() const
return pFilter;
}
-void SfxObjectFactory::SetDocumentTypeNameResource( const ResId& rId )
-{
- DBG_ASSERT( !pImpl->pNameResId, "UI-Name resource set multiple times!" );
- pImpl->pNameResId = new ResId( rId );
-}
-
-String SfxObjectFactory::GetDocumentTypeName() const
-{
- if ( pImpl->pNameResId )
- return String( *pImpl->pNameResId );
- return String();
-}
-
void SfxObjectFactory::SetDocumentServiceName( const ::rtl::OUString& rServiceName )
{
pImpl->aServiceName = rServiceName;
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 783d623305..3583da80bd 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1761,16 +1761,6 @@ sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::
return aDlg.Execute() == RET_OK;
}
-void SfxStoringHelper::ExecuteFilterDialog( SfxStoringHelper& _rStorageHelper
- ,const ::rtl::OUString& _sFilterName
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _xModel
- ,/*OUT*/::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgsSequence)
-{
- ModelData_Impl aModelData( _rStorageHelper, _xModel, _rArgsSequence );
- if ( aModelData.ExecuteFilterDialog_Impl( _sFilterName ) )
- _rArgsSequence = aModelData.GetMediaDescr().getAsConstPropertyValueList();
-}
-
Window* SfxStoringHelper::GetModelWindow( const uno::Reference< frame::XModel >& xModel )
{
Window* pWin = 0;
diff --git a/sfx2/source/inc/mailmodel.hxx b/sfx2/source/inc/mailmodel.hxx
index a7536bc55e..e8a6c14b44 100644
--- a/sfx2/source/inc/mailmodel.hxx
+++ b/sfx2/source/inc/mailmodel.hxx
@@ -77,7 +77,6 @@ private:
sal_Bool mbLoadDone;
void ClearList( AddressList_Impl* pList );
- void MakeValueList( AddressList_Impl* pList, String& rValueList );
SaveResult SaveDocumentAsFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame, const rtl::OUString& rType, rtl::OUString& rFileNamePath );
DECL_LINK( DoneHdl, void* );
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 084385a38e..80bc1f1df1 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -120,17 +120,6 @@ struct SfxChild_Impl
}
};
-//--------------------------------------------------------------------
-class SfxChildWinController_Impl : public SfxControllerItem
-{
- SfxWorkWindow* pWorkwin;
-
- public:
- SfxChildWinController_Impl( sal_uInt16 nId, SfxWorkWindow *pWin );
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState );
-};
-
struct SfxChildWin_Impl
{
sal_uInt16 nSaveId; // the ChildWindow-Id
diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx
index 0b1f2f5c4f..7fea0cf832 100644
--- a/sfx2/source/view/frame2.cxx
+++ b/sfx2/source/view/frame2.cxx
@@ -433,30 +433,6 @@ sal_Bool SfxFrame::IsMenuBarOn_Impl() const
return pImp->bMenuBarOn;
}
-void SfxFrame::PositionWindow_Impl( const Rectangle& rWinArea ) const
-{
- Window *pWin = pImp->pExternalContainerWindow;
-
- const Size aAppWindow( pImp->pExternalContainerWindow->GetDesktopRectPixel().GetSize() );
- Point aPos( rWinArea.TopLeft() );
- Size aSz( rWinArea.GetSize() );
- if ( aSz.Width() && aSz.Height() )
- {
- aPos.X() = Min(aPos.X(),
- long(aAppWindow.Width() - aSz.Width() + aSz.Width() / 2) );
- aPos.Y() = Min(aPos.Y(),
- long( aAppWindow.Height() - aSz.Height() + aSz.Height() / 2) );
- if ( aPos.X() + aSz.Width() <
- aAppWindow.Width() + aSz.Width() / 2 &&
- aPos.Y() + aSz.Height() <
- aAppWindow.Height() + aSz.Height() / 2 )
- {
- pWin->SetPosPixel( aPos );
- pWin->SetOutputSizePixel( aSz );
- }
- }
-}
-
void SfxFrame::PrepareForDoc_Impl( SfxObjectShell& i_rDoc )
{
const ::comphelper::NamedValueCollection aDocumentArgs( i_rDoc.GetModel()->getArgs() );