diff options
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/wrapfield.hxx | 1 | ||||
| -rw-r--r-- | svx/source/dialog/wrapfield.cxx | 7 | ||||
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 47 |
3 files changed, 0 insertions, 55 deletions
diff --git a/svx/inc/svx/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index 3d19efe97de7..eeb42903a649 100644 --- a/svx/inc/svx/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx @@ -41,7 +41,6 @@ namespace svx { class SVX_DLLPUBLIC WrapField : public NumericField { public: - explicit WrapField( Window* pParent, WinBits nWinStyle ); explicit WrapField( Window* pParent, const ResId& rResId ); protected: diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 1ba6f31b2b1c..904761ca6692 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -32,13 +32,6 @@ namespace svx { -// ============================================================================ - -WrapField::WrapField( Window* pParent, WinBits nWinStyle ) : - NumericField( pParent, nWinStyle ) -{ -} - WrapField::WrapField( Window* pParent, const ResId& rResId ) : NumericField( pParent, rResId ) { diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 63fa854d291f..96af909eb63b 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -124,53 +124,6 @@ namespace svxform } } - //------------------------------------------------------------------------ - sal_Bool isModelShapeMarked( FmEntryData* _pEntry, const MapModelToShape& _rModelMap, SdrMarkView* _pView ) - { - DBG_ASSERT( _pEntry && _pView, "isModelShapeMarked: invalid arguments!" ); - if ( !_pEntry || !_pView ) - return sal_False; - - DBG_ASSERT( _pEntry->GetElement().get() == Reference< XInterface >( _pEntry->GetElement(), UNO_QUERY ).get(), - "isModelShapeMarked: element of the FmEntryData is not normalized!" ); - // normalization of the XInterface is a prerequisite for properly finding it in the map - - sal_Bool bIsMarked = sal_False; - - MapModelToShape::const_iterator aPos = _rModelMap.find( _pEntry->GetElement() ); - if ( _rModelMap.end() != aPos ) - { // there is a shape for this model .... - bIsMarked = _pView->IsObjMarked( aPos->second ); - if ( !bIsMarked ) - { - // IsObjMarked does not step down grouped objects, so the sal_False we - // have is not really reliable (while a sal_True would have been) - // Okay, travel the mark list, and see if there is a group marked, and our shape - // is a part of this group - sal_uInt32 nMarked = _pView->GetMarkedObjectList().GetMarkCount(); - for ( sal_uInt32 i = 0; (i<nMarked ) && !bIsMarked; ++i ) - { - SdrMark* pMark = _pView->GetMarkedObjectList().GetMark( i ); - SdrObject* pObj = pMark ? pMark->GetMarkedSdrObj() : NULL; - if ( pObj && pObj->IsGroupObject() ) - { // the i-th marked shape is a group shape - SdrObjListIter aIter( *pObj ); - while ( aIter.IsMore() ) - { - if ( aIter.Next() == aPos->second ) - { - bIsMarked = sal_True; - break; - } - } - } - } - } - } - - return bIsMarked; - } - //======================================================================== // class NavigatorTree //======================================================================== |