fdo#81356: convert Fraction to boost::rational<long> - wip

* Added rational util functions used by Fraction class not
available in the boost::rational class.
* Replaced usage of Fraction by boost::rational<long>
* Removed code that relies on:
1. fraction.IsValid() -- rational only allow valid values, ie
denominator() != 0
2. rational.denominator() == 0 -- always false
3. rational.denominator() < 0 -- always false but implementation
detail: http://www.boost.org/doc/libs/release/libs/rational/rational.html#Internal%20representation
* Simplified code that relies on:
1. rational.denominator() != 0 -- always true
* BUGS EXIST because Fraction allows the creation of invalid values but
boost::rational throws the exception boost::bad_rational

Change-Id: I84970a4956afb3f91ac0c8f726547466319420f9
Reviewed-on: https://gerrit.libreoffice.org/11551
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

5 files changed, 15 insertions, 17 deletions

diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index a3980162cfbb..1f7c255acb94 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1741,7 +1741,7 @@ void SwPagePreviewWin::AdjustPreviewToNewZoom( const sal_uInt16 _nZoomFactor,
     else if ( _nZoomFactor != 0 )
     {
         // calculate new scaling and set mapping mode appropriately.
-        Fraction aNewScale( _nZoomFactor, 100 );
+        boost::rational<long> aNewScale( _nZoomFactor, 100 );
         MapMode aNewMapMode = GetMapMode();
         aNewMapMode.SetScaleX( aNewScale );
         aNewMapMode.SetScaleY( aNewScale );
diff --git a/sw/source/uibase/uiview/swcli.cxx b/sw/source/uibase/uiview/swcli.cxx
index 71b57499ddb2..900bab9db0e7 100644
--- a/sw/source/uibase/uiview/swcli.cxx
+++ b/sw/source/uibase/uiview/swcli.cxx
@@ -67,8 +67,8 @@ void SwOleClient::RequestNewObjectArea( Rectangle& aLogRect )
         MapMode aObjectMap( VCLUnoHelper::UnoEmbed2VCLMapUnit( GetObject()->getMapUnit( GetAspect() ) ) );
         MapMode aClientMap( GetEditWin()->GetMapMode().GetMapUnit() );
 
-        Size aNewObjSize( Fraction( aLogRect.GetWidth() ) / GetScaleWidth(),
-                          Fraction( aLogRect.GetHeight() ) / GetScaleHeight() );
+        Size aNewObjSize( boost::rational_cast<long>(aLogRect.GetWidth() / GetScaleWidth()),
+                          boost::rational_cast<long>(aLogRect.GetHeight() / GetScaleHeight()) );
 
         // convert to logical coordinates of the embedded object
         Size aNewSize = GetEditWin()->LogicToLogic( aNewObjSize, &aClientMap, &aObjectMap );
@@ -141,8 +141,8 @@ void SwOleClient::ViewChanged()
     const MapMode aObjMap( VCLUnoHelper::UnoEmbed2VCLMapUnit( GetObject()->getMapUnit( GetAspect() ) ) );
     aVisSize = OutputDevice::LogicToLogic( aVisSize, aObjMap, aMyMap );
 
-    aVisSize.Width() = Fraction( aVisSize.Width()  ) * GetScaleWidth();
-    aVisSize.Height()= Fraction( aVisSize.Height() ) * GetScaleHeight();
+    aVisSize.Width() = boost::rational_cast<long>(aVisSize.Width() * GetScaleWidth());
+    aVisSize.Height()= boost::rational_cast<long>(aVisSize.Height() * GetScaleHeight());
 
     SwRect aRect( Point( LONG_MIN, LONG_MIN ), aVisSize );
     rSh.LockView( true );   // Prevent scrolling in the EndAction
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 993b26bed8d7..1b93bc50cae4 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -892,7 +892,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     StartListening( *pDocSh, true );
 
     // Set Zoom-factor from HRuler
-    Fraction aZoomFract( aUsrPref.GetZoom(), 100 );
+    boost::rational<long> aZoomFract( aUsrPref.GetZoom(), 100 );
     m_pHRuler->SetZoom( aZoomFract );
     m_pVRuler->SetZoom( aZoomFract );
     m_pHRuler->SetDoubleClickHdl(LINK( this, SwView, ExecRulerClick ));
diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx
index bd16c2680e54..2082a43a5b41 100644
--- a/sw/source/uibase/uiview/viewmdi.cxx
+++ b/sw/source/uibase/uiview/viewmdi.cxx
@@ -192,7 +192,7 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
         m_pWrtShell->ApplyViewOptions( aOpt );
     }
 
-    const Fraction aFrac( nFac, 100 );
+    const boost::rational<long> aFrac( nFac, 100 );
     m_pVRuler->SetZoom( aFrac );
     m_pVRuler->ForceUpdate();
     m_pHRuler->SetZoom( aFrac );
diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx
index 742afb0b1172..90903289afb5 100644
--- a/sw/source/uibase/uiview/viewport.cxx
+++ b/sw/source/uibase/uiview/viewport.cxx
@@ -947,8 +947,8 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
         aSize.Width() -= (aBorder.Left() + aBorder.Right());
         aSize.Height() -= (aBorder.Top() + aBorder.Bottom());
         Size aObjSizePixel = GetWindow()->LogicToPixel( aObjSize, MAP_TWIP );
-        SfxViewShell::SetZoomFactor( Fraction( aSize.Width(), aObjSizePixel.Width() ),
-                        Fraction( aSize.Height(), aObjSizePixel.Height() ) );
+        SfxViewShell::SetZoomFactor( boost::rational<long>( aSize.Width(), aObjSizePixel.Width() ),
+                        boost::rational<long>( aSize.Height(), aObjSizePixel.Height() ) );
     }
 
     m_bInInnerResizePixel = true;
@@ -985,12 +985,10 @@ void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize )
 
         if( m_pHRuler->IsVisible() || m_pVRuler->IsVisible() )
         {
-            const Fraction& rFrac = GetEditWin().GetMapMode().GetScaleX();
-            long nZoom = 100;
-            if (rFrac.IsValid())
-                nZoom = rFrac.GetNumerator() * 100L / rFrac.GetDenominator();
+            const boost::rational<long>& rFrac = GetEditWin().GetMapMode().GetScaleX();
+            long nZoom = rFrac.numerator() * 100L / rFrac.denominator();
 
-            const Fraction aFrac( nZoom, 100 );
+            const boost::rational<long> aFrac( nZoom, 100 );
             m_pVRuler->SetZoom( aFrac );
             m_pHRuler->SetZoom( aFrac );
             InvalidateRulerPos();   // Invalidate content.
@@ -1136,10 +1134,10 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize )
     }
 }
 
-void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY )
+void SwView::SetZoomFactor( const boost::rational<long>& rX, const boost::rational<long>& rY )
 {
-    const Fraction &rFrac = rX < rY ? rX : rY;
-    SetZoom( SVX_ZOOM_PERCENT, (short) long(rFrac * Fraction( 100, 1 )) );
+    const boost::rational<long>&rFrac = rX < rY ? rX : rY;
+    SetZoom( SVX_ZOOM_PERCENT, (short) boost::rational_cast<long>(rFrac * 100) );
 
     // To minimize rounding errors we also adjust the odd values
     // of the base class if necessary.