User: rt Date: 2008-06-16 13:47:24+0000 Modified: dba/reportdesign/source/ui/report/ViewsWindow.cxx
Log: INTEGRATION: CWS rptchart02 (1.7.22); FILE MERGED 2008/05/16 12:53:21 oj 1.7.22.6: #i89365# copy props before set args at chart 2008/05/15 12:29:39 oj 1.7.22.5: #i87135# allow to enable e.g. bold for controls as other checks 2008/04/30 13:03:35 oj 1.7.22.4: #i88843# impl clone method 2008/04/16 06:30:52 oj 1.7.22.3: RESYNC: (1.7-1.8); FILE MERGED 2008/04/03 06:35:21 oj 1.7.22.2: #i86343# remove unused code 2008/03/12 09:45:18 oj 1.7.22.1: impl chart handling File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ViewsWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ViewsWindow.cxx?r1=1.8&r2=1.9 Delta lines: +22 -12 --------------------- --- ViewsWindow.cxx 2008-04-10 19:16:33+0000 1.8 +++ ViewsWindow.cxx 2008-06-16 13:47:21+0000 1.9 @@ -648,7 +648,10 @@ for (; aIter != aEnd ; ++aIter) { if ( (*aIter).first.first->getView() != _pSectionView ) + { + (*aIter).first.first->deactivateOle(); (*aIter).first.first->getView()->UnmarkAllObj(); + } } // for (; aIter != aEnd ; ++aIter) m_bInUnmark = sal_False; } @@ -1297,8 +1300,8 @@ BegDragObj_createInvisibleObjectAtPosition(aRect, pView); // calculate the clickpoint - sal_Int32 nDeltaX = abs(aRect.Left() - aAbsolutePnt.X()); - sal_Int32 nDeltaY = abs(aRect.Top() - aAbsolutePnt.Y()); + const sal_Int32 nDeltaX = abs(aRect.Left() - aAbsolutePnt.X()); + const sal_Int32 nDeltaY = abs(aRect.Top() - aAbsolutePnt.Y()); if (m_aDragDelta.X() > nDeltaX) m_aDragDelta.X() = nDeltaX; if (m_aDragDelta.Y() > nDeltaY) @@ -1424,6 +1427,7 @@ OSL_ENSURE(aIter != aEnd,"This can never happen!"); if ( _rPnt.Y() < 0 ) { + if ( nCount ) --aIter; for (; nCount && (_rPnt.Y() < 0); --nCount) { @@ -1498,7 +1502,8 @@ } else pInSection->EndDragObj(FALSE); - } + } // for (; aIter != aEnd; ++aIter) + if ( aAllreadyCopiedObjects.getLength() ) { beans::NamedValue* pIter = aAllreadyCopiedObjects.getArray(); @@ -1550,7 +1555,6 @@ } pInSection->getSectionWindow()->Paste(aAllreadyCopiedObjects,true); } - getView()->getReportView()->getController()->getUndoMgr()->LeaveListAction(); } else { @@ -1662,11 +1666,6 @@ return bAction; } // ----------------------------------------------------------------------------- -void OViewsWindow::setPoint(const Point& _aPnt) -{ - m_aPoint = _aPnt; -} -// ----------------------------------------------------------------------------- sal_uInt32 OViewsWindow::getMarkedObjectCount() const { sal_uInt32 nCount = 0; @@ -1732,10 +1731,12 @@ if ( pView->IsMoveAllowed() ) { // restrict movement to work area - const Rectangle& rWorkArea = pView->GetWorkArea(); + Rectangle rWorkArea = pView->GetWorkArea(); if ( !rWorkArea.IsEmpty() ) { + if ( rWorkArea.Top() < 0 ) + rWorkArea.Top() = 0; Rectangle aMarkRect( pView->GetMarkedObjRect() ); aMarkRect.Move( nX, nY ); @@ -1851,7 +1852,16 @@ ::std::for_each(m_aSections.begin(),m_aSections.end(), ::std::compose1(::boost::mem_fn(&OReportSection::stopScrollTimer),TReportPairHelper())); } +// ----------------------------------------------------------------------------- +void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno::XInterface > >& _rSelection) const +{ + TSectionsMap::const_iterator aIter = m_aSections.begin(); + TSectionsMap::const_iterator aEnd = m_aSections.end(); + for(;aIter != aEnd; ++aIter) + { + aIter->first.first->fillControlModelSelection(_rSelection); + } +} //============================================================================== } // rptui //============================================================================== - --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
