diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-09 22:32:52 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-10 11:49:49 +0100 |
commit | a37338e74267db0a0a6d0fe453598f95611b134c (patch) | |
tree | 7fc763362b345eb92c710811c3bfd875cf8d4273 /svx/source | |
parent | d865fed229035440eccb8a89aa3f44f64e0f696c (diff) |
callcatcher: remove some unused methods
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/dialog/framelink.cxx | 12 | ||||
-rw-r--r-- | svx/source/form/navigatortreemodel.cxx | 92 | ||||
-rw-r--r-- | svx/source/inc/fmexpl.hxx | 4 |
3 files changed, 1 insertions, 107 deletions
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 5d2a9005d368..4b045f30ae1c 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -741,18 +741,6 @@ inline Polygon lclCreatePolygon( const PointVec& rPoints ) return Polygon( static_cast< sal_uInt16 >( rPoints.size() ), &rPoints[ 0 ] ); } -/** Returns a polygon constructed from the four passed points. */ -Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4 ) -{ - PointVec aPoints; - aPoints.reserve( 2 ); - aPoints.push_back( rP1 ); - aPoints.push_back( rP2 ); - aPoints.push_back( rP3 ); - aPoints.push_back( rP4 ); - return lclCreatePolygon( aPoints ); -} - /** Returns a polygon constructed from the five passed points. */ Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4, const Point& rP5 ) { diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index ff0bfc07044d..b098f548871c 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -960,53 +960,6 @@ namespace svxform } //------------------------------------------------------------------------ - sal_Bool NavigatorTreeModel::CheckEntry( FmEntryData* pEntryData ) - { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::CheckEntry" ); - ////////////////////////////////////////////////////////////////////// - // Nur Forms duerfen auf Doppeldeutigkeit untersucht werden - if( !pEntryData->ISA(FmFormData) ) return sal_True; - - ////////////////////////////////////////////////////////////////////// - // ChildListe des Parents holen - FmFormData* pParentData = (FmFormData*)pEntryData->GetParent(); - FmEntryDataList* pChildList; - if( !pParentData ) - pChildList = GetRootList(); - else - pChildList = pParentData->GetChildList(); - - ////////////////////////////////////////////////////////////////////// - // In ChildListe nach doppelten Namen suchen - ::rtl::OUString aChildText; - FmEntryData* pChildData; - - for( size_t i = 0; i < pChildList->size(); i++ ) - { - pChildData = pChildList->at( i ); - aChildText = pChildData->GetText(); - - ////////////////////////////////////////////////////////////////////// - // Gleichen Eintrag gefunden - if ( (aChildText == pEntryData->GetText()) - && (pEntryData!=pChildData) - ) - { - - - SQLContext aError; - aError.Message = String(SVX_RES(RID_ERR_CONTEXT_ADDFORM)); - aError.Details = String(SVX_RES(RID_ERR_DUPLICATE_NAME)); - displayException(aError); - - return sal_False; - } - } - - return sal_True; - } - - //------------------------------------------------------------------------ sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Rename" ); @@ -1042,51 +995,6 @@ namespace svxform return sal_True; } - //------------------------------------------------------------------------ - sal_Bool NavigatorTreeModel::IsNameAlreadyDefined( const ::rtl::OUString& rName, FmFormData* pParentData ) - { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::IsNameAlreadyDefined" ); - ////////////////////////////////////////////////////////////////////// - // Form in der Root - if( !pParentData ) - { - if (GetForms()->hasByName(rName)) - return sal_True; - } - - ////////////////////////////////////////////////////////////////////// - // Restliche Components - else - { - Reference< XNameContainer > xFormComponents(GetFormComponents(pParentData), UNO_QUERY); - if (xFormComponents.is() && xFormComponents->hasByName(rName)) - return sal_True; - } - - return sal_False; - } - - //------------------------------------------------------------------------ - SdrObject* NavigatorTreeModel::GetSdrObj( FmControlData* pControlData ) - { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::GetSdrObj" ); - if (!pControlData || !m_pFormShell) - return NULL; - - ////////////////////////////////////////////////////////////////////// - // In der Page das entsprechende SdrObj finden und selektieren - Reference< XFormComponent > xFormComponent( pControlData->GetFormComponent()); - if (!xFormComponent.is()) - return NULL; - - FmFormView* pFormView = m_pFormShell->GetFormView(); - SdrPageView* pPageView = pFormView->GetSdrPageView(); - SdrPage* pPage = pPageView->GetPage(); - - SdrObjListIter aIter( *pPage ); - return Search(aIter, xFormComponent); - } - //------------------------------------------------------------------ SdrObject* NavigatorTreeModel::Search(SdrObjListIter& rIter, const Reference< XFormComponent > & xComp) { diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 9e8d9a731301..02243f49759c 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -402,9 +402,8 @@ namespace svxform void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False ); sal_Bool Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText ); - sal_Bool IsNameAlreadyDefined( const ::rtl::OUString& rName, FmFormData* pParentData ); + void Clear(); - sal_Bool CheckEntry( FmEntryData* pEntryData ); void SetModified( sal_Bool bMod=sal_True ); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > GetForms() const; @@ -414,7 +413,6 @@ namespace svxform FmEntryData* FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs=sal_True ); FmEntryDataList* GetRootList() const { return m_pRootList; } ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); - SdrObject* GetSdrObj( FmControlData* pControlData ); SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); |