strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS reportdesign02 (1.5.18); FILE MERGED

Browse source 
2007/12/20 07:48:26 oj 1.5.18.3: RESYNC: (1.5-1.6); FILE MERGED
2007/11/26 06:24:44 lla 1.5.18.2: #i80260# drag n drop, lines over all sections, no ctrl key need to move obj in different section
2007/10/30 06:56:29 oj 1.5.18.1: #i78939# change pos and size when control is outside page
This commit is contained in:
Rüdiger Timm 2008-01-29 12:51:09 +00:00
parent eafd77e5c5
commit 2f1e50b76b
1 changed files with 62 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
reportdesign/source/ui/report/ReportSection.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: ReportSection.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: ihi $ $Date: 2007-11-20 19:12:21 $
* last change: $Author: rt $ $Date: 2008-01-29 13:51:09 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -273,6 +273,9 @@ void OReportSection::fill()
m_pPage->SetLftBorder(nLeftMargin);
m_pPage->SetRgtBorder(nRightMargin);
// LLA: TODO
// m_pPage->SetUppBorder(-10000);
m_pView->SetDesignMode( TRUE );
m_pView->StartListening( *m_pModel );
@ -583,18 +586,72 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent)
}
else
{
uno::Reference<report::XReportDefinition> xReportDefinition = m_xSection->getReportDefinition();
if ( _rEvent.PropertyName == PROPERTY_LEFTMARGIN )
{
const sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(m_xSection->getReportDefinition(),PROPERTY_LEFTMARGIN);
const sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN);
m_pPage->SetLftBorder(nLeftMargin);
//m_pView->GetSdrPageView()->SetPageOrigin(Point(nLeftMargin,0));
}
else if ( _rEvent.PropertyName == PROPERTY_RIGHTMARGIN )
{
const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(m_xSection->getReportDefinition(),PROPERTY_RIGHTMARGIN);
const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN);
m_pPage->SetRgtBorder(nRightMargin);
}
try
{
const sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN);
const sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN);
const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(xReportDefinition,PROPERTY_PAPERSIZE).Width;
::boost::shared_ptr<OReportSection> aSection = m_pParent->getReportSection(m_xSection);
const sal_Int32 nCount = m_xSection->getCount();
for (sal_Int32 i = 0; i < nCount; ++i)
{
bool bChanged = false;
uno::Reference< report::XReportComponent> xReportComponent(m_xSection->getByIndex(i),uno::UNO_QUERY_THROW);
awt::Point aPos = xReportComponent->getPosition();
awt::Size aSize = xReportComponent->getSize();
SvxShape* pShape = SvxShape::getImplementation( xReportComponent );
SdrObject* pObject = pShape ? pShape->GetSdrObject() : NULL;
if ( pObject )
{
OObjectBase* pBase = dynamic_cast<OObjectBase*>(pObject);
pBase->EndListening(sal_False);
if ( aPos.X < nLeftMargin )
{
aPos.X = nLeftMargin;
bChanged = true;
}
if ( (aPos.X + aSize.Width) > (nPaperWidth - nRightMargin) )
{
aPos.X = nPaperWidth - nRightMargin - aSize.Width;
if ( aPos.X < nLeftMargin )
{
aSize.Width += aPos.X - nLeftMargin;
aPos.X = nLeftMargin;
// add listener around
pBase->StartListening();
xReportComponent->setSize(aSize);
pBase->EndListening(sal_False);
}
bChanged = true;
}
if ( aPos.Y < 0 )
aPos.Y = 0;
if ( bChanged )
{
xReportComponent->setPosition(aPos);
correctOverlapping(pObject,aSection,false);
}
pBase->StartListening();
}
}
}
catch(uno::Exception)
{
OSL_ENSURE(0,"Exception caught: OReportSection::_propertyChanged(");
}
Resize();
}
}