Tag: cws_src680_oj14 User: oj Date: 2007-06-05 11:42:43+0000 Modified: dba/reportdesign/source/ui/inc/DesignView.hxx dba/reportdesign/source/ui/inc/ReportSection.hxx dba/reportdesign/source/ui/inc/ReportWindow.hxx dba/reportdesign/source/ui/inc/ScrollHelper.hxx dba/reportdesign/source/ui/inc/ViewsWindow.hxx
Log: #i78101# #i78098# change order of rpt and page header/footer File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: DesignView.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/DesignView.hxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +5 -3 ------------------- --- DesignView.hxx 2007-05-30 16:25:05+0000 1.1.2.4 +++ DesignView.hxx 2007-06-05 11:42:39+0000 1.1.2.5 @@ -6,9 +6,9 @@ * * $RCSfile: DesignView.hxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2007/05/30 16:25:05 $ + * last change: $Author: oj $ $Date: 2007/06/05 11:42:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -317,6 +317,8 @@ * \return <FALSE/> is the event is not handled by the view otherwise <TRUE/> */ sal_Bool isHandleEvent(sal_uInt16 _nId) const; + + sal_uInt32 getMarkedObjectCount() const; }; //================================================================== } //rptui File [changed]: ReportSection.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportSection.hxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +11 -9 -------------------- --- ReportSection.hxx 2007-05-25 11:00:48+0000 1.1.2.4 +++ ReportSection.hxx 2007-06-05 11:42:39+0000 1.1.2.5 @@ -6,9 +6,9 @@ * * $RCSfile: ReportSection.hxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2007/05/25 11:00:48 $ + * last change: $Author: oj $ $Date: 2007/06/05 11:42:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -74,7 +74,6 @@ , public ::cppu::BaseMutex , public ::comphelper::OPropertyChangeListener , public DropTargetHelper - , public DragSourceHelper { OReportPage* m_pPage; OSectionView* m_pView; @@ -99,8 +98,6 @@ // DropTargetHelper overridables virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); - // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // window overrides virtual void Paint( const Rectangle& rRect ); @@ -195,6 +192,11 @@ * @param _sType */ void createDefault(const ::rtl::OUString& _sType); + + /** calls on the section BrkAction + * + */ + void breakAction(); }; //================================================================== } //rptui File [changed]: ReportWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportWindow.hxx?r1=1.1.2.3&r2=1.1.2.4 Delta lines: +4 -2 ------------------- --- ReportWindow.hxx 2007-05-30 16:25:05+0000 1.1.2.3 +++ ReportWindow.hxx 2007-06-05 11:42:39+0000 1.1.2.4 @@ -6,9 +6,9 @@ * * $RCSfile: ReportWindow.hxx,v $ * - * $Revision: 1.1.2.3 $ + * $Revision: 1.1.2.4 $ * - * last change: $Author: oj $ $Date: 2007/05/30 16:25:05 $ + * last change: $Author: oj $ $Date: 2007/06/05 11:42:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -248,6 +248,8 @@ * \param bBoundRects */ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false); + + sal_uInt32 getMarkedObjectCount() const; }; //================================================================== } //rptui File [changed]: ScrollHelper.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ScrollHelper.hxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +7 -2 ------------------- --- ScrollHelper.hxx 2007-06-04 10:50:36+0000 1.1.2.4 +++ ScrollHelper.hxx 2007-06-05 11:42:39+0000 1.1.2.5 @@ -6,9 +6,9 @@ * * $RCSfile: ScrollHelper.hxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: fs $ $Date: 2007/06/04 10:50:36 $ + * last change: $Author: oj $ $Date: 2007/06/05 11:42:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -236,10 +236,15 @@ * \param bBoundRects */ void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false); +<<<<<<< ScrollHelper.hxx + + sal_uInt32 getMarkedObjectCount() const; +======= private: void impl_initScrollBar( ScrollBar& _rScrollBar ) const; void impl_scrollContent( long nDeltaX, long nDeltaY ); +>>>>>>> 1.1.2.4 }; } #endif // RPTUI_SCROLLHELPER_HXX File [changed]: ViewsWindow.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ViewsWindow.hxx?r1=1.1.2.4&r2=1.1.2.5 Delta lines: +24 -3 -------------------- --- ViewsWindow.hxx 2007-05-31 12:04:59+0000 1.1.2.4 +++ ViewsWindow.hxx 2007-06-05 11:42:39+0000 1.1.2.5 @@ -6,9 +6,9 @@ * * $RCSfile: ViewsWindow.hxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2007/05/31 12:04:59 $ + * last change: $Author: oj $ $Date: 2007/06/05 11:42:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,6 +65,7 @@ #ifndef _SVDEDTV_HXX #include <svx/svdedtv.hxx> #endif +#include <SectionView.hxx> #include <list> #include <vector> @@ -107,6 +108,13 @@ return lhs.first.first; } }; + struct TViewPairHelper : public ::std::unary_function< TSectionsMap::value_type, OSectionView > + { + OSectionView& operator() (const TSectionsMap::value_type& lhs) const + { + return *(lhs.first.first->getView()); + } + }; private: TSectionsMap m_aSections; svtools::ColorConfig m_aColorConfig; @@ -283,6 +291,19 @@ /** returns the current position in the list */ USHORT getPosition(const OReportSection* _pSection = NULL) const; + + /** calls on every section BrkAction + * + */ + void breakAction(); + + void BegDragObj(const Point& _aPnt, SdrHdl* _pHdl); + void EndDragObj(BOOL _bCopy = FALSE); + void EndAction(); + + void MovAction(const Point& rPnt); + + sal_uInt32 getMarkedObjectCount() const; }; //============================================================================== } // rptui --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
