CWS-TOOLING: integrate CWS aw058

2008-11-19 14:27:57 +0100 aw  r263994 : #i95264# corrected line primitive range calculation for hairlines
2008-11-18 11:31:52 +0100 wg  r263754 : i96156
2008-11-18 11:22:38 +0100 wg  r263752 : i96156
2008-11-13 11:46:49 +0100 aw  r263626 : #i93169# used flag the wrong way; true means that nothing was done yet
2008-11-12 15:33:41 +0100 wg  r263601 : i96156
2008-11-12 13:22:38 +0100 wg  r263592 : i95527
2008-11-12 13:18:51 +0100 wg  r263591 : i95527
2008-10-29 13:22:02 +0100 aw  r262794 : #i93485# identified reason and with PL's help changed problem accordingly with usage of an old fallback. This will need to be optimized again by HDU when he finds the time.
2008-10-28 18:23:04 +0100 aw  r262763 : unxmacxi compiler warning fixed
2008-10-28 18:17:01 +0100 aw  r262762 : unxmacxi compiler warning fixed
2008-10-28 17:55:18 +0100 aw  r262761 : unxmacxi compiler warning fixed
2008-10-28 13:48:22 +0100 aw  r262743 : #i93485# added UnifiedAlphaPrimitive2D to VclRenderer; corrected getB2DRange implementations for hairlines which are view-dependent
2008-10-28 12:40:55 +0100 aw  r262735 : #i93485# had to move Pre/PostPaint to LocalPre/PostPaint since PrePaint is a virtual window method
2008-10-27 15:54:10 +0100 aw  r262679 : #i19871# adapted the call order to parent implementations in some Nbc methods in SdrPathObj due to errors in SnapRect recalculation when GluePoints are involved
2008-10-24 18:31:48 +0200 aw  r262661 : #i77187# disable all buttons in bezier toolbar when move and/or resize protected object is involved
2008-10-24 18:30:16 +0200 aw  r262660 : #i77187# simplified and secured model changers, added toolbar update, disabled move drag start when polygon point is selected
2008-10-24 12:57:50 +0200 hdu  r262635 : #i93485# use device transformation for SAL layer
2008-10-24 12:41:37 +0200 hdu  r262634 : #i93485# use device transformation for SAL layer
2008-10-23 19:46:12 +0200 aw  r262630 : mac compiler warning fixed
2008-10-23 18:15:02 +0200 aw  r262628 : #i93485# modified dialog previews to use prerendering
2008-10-23 18:14:27 +0200 aw  r262627 : #i93485# added assert when render helper uses Window as copy source
2008-10-22 18:07:30 +0200 aw  r262610 : #i95264# fixes assertion
2008-10-22 14:31:51 +0200 aw  r262606 : #i89661# also enabling DrawTransparent shortcut for VCL-Renderer
2008-10-22 14:10:31 +0200 aw  r262604 : #i89661# new HitTest 2D primitive to support BoundRect and HitTest calculations/tests
2008-10-22 14:09:22 +0200 aw  r262603 : #i89661# new HitTest tolerance, new TextFrame selection overlay, support for HitTest geometry
2008-10-22 14:08:16 +0200 aw  r262602 : #i89661# correcting old HitTest tolerance expansion
2008-10-20 15:31:48 +0200 aw  r262321 : #i89661# added patch to test it
2008-10-20 11:50:31 +0200 aw  r262310 : #i87762# removed no longer used icons (aw053)
2008-10-17 15:41:48 +0200 aw  r262288 : #i93169#, #i93180# FormControl corrections for Primitive handling
2008-10-17 15:40:54 +0200 aw  r262287 : #i93169#, #i93180# FormControl corrections for Primitive handling
2008-10-16 11:12:44 +0200 aw  r262253 : #i93595# removed superfluous grid interface
2008-10-16 11:11:20 +0200 aw  r262252 : #i93595# changed grid display to sub-grid usage and new defaults
2008-10-15 15:09:40 +0200 aw  r262234 : #i93597# moved flag for only vertical PageBorder, added reacting on it to primitive creation
2008-10-15 15:09:09 +0200 aw  r262233 : #i93597# moved flag for only vertical PageBorder
2008-10-15 15:08:46 +0200 aw  r262232 : #i93597# moved flag for only vertical PageBorder, added reacting on it to primitive creation
2008-10-14 16:27:07 +0200 aw  r262207 : #i93648# (flushViewObjectContacts) and #i93318# (propertyChange)
2008-10-14 16:25:10 +0200 aw  r262206 : #i93318# back to old state since detecting a change is not placed well at the primitive (which is a graphical information at the itme it was fetched). Instead i will add the needed check and flush at the FormControl's VOC
2008-10-14 13:47:38 +0200 aw  r262201 : #i93318# added a change listener to the XControlModel and code to make the operator== at control primitive fail

4 files changed, 23 insertions, 10 deletions

diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 16ee945bb..b462c3c04 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -89,7 +89,8 @@ namespace rptui
         USHORT								m_nCurrentPosition;
         USHORT								m_eActObj;
         BOOL								m_bFirstDraw;
-        Size								m_aGridSize;
+        Size								m_aGridSizeCoarse;
+        Size                                m_aGridSizeFine;
         BOOL								m_bGridVisible;
         BOOL								m_bGridSnap;
         BOOL								m_bDeleted;
@@ -188,7 +189,9 @@ namespace rptui
                                     ,const ::rtl::OUString& _sColorEntry
                                     ,USHORT _nPosition = USHRT_MAX);
 
-        inline Size		getGridSize() const { return m_aGridSize; }
+        inline Size		getGridSizeCoarse() const { return m_aGridSizeCoarse; }
+        inline Size		getGridSizeFine() const { return m_aGridSizeFine; }
+
         inline BOOL		isGridSnap() const { return m_bGridSnap; }
         void            setGridSnap(BOOL bOn);
         void            setDragStripes(BOOL bOn);
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 9aabbc29b..31bd9d6d9 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -157,7 +157,8 @@ ODesignView::ODesignView(   Window* pParent,
     ,m_nCurrentPosition(USHRT_MAX)
     ,m_eActObj( OBJ_NONE )
     ,m_bFirstDraw(FALSE)
-    ,m_aGridSize( 250, 250 )	// 100TH_MM
+    ,m_aGridSizeCoarse( 1000, 1000 )	// #i93595# 100TH_MM changed to grid using coarse 1 cm grid
+    ,m_aGridSizeFine( 250, 250 )        // and a 0,25 cm subdivision for better visualisation
     ,m_bGridVisible(TRUE)
     ,m_bGridSnap(TRUE)
     ,m_bDeleted( FALSE )
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index a1d9cfc4d..e932ed61f 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -204,18 +204,28 @@ void OReportSection::fill()
 
     m_pView = new OSectionView( m_pModel.get(), this, m_pParent->getViewsWindow()->getView() );
 
+    // #i93597# tell SdrPage that only left and right page border is defined
+    // instead of the full rectangle definition
+    m_pPage->setPageBorderOnlyLeftRight(true);
+
     // without the following call, no grid is painted
     m_pView->ShowSdrPage( m_pPage );
 
     m_pView->SetMoveSnapOnlyTopLeft( TRUE );
     ODesignView* pDesignView = m_pParent->getViewsWindow()->getView()->getReportView();
 
-    Size aGridSize = pDesignView->getGridSize();
-    m_pView->SetGridCoarse( aGridSize );
-    Fraction aX(aGridSize.A());
-    Fraction aY(aGridSize.B());
-    m_pView->SetSnapGridWidth(aX,aY);
-    //m_pView->SetSnapGrid( pDesignView->getGridSize() );
+    // #i93595# Adapted grid to a more coarse grid and subdivisions for better visualisation. This
+    // is only for visualisation and has nothing to do with the actual snap
+    const Size aGridSizeCoarse(pDesignView->getGridSizeCoarse());
+    const Size aGridSizeFine(pDesignView->getGridSizeFine());
+    m_pView->SetGridCoarse(aGridSizeCoarse);
+    m_pView->SetGridFine(aGridSizeFine);
+
+    // #i93595# set snap grid width to snap to all existing subdivisions
+    const Fraction aX(aGridSizeFine.A());
+    const Fraction aY(aGridSizeFine.B());
+    m_pView->SetSnapGridWidth(aX, aY);
+
     m_pView->SetGridSnap( pDesignView->isGridSnap() );	
     m_pView->SetGridFront( FALSE );
     m_pView->SetDragStripes( TRUE );
diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx
index b9f8259bd..300cb9ef0 100644
--- a/reportdesign/source/ui/report/SectionView.cxx
+++ b/reportdesign/source/ui/report/SectionView.cxx
@@ -57,7 +57,6 @@ OSectionView::OSectionView( SdrModel* pModel, OReportSection* _pSectionWindow, O
     SetBufferedOutputAllowed(true);
     SetBufferedOverlayAllowed(true);
     SetPageBorderVisible(false);
-    SetBordVisibleOnlyLeftRight();
     SetBordVisible();
     SetQuickTextEditMode(FALSE);
 }