Tag: cws_src680_reportdesign02 User: oj Date: 2007-11-08 13:06:06+0000 Modified: dba/reportdesign/source/ui/report/ViewsWindow.cxx dba/reportdesign/source/ui/report/EndMarker.cxx
Log: #i77063# some adjustments to the splitter 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.5.10.2&r2=1.5.10.3 Delta lines: +13 -18 --------------------- --- ViewsWindow.cxx 2007-10-30 06:56:29+0000 1.5.10.2 +++ ViewsWindow.cxx 2007-11-08 13:06:04+0000 1.5.10.3 @@ -4,9 +4,9 @@ * * $RCSfile: ViewsWindow.cxx,v $ * - * $Revision: 1.5.10.2 $ + * $Revision: 1.5.10.3 $ * - * last change: $Author: oj $ $Date: 2007/10/30 06:56:29 $ + * last change: $Author: oj $ $Date: 2007/11/08 13:06:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -265,15 +265,8 @@ aStartPoint -= m_pParent->getScrollOffset(); Point aSplitterStartPoint(aStartPoint.X(),0); - - uno::Reference<report::XReportDefinition> xReportDefinition = getView()->getReportView()->getController()->getReportDefinition(); - if ( !xReportDefinition.is() ) - return; - //sal_Int32 nLeftMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_LEFTMARGIN); - sal_Int32 nRightMargin = getStyleProperty<sal_Int32>(xReportDefinition,PROPERTY_RIGHTMARGIN); - const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(xReportDefinition,PROPERTY_PAPERSIZE).Width; - const Size aOrignalSize = LogicToPixel(Size(nPaperWidth,0),MAP_100TH_MM); - nRightMargin = LogicToPixel(Size(nRightMargin,0),MAP_100TH_MM).Width(); + Size aOutputSize = GetOutputSizePixel(); + aOutputSize.Width() -= (REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH); TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); @@ -281,7 +274,8 @@ { ::boost::shared_ptr<OReportSection> pReportSection = (*aIter).first.first; uno::Reference< report::XSection> xSection = pReportSection->getSection(); - Size aSectionSize = LogicToPixel( Size( nPaperWidth,xSection->getHeight() ),MAP_100TH_MM ); + Size aSectionSize = LogicToPixel( Size( 0,xSection->getHeight() ),MAP_100TH_MM ); + aSectionSize.Width() = aOutputSize.Width(); ::boost::shared_ptr<Splitter> pSplitter = (*aIter).second.second; ::boost::shared_ptr<OEndMarker> pEndMarker = (*aIter).second.first; @@ -292,24 +286,24 @@ pReportSection->SetPosSizePixel(aStartPoint,aSectionSize); if ( !m_bInSplitHandler ) { - pSplitter->SetPosSizePixel(Point(aSplitterStartPoint.X(),aStartPoint.Y() + aSectionSize.Height()),Size(aOrignalSize.Width(),pSplitter->GetSizePixel().Height())); - pSplitter->SetDragRectPixel( Rectangle(Point(aSplitterStartPoint.X(),aStartPoint.Y() - 1),Size(aOrignalSize.Width(),m_pParent->GetOutputSizePixel().Height())) ); + pSplitter->SetPosSizePixel(Point(aSplitterStartPoint.X(),aStartPoint.Y() + aSectionSize.Height()),Size(aOutputSize.Width(),pSplitter->GetSizePixel().Height())); + pSplitter->SetDragRectPixel( Rectangle(Point(aSplitterStartPoint.X(),aStartPoint.Y()/*- 1*/),aOutputSize)); } if ( nMinHeight > aSectionSize.Height() ) { - pEndMarker->SetPosSizePixel(Point(aSplitterStartPoint.X() + aOrignalSize.Width(),aStartPoint.Y()),Size(REPORT_ENDMARKER_WIDTH,nMinHeight)); + pEndMarker->SetPosSizePixel(Point(aSplitterStartPoint.X() + aOutputSize.Width(),aStartPoint.Y()),Size(REPORT_ENDMARKER_WIDTH,nMinHeight)); aSectionSize.Height() = nMinHeight; } else { - pEndMarker->SetPosSizePixel(Point(aSplitterStartPoint.X() + aOrignalSize.Width(),aStartPoint.Y()),Size(REPORT_ENDMARKER_WIDTH,aSectionSize.Height())); + pEndMarker->SetPosSizePixel(Point(aSplitterStartPoint.X() + aOutputSize.Width(),aStartPoint.Y()),Size(REPORT_ENDMARKER_WIDTH,aSectionSize.Height())); } } else { aSectionSize.Height() = nMinHeight; - pEndMarker->SetPosSizePixel(Point(aSplitterStartPoint.X(),aStartPoint.Y()),Size(aOrignalSize.Width() + REPORT_ENDMARKER_WIDTH,aSectionSize.Height())); + pEndMarker->SetPosSizePixel(Point(aSplitterStartPoint.X(),aStartPoint.Y()),Size(aOutputSize.Width() + REPORT_ENDMARKER_WIDTH,aSectionSize.Height())); } aStartPoint.Y() += aSectionSize.Height() + pSplitter->GetSizePixel().Height(); } // for (;aIter != aEnd ; ++aIter) @@ -351,6 +345,7 @@ pSplitter->SetSplitHdl(LINK(this, OViewsWindow,SplitHdl)); pSplitter->SetEndSplitHdl(LINK(this, OViewsWindow,EndSplitHdl)); pSplitter->SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor() )); + pSplitter->SetSplitPosPixel(LogicToPixel(Size(0,getTotalHeight() + _xSection->getHeight()),MAP_100TH_MM).Height()); //pSplitter->SetSizePixel(Size(pSplitter->GetSizePixel().Width(),1)); pSplitter->Show(); @@ -451,7 +446,7 @@ //m_bInSplitHandler = sal_True; sal_Int32 nSplitPos = _pSplitter->GetSplitPosPixel(); const Point aPos = _pSplitter->GetPosPixel(); - _pSplitter->SetPosPixel( Point( aPos.X(),nSplitPos )); + _pSplitter->SetPosPixel( Point( 0,nSplitPos )); TSectionsMap::iterator aIter = m_aSections.begin(); TSectionsMap::iterator aEnd = m_aSections.end(); for (;aIter != aEnd ; ++aIter) File [changed]: EndMarker.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/EndMarker.cxx?r1=1.2&r2=1.2.44.1 Delta lines: +4 -3 ------------------- --- EndMarker.cxx 2007-07-09 11:56:32+0000 1.2 +++ EndMarker.cxx 2007-11-08 13:06:04+0000 1.2.44.1 @@ -4,9 +4,9 @@ * * $RCSfile: EndMarker.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.44.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:32 $ + * last change: $Author: oj $ $Date: 2007/11/08 13:06:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -102,7 +102,8 @@ void OEndMarker::ImplInitSettings() { //SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); - SetBackground( ); + /*SetBackground( );*/ + SetBackground( Wallpaper( m_aColorConfig.GetColorValue(::svtools::APPBACKGROUND).nColor ) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetShadowColor() ); //SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDarkShadowColor() ); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
