mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#84854 it seems long is not enough on 32 bit

Browse Source 
Fraction used BigInt internally for computations, rational does nothing
like that.

Change-Id: I3e9b25074f979bc291208f7c6362c3c40eb77ff5
This commit is contained in:
David Tardon 2014-10-16 15:30:32 +02:00
parent ada4862afc
commit 582ef22d3e
330 changed files with 1001 additions and 1001 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/dlged/dlged.cxx
View File

@ -234,7 +234,7 @@ DlgEditor::DlgEditor (
pDlgEdView->SetWorkArea( Rectangle( Point( 0, 0 ), pDlgEdPage->GetSize() ) );
pDlgEdView->SetGridCoarse( aGridSize );
pDlgEdView->SetSnapGridWidth(boost::rational<long>(aGridSize.Width(),1), boost::rational<long>(aGridSize.Height(),1));
pDlgEdView->SetSnapGridWidth(boost::rational<sal_Int64>(aGridSize.Width(),1), boost::rational<sal_Int64>(aGridSize.Height(),1));
pDlgEdView->SetGridSnap( bGridSnap );
pDlgEdView->SetGridVisible( bGridVisible );
pDlgEdView->SetDragStripes(false);

4
basctl/source/dlged/dlgedobj.cxx
View File

@ -940,7 +940,7 @@ void DlgEdObj::NbcMove( const Size& rSize )
GetDlgEdForm()->GetDlgEditor().SetDialogModelChanged(true);
}
void DlgEdObj::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
void DlgEdObj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrUnoObj::NbcResize( rRef, xFract, yFract );
@ -1590,7 +1590,7 @@ void DlgEdForm::NbcMove( const Size& rSize )
GetDlgEditor().SetDialogModelChanged(true);
}
void DlgEdForm::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
void DlgEdForm::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrUnoObj::NbcResize( rRef, xFract, yFract );

4
basctl/source/inc/dlgedobj.hxx
View File

@ -63,7 +63,7 @@ protected:
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac);
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
using SfxListener::StartListening;
@ -153,7 +153,7 @@ private:
protected:
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
public:

4
basic/source/runtime/methods1.cxx
View File

@ -1340,8 +1340,8 @@ static double GetDialogZoomFactor( bool bX, long nValue )
if( pDevice )
{
Size aRefSize( nValue, nValue );
boost::rational<long> aFracX( 1, 26 );
boost::rational<long> aFracY( 1, 24 );
boost::rational<sal_Int64> aFracX( 1, 26 );
boost::rational<sal_Int64> aFracY( 1, 24 );
MapMode aMap( MAP_APPFONT, Point(), aFracX, aFracY );
Size aScaledSize = pDevice->LogicToPixel( aRefSize, aMap );
aRefSize = pDevice->LogicToPixel( aRefSize, MapMode(MAP_TWIP) );

4
chart2/source/controller/main/ChartController_Window.cxx
View File

@ -244,8 +244,8 @@ void SAL_CALL ChartController::setPosSize(
MapMode aNewMapMode(
MAP_100TH_MM,
Point(0,0),
boost::rational<long>(nScaleXNumerator, nScaleXDenominator),
boost::rational<long>(nScaleYNumerator, nScaleYDenominator) );
boost::rational<sal_Int64>(nScaleXNumerator, nScaleXDenominator),
boost::rational<sal_Int64>(nScaleYNumerator, nScaleYDenominator) );
m_pChartWindow->SetMapMode(aNewMapMode);
m_pChartWindow->setPosSizePixel( X, Y, Width, Height, Flags );

2
chart2/source/view/main/DrawModelWrapper.cxx
View File

@ -99,7 +99,7 @@ DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>
m_pChartItemPool = ChartItemPool::CreateChartItemPool();
SetScaleUnit(MAP_100TH_MM);
SetScaleFraction(boost::rational<long>(1, 1));
SetScaleFraction(boost::rational<sal_Int64>(1, 1));
SetDefaultFontHeight(423); // 12pt
SfxItemPool* pMasterPool = &GetItemPool();

4
cui/source/tabpages/grfpage.cxx
View File

@ -812,8 +812,8 @@ void SvxCropExample::SetFrameSize( const Size& rSz )
if(!aFrameSize.Height())
aFrameSize.Height() = 1;
Size aWinSize( GetOutputSizePixel() );
boost::rational<long> aXScale( aWinSize.Width() * 4, aFrameSize.Width() * 5 );
boost::rational<long> aYScale( aWinSize.Height() * 4, aFrameSize.Height() * 5 );
boost::rational<sal_Int64> aXScale( aWinSize.Width() * 4, aFrameSize.Width() * 5 );
boost::rational<sal_Int64> aYScale( aWinSize.Height() * 4, aFrameSize.Height() * 5 );
if( aYScale < aXScale )
aXScale = aYScale;

10
cui/source/tabpages/transfrm.cxx
View File

@ -90,7 +90,7 @@ static void lcl_ConvertRect(basegfx::B2DRange& rRange, const sal_uInt16 nDigits,
rRange = basegfx::B2DRange(aTopLeft, aBottomRight);
}
static void lcl_ScaleRect(basegfx::B2DRange& rRange, const boost::rational<long> aUIScale)
static void lcl_ScaleRect(basegfx::B2DRange& rRange, const boost::rational<sal_Int64> aUIScale)
{
const double fFactor(1.0 / boost::rational_cast<double>(aUIScale));
rRange = basegfx::B2DRange(rRange.getMinimum() * fFactor, rRange.getMaximum() * fFactor);
@ -254,7 +254,7 @@ void SvxAngleTabPage::Construct()
}
// take scale into account
const boost::rational<long> aUIScale = pView->GetModel()->GetUIScale();
const boost::rational<sal_Int64> aUIScale = pView->GetModel()->GetUIScale();
lcl_ScaleRect(maRange, aUIScale);
// take UI units into account
@ -475,7 +475,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet* rAttrs)
if( m_pMtrRadius->IsValueChangedFromSaved() )
{
boost::rational<long> aUIScale = pView->GetModel()->GetUIScale();
boost::rational<sal_Int64> aUIScale = pView->GetModel()->GetUIScale();
long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit );
nTmp = boost::rational_cast<long>(nTmp * aUIScale);
@ -758,7 +758,7 @@ void SvxPositionSizeTabPage::Construct()
}
// take scale into account
const boost::rational<long> aUIScale = mpView->GetModel()->GetUIScale();
const boost::rational<sal_Int64> aUIScale = mpView->GetModel()->GetUIScale();
lcl_ScaleRect( maWorkRange, aUIScale );
lcl_ScaleRect( maRange, aUIScale );
@ -828,7 +828,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet* rOutAttrs )
if ( m_pMtrWidth->IsValueModified() || m_pMtrHeight->IsValueModified() )
{
boost::rational<long> aUIScale = mpView->GetModel()->GetUIScale();
boost::rational<sal_Int64> aUIScale = mpView->GetModel()->GetUIScale();
// get Width
double nWidth = static_cast<double>(m_pMtrWidth->GetValue( meDlgUnit ));

2
dbaccess/source/ui/inc/JoinController.hxx
View File

@ -47,7 +47,7 @@ namespace dbaui
TTableConnectionData m_vTableConnectionData;
TTableWindowData m_vTableData;
boost::rational<long> m_aZoom;
boost::rational<sal_Int64> m_aZoom;
::dbtools::SQLExceptionInfo m_aExceptionInfo;
OAddTableDlg* m_pAddTableDialog;

2
drawinglayer/source/primitive2d/metafileprimitive2d.cxx
View File

@ -573,7 +573,7 @@ namespace
basegfx::B2DHomMatrix getTransformFromMapMode(const MapMode& rMapMode)
{
basegfx::B2DHomMatrix aMapping;
const boost::rational<long> aNoScale(1, 1);
const boost::rational<sal_Int64> aNoScale(1, 1);
const Point& rOrigin(rMapMode.GetOrigin());
if(0 != rOrigin.X() || 0 != rOrigin.Y())

2
editeng/source/editeng/impedit3.cxx
View File

@ -501,7 +501,7 @@ bool ImpEditEngine::ImpCheckRefMapMode()
if ( bChange )
{
boost::rational<long> Scale1( 1, 1 );
boost::rational<sal_Int64> Scale1( 1, 1 );
aMapMode.SetScaleX( Scale1 );
aMapMode.SetScaleY( Scale1 );
GetRefDevice()->Push();

4
filter/source/graphicfilter/eos2met/eos2met.cxx
View File

@ -2168,8 +2168,8 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
if ( pA->GetMapMode().GetMapUnit() == MAP_RELATIVE )
{
MapMode aMM = pA->GetMapMode();
boost::rational<long> aScaleX = aMM.GetScaleX();
boost::rational<long> aScaleY = aMM.GetScaleY();
boost::rational<sal_Int64> aScaleX = aMM.GetScaleX();
boost::rational<sal_Int64> aScaleY = aMM.GetScaleY();
Point aOrigin = aPictureMapMode.GetOrigin();
BigInt aX( aOrigin.X() );

6
filter/source/graphicfilter/epict/epict.cxx
View File

@ -1962,8 +1962,8 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
if( pA->GetMapMode().GetMapUnit() == MAP_RELATIVE )
{
MapMode aMM = pA->GetMapMode();
boost::rational<long> aScaleX = aMM.GetScaleX();
boost::rational<long> aScaleY = aMM.GetScaleY();
boost::rational<sal_Int64> aScaleX = aMM.GetScaleX();
boost::rational<sal_Int64> aScaleY = aMM.GetScaleY();
Point aOrigin = aSrcMapMode.GetOrigin();
BigInt aX( aOrigin.X() );
@ -2183,7 +2183,7 @@ bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStream, F
{
PictWriterAttrStackMember* pAt;
MapMode aMap72( MAP_INCH );
boost::rational<long> aDPIFrac( 1, 72 );
boost::rational<sal_Int64> aDPIFrac( 1, 72 );
bStatus=true;
nLastPercent=0;

4
filter/source/graphicfilter/ios2met/ios2met.cxx
View File

@ -2125,9 +2125,9 @@ void OS2METReader::ReadDsc(sal_uInt16 nDscID, sal_uInt16 /*nDscLen*/)
ReadCoord(b32);
if (nUnitType==0x00 && xr>0 && yr>0)
aGlobMapMode=MapMode(MAP_INCH,Point(0,0),boost::rational<long>(10,xr),boost::rational<long>(10,yr));
aGlobMapMode=MapMode(MAP_INCH,Point(0,0),boost::rational<sal_Int64>(10,xr),boost::rational<sal_Int64>(10,yr));
else if (nUnitType==0x01 && xr>0 && yr>0)
aGlobMapMode=MapMode(MAP_CM,Point(0,0),boost::rational<long>(10,xr),boost::rational<long>(10,yr));
aGlobMapMode=MapMode(MAP_CM,Point(0,0),boost::rational<sal_Int64>(10,xr),boost::rational<sal_Int64>(10,yr));
else
aGlobMapMode=MapMode();

6
filter/source/graphicfilter/ipict/ipict.cxx
View File

@ -166,8 +166,8 @@ private:
Size aActOvalSize;
vcl::Font aActFont;
boost::rational<long> aHRes;
boost::rational<long> aVRes;
boost::rational<sal_Int64> aHRes;
boost::rational<sal_Int64> aVRes;
bool Callback(sal_uInt16 nPercent);
@ -1841,7 +1841,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
aActFont.SetSize(Size(0,12));
aActFont.SetAlign(ALIGN_BASELINE);
aHRes = aVRes = boost::rational<long>( 1, 1 );
aHRes = aVRes = boost::rational<sal_Int64>( 1, 1 );
pVirDev = new VirtualDevice();
pVirDev->EnableOutput(false);

4
filter/source/graphicfilter/ipsd/ipsd.cxx
View File

@ -148,8 +148,8 @@ bool PSDReader::ReadPSD(Graphic & rGraphic )
if ( mnXResFixed && mnYResFixed )
{
Point aEmptyPoint;
boost::rational<long> aFractX( 1, mnXResFixed >> 16 );
boost::rational<long> aFractY( 1, mnYResFixed >> 16 );
boost::rational<sal_Int64> aFractX( 1, mnXResFixed >> 16 );
boost::rational<sal_Int64> aFractY( 1, mnYResFixed >> 16 );
MapMode aMapMode( MAP_INCH, aEmptyPoint, aFractX, aFractY );
Size aPrefSize = OutputDevice::LogicToLogic( aBitmapSize, aMapMode, MAP_100TH_MM );
rGraphic.SetPrefSize( aPrefSize );

2
filter/source/graphicfilter/itiff/itiff.cxx
View File

@ -1127,7 +1127,7 @@ void TIFFReader::MakePalCol( void )
nRX=(sal_uLong)(fXResolution*2.54+0.5);
nRY=(sal_uLong)(fYResolution*2.54+0.5);
}
MapMode aMapMode(MAP_INCH,Point(0,0),boost::rational<long>(1,nRX),boost::rational<long>(1,nRY));
MapMode aMapMode(MAP_INCH,Point(0,0),boost::rational<sal_Int64>(1,nRX),boost::rational<sal_Int64>(1,nRY));
aBitmap.SetPrefMapMode(aMapMode);
aBitmap.SetPrefSize(Size(nImageWidth,nImageLength));
}

2
filter/source/msfilter/eschesdo.cxx
View File

@ -64,7 +64,7 @@ ImplEESdrWriter::ImplEESdrWriter( EscherEx& rEx )
: mpEscherEx(&rEx)
, maMapModeSrc(MAP_100TH_MM)
// PowerPoint: 576 dpi, WinWord: 1440 dpi, Excel: 1440 dpi
, maMapModeDest( MAP_INCH, Point(), boost::rational<long>( 1, EES_MAP_FRACTION ), boost::rational<long>( 1, EES_MAP_FRACTION ) )
, maMapModeDest( MAP_INCH, Point(), boost::rational<sal_Int64>( 1, EES_MAP_FRACTION ), boost::rational<sal_Int64>( 1, EES_MAP_FRACTION ) )
, mpPicStrm(NULL)
, mpHostAppData(NULL)
, mnPagesWritten(0)

18
filter/source/msfilter/msdffimp.cxx
View File

@ -170,9 +170,9 @@ void Impl_OlePres::Write( SvStream & rStm )
{
// Always to 1/100 mm, until Mtf-Solution found
// Assumption (no scaling, no origin translation)
DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleX() == boost::rational<long>( 1, 1 ),
DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleX() == boost::rational<sal_Int64>( 1, 1 ),
"X-Skalierung im Mtf" );
DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleY() == boost::rational<long>( 1, 1 ),
DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleY() == boost::rational<sal_Int64>( 1, 1 ),
"Y-Skalierung im Mtf" );
DBG_ASSERT( pMtf->GetPrefMapMode().GetOrigin() == Point(),
"Origin-Verschiebung im Mtf" );
@ -183,8 +183,8 @@ void Impl_OlePres::Write( SvStream & rStm )
Size aS( aPrefS );
aS = OutputDevice::LogicToLogic( aS, nMU, MAP_100TH_MM );
pMtf->Scale( boost::rational<long>( aS.Width(), aPrefS.Width() ),
boost::rational<long>( aS.Height(), aPrefS.Height() ) );
pMtf->Scale( boost::rational<sal_Int64>( aS.Width(), aPrefS.Width() ),
boost::rational<sal_Int64>( aS.Height(), aPrefS.Height() ) );
pMtf->SetPrefMapMode( MAP_100TH_MM );
pMtf->SetPrefSize( aS );
}
@ -3088,10 +3088,10 @@ void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const
sal_uInt32 SvxMSDffManager::ScalePt( sal_uInt32 nVal ) const
{
MapUnit eMap = pSdrModel->GetScaleUnit();
boost::rational<long> aFact( GetMapFactor( MAP_POINT, eMap ).X() );
boost::rational<sal_Int64> aFact( GetMapFactor( MAP_POINT, eMap ).X() );
long aMul = aFact.numerator();
long aDiv = aFact.denominator() * 65536;
aFact = boost::rational<long>( aMul, aDiv ); // try again to shorten it
aFact = boost::rational<sal_Int64>( aMul, aDiv ); // try again to shorten it
return BigMulDiv( nVal, aFact.numerator(), aFact.denominator() );
}
@ -3108,10 +3108,10 @@ void SvxMSDffManager::SetModel(SdrModel* pModel, long nApplicationScale)
// PPT works in units of 576DPI
// WW on the other side uses twips, i.e. 1440DPI.
MapUnit eMap = pSdrModel->GetScaleUnit();
boost::rational<long> aFact = GetMapFactor(MAP_INCH, eMap).X();
boost::rational<sal_Int64> aFact = GetMapFactor(MAP_INCH, eMap).X();
long nMul=aFact.numerator();
long nDiv=aFact.denominator()*nApplicationScale;
aFact=boost::rational<long>(nMul,nDiv); // try again to shorten it
aFact=boost::rational<sal_Int64>(nMul,nDiv); // try again to shorten it
// For 100TH_MM -> 2540/576=635/144
// For Twip -> 1440/576=5/2
nMapMul = aFact.numerator();
@ -3123,7 +3123,7 @@ void SvxMSDffManager::SetModel(SdrModel* pModel, long nApplicationScale)
aFact=GetMapFactor(MAP_100TH_MM,eMap).X();
nMul=aFact.numerator();
nDiv=aFact.denominator()*360;
aFact=boost::rational<long>(nMul,nDiv); // try again to shorten it
aFact=boost::rational<sal_Int64>(nMul,nDiv); // try again to shorten it
// For 100TH_MM -> 1/360
// For Twip -> 14,40/(25,4*360)=144/91440=1/635
nEmuMul=aFact.numerator();

2
filter/source/msfilter/svdfppt.cxx
View File

@ -2474,7 +2474,7 @@ Size SdrPowerPointImport::GetPageSize() const
long nInchMul = 1, nInchDiv = 1;
if ( bInch )
{ // temporarily convert size (for rounding it) from inch to metric units
boost::rational<long> aFact = GetMapFactor(eMap,MAP_100TH_MM).X();
boost::rational<sal_Int64> aFact = GetMapFactor(eMap,MAP_100TH_MM).X();
nInchMul = aFact.numerator();
nInchDiv = aFact.denominator();
aRet.Width() = BigMulDiv( aRet.Width(), nInchMul, nInchDiv );

8
filter/source/svg/svgwriter.cxx
View File

@ -3583,14 +3583,14 @@ void SVGActionWriter::WriteMetaFile( const Point& rPos100thmm,
{
MapMode aMapMode( rMtf.GetPrefMapMode() );
Size aPrefSize( rMtf.GetPrefSize() );
boost::rational<long> aFractionX = aMapMode.GetScaleX();
boost::rational<long> aFractionY = aMapMode.GetScaleY();
boost::rational<sal_Int64> aFractionX = aMapMode.GetScaleX();
boost::rational<sal_Int64> aFractionY = aMapMode.GetScaleY();
mpVDev->Push();
Size aSize( OutputDevice::LogicToLogic( rSize100thmm, MAP_100TH_MM, aMapMode ) );
aMapMode.SetScaleX( aFractionX *= boost::rational<long>( aSize.Width(), aPrefSize.Width() ) );
aMapMode.SetScaleY( aFractionY *= boost::rational<long>( aSize.Height(), aPrefSize.Height() ) );
aMapMode.SetScaleX( aFractionX *= boost::rational<sal_Int64>( aSize.Width(), aPrefSize.Width() ) );
aMapMode.SetScaleY( aFractionY *= boost::rational<sal_Int64>( aSize.Height(), aPrefSize.Height() ) );
Point aOffset( OutputDevice::LogicToLogic( rPos100thmm, MAP_100TH_MM, aMapMode ) );
aMapMode.SetOrigin( aOffset += aMapMode.GetOrigin() );

2
forms/source/richtext/richtextimplcontrol.cxx
View File

@ -515,7 +515,7 @@ namespace frm
void RichTextControlImpl::notifyZoomChanged()
{
const boost::rational<long>& rZoom = m_pAntiImpl->GetZoom();
const boost::rational<sal_Int64>& rZoom = m_pAntiImpl->GetZoom();
MapMode aMapMode( m_pAntiImpl->GetMapMode() );
aMapMode.SetScaleX( rZoom );

2
include/oox/export/chartexport.hxx
View File

@ -84,7 +84,7 @@ public:
private:
sal_Int32 mnXmlNamespace;
sal_Int32 mnSeriesCount;
boost::rational<long> maFraction;
boost::rational<sal_Int64> maFraction;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxChartModel;
com::sun::star::uno::Reference< com::sun::star::chart::XDiagram > mxDiagram;
com::sun::star::uno::Reference< com::sun::star::chart2::XDiagram > mxNewDiagram;

2
include/oox/export/shapes.hxx
View File

@ -66,7 +66,7 @@ protected:
private:
sal_Int32 mnXmlNamespace;
boost::rational<long> maFraction;
boost::rational<sal_Int64> maFraction;
MapMode maMapModeSrc, maMapModeDest;
::com::sun::star::awt::Size MapSize( const ::com::sun::star::awt::Size& ) const;

8
include/sfx2/ipclient.hxx
View File

@ -73,10 +73,10 @@ public:
bool SetObjArea( const Rectangle & );
Rectangle GetObjArea() const;
Rectangle GetScaledObjArea() const;
void SetSizeScale( const boost::rational<long> & rScaleWidth, const boost::rational<long> & rScaleHeight );
bool SetObjAreaAndScale( const Rectangle&, const boost::rational<long>&, const boost::rational<long>& );
const boost::rational<long>& GetScaleWidth() const;
const boost::rational<long>& GetScaleHeight() const;
void SetSizeScale( const boost::rational<sal_Int64> & rScaleWidth, const boost::rational<sal_Int64> & rScaleHeight );
bool SetObjAreaAndScale( const Rectangle&, const boost::rational<sal_Int64>&, const boost::rational<sal_Int64>& );
const boost::rational<sal_Int64>& GetScaleWidth() const;
const boost::rational<sal_Int64>& GetScaleHeight() const;
void Invalidate();
static SfxInPlaceClient* GetClient( SfxObjectShell* pDoc, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObject );
sal_Int64 GetAspect() const;

4
include/sfx2/objsh.hxx
View File

@ -638,8 +638,8 @@ public:
SAL_DLLPRIVATE void DoDraw_Impl( OutputDevice* pDev,
const Point & rViewPos,
const boost::rational<long>& rScaleX,
const boost::rational<long>& rScaleY,
const boost::rational<sal_Int64>& rScaleX,
const boost::rational<sal_Int64>& rScaleY,
const JobSetup & rSetup,
sal_uInt16 nAspect );

2
include/sfx2/viewfrm.hxx
View File

@ -119,7 +119,7 @@ public:
SfxBindings& GetBindings() { return *pBindings; }
const SfxBindings& GetBindings() const { return *pBindings; }
vcl::Window& GetWindow() const;
virtual void SetZoomFactor( const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY );
virtual void SetZoomFactor( const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY );
SfxProgress* GetProgress() const;

2
include/sfx2/viewsh.hxx
View File

@ -146,7 +146,7 @@ protected:
virtual void InnerResizePixel( const Point &rOfs, const Size &rSize );
virtual void OuterResizePixel( const Point &rOfs, const Size &rSize );
virtual void SetZoomFactor( const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY );
virtual void SetZoomFactor( const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY );
virtual void Move();

2
include/svtools/imap.hxx
View File

@ -117,7 +117,7 @@ public:
void SetName( const OUString& rName ) { aName = rName; }
// skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY );
void Scale( const boost::rational<sal_Int64>& rFractX, const boost::rational<sal_Int64>& rFracY );
// Im-/Export
void Write ( SvStream& rOStm, const OUString& rBaseURL ) const;

2
include/svtools/imapcirc.hxx
View File

@ -60,7 +60,7 @@ public:
// liefert das BoundRect des Kreis-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const SAL_OVERRIDE;
void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY );
void Scale( const boost::rational<sal_Int64>& rFractX, const boost::rational<sal_Int64>& rFracY );
using IMapObject::IsEqual;
bool IsEqual( const IMapCircleObject& rEqObj );

2
include/svtools/imappoly.hxx
View File

@ -66,7 +66,7 @@ public:
const Rectangle& GetExtraEllipse() const { return aEllipse; }
void SetExtraEllipse( const Rectangle& rEllipse );
void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY );
void Scale( const boost::rational<sal_Int64>& rFractX, const boost::rational<sal_Int64>& rFracY );
using IMapObject::IsEqual;
bool IsEqual( const IMapPolygonObject& rEqObj );

2
include/svtools/imaprect.hxx
View File

@ -58,7 +58,7 @@ public:
// liefert das BoundRect des Rechteck-Objektes in 1/100mm
virtual Rectangle GetBoundRect() const SAL_OVERRIDE { return aRect; }
void Scale( const boost::rational<long>& rFractX, const boost::rational<long>& rFracY );
void Scale( const boost::rational<sal_Int64>& rFractX, const boost::rational<sal_Int64>& rFracY );
using IMapObject::IsEqual;
bool IsEqual( const IMapRectangleObject& rEqObj );

6
include/svtools/ruler.hxx
View File

@ -644,7 +644,7 @@ private:
RulerType meDragType;
MapUnit meSourceUnit;
FieldUnit meUnit;
boost::rational<long> maZoom;
boost::rational<sal_Int64> maZoom;
bool mbCalc;
bool mbFormat;
bool mbDrag;
@ -745,8 +745,8 @@ public:
void SetUnit( FieldUnit eNewUnit );
FieldUnit GetUnit() const { return meUnit; }
void SetZoom( const boost::rational<long>& rNewZoom );
boost::rational<long> GetZoom() const { return maZoom; }
void SetZoom( const boost::rational<sal_Int64>& rNewZoom );
boost::rational<sal_Int64> GetZoom() const { return maZoom; }
void SetSourceUnit( MapUnit eNewUnit ) { meSourceUnit = eNewUnit; }
MapUnit GetSourceUnit() const { return meSourceUnit; }

2
include/svx/obj3d.hxx
View File

@ -153,7 +153,7 @@ public:
virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE;
virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE;
virtual void NbcMove(const Size& rSize) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual SdrObjList* GetSubList() const SAL_OVERRIDE;
// Insert 3D object into the group; transfer to other owner!

4
include/svx/scene3d.hxx
View File

@ -191,8 +191,8 @@ public:
virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcMove(const Size& rSize) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& rXFact,
const boost::rational<long>& rYFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& rXFact,
const boost::rational<sal_Int64>& rYFact) SAL_OVERRIDE;
virtual void RecalcSnapRect() SAL_OVERRIDE;
virtual E3dScene* GetScene() const SAL_OVERRIDE;

2
include/svx/sdr/properties/defaultproperties.hxx
View File

@ -94,7 +94,7 @@ namespace sdr
virtual void ForceDefaultAttributes();
// Scale the included ItemSet.
virtual void Scale(const boost::rational<long>& rScale) SAL_OVERRIDE;
virtual void Scale(const boost::rational<sal_Int64>& rScale) SAL_OVERRIDE;
};
} // end of namespace properties
} // end of namespace sdr

2
include/svx/sdr/properties/properties.hxx
View File

@ -147,7 +147,7 @@ namespace sdr
// Scale the local ItemSet as far as it contains metric items. This needs to be
// overloaded to do it for hierarchical objects like e.g. groups.
virtual void Scale(const boost::rational<long>& rScale);
virtual void Scale(const boost::rational<sal_Int64>& rScale);
// Move local items to a new ItemPool. This needs to be
// overloaded to do it for hierarchical objects like e.g. groups.

4
include/svx/svddrag.hxx
View File

@ -146,8 +146,8 @@ public:
bool CheckMinMoved(const Point& rPnt);
long GetDX() const { return GetNow().X()-GetPrev().X(); }
long GetDY() const { return GetNow().Y()-GetPrev().Y(); }
boost::rational<long> GetXFact() const;
boost::rational<long> GetYFact() const;
boost::rational<sal_Int64> GetXFact() const;
boost::rational<sal_Int64> GetYFact() const;
SdrDragMethod* GetDragMethod() const { return pDragMethod; }
void SetDragMethod(SdrDragMethod* pMth) { pDragMethod=pMth; }

4
include/svx/svddrgmt.hxx
View File

@ -258,8 +258,8 @@ public:
class SVX_DLLPUBLIC SdrDragResize : public SdrDragMethod
{
protected:
boost::rational<long> aXFact;
boost::rational<long> aYFact;
boost::rational<sal_Int64> aXFact;
boost::rational<sal_Int64> aYFact;
public:
TYPEINFO_OVERRIDE();

6
include/svx/svdedtv.hxx
View File

@ -212,8 +212,8 @@ public:
// waagerechte Linie hat z.B. immer eine Hoehe von 0.
void SetMarkedObjRect(const Rectangle& rRect, bool bCopy=false);
void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
void ResizeMarkedObj(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bCopy=false);
void ResizeMultMarkedObj(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, const bool bCopy, const bool bWdh, const bool bHgt);
void ResizeMarkedObj(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bCopy=false);
void ResizeMultMarkedObj(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, const bool bCopy, const bool bWdh, const bool bHgt);
long GetMarkedObjRotate() const;
void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
@ -228,7 +228,7 @@ public:
void CopyMarkedObj();
void SetAllMarkedRect(const Rectangle& rRect, bool bCopy=false) { SetMarkedObjRect(rRect,bCopy); }
void MoveAllMarked(const Size& rSiz, bool bCopy=false) { MoveMarkedObj (rSiz,bCopy); }
void ResizeAllMarked(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bCopy=false) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
void ResizeAllMarked(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bCopy=false) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
void RotateAllMarked(const Point& rRef, long nWink, bool bCopy=false) { RotateMarkedObj(rRef,nWink,bCopy); }
void MirrorAllMarked(const Point& rRef1, const Point& rRef2, bool bCopy=false) { MirrorMarkedObj(rRef1,rRef2,bCopy); }

6
include/svx/svdetc.hxx
View File

@ -62,7 +62,7 @@ friend class SdrAttrObj;
Color aFontColor;
sal_uIntPtr nFontHeight;
MapUnit eMapUnit;
boost::rational<long> aMapFraction;
boost::rational<sal_Int64> aMapFraction;
private:
static SdrEngineDefaults& GetDefaults();
@ -92,8 +92,8 @@ public:
static void SetMapUnit(MapUnit eMap) { GetDefaults().eMapUnit=eMap; }
static MapUnit GetMapUnit() { return GetDefaults().eMapUnit; }
// Default MapFraction ist 1/1.
static void SetMapFraction(const boost::rational<long>& rMap) { GetDefaults().aMapFraction=rMap; }
static boost::rational<long> GetMapFraction() { return GetDefaults().aMapFraction; }
static void SetMapFraction(const boost::rational<sal_Int64>& rMap) { GetDefaults().aMapFraction=rMap; }
static boost::rational<sal_Int64> GetMapFraction() { return GetDefaults().aMapFraction; }
// Einen Outliner mit den engineglobalen
// Defaulteinstellungen auf dem Heap erzeugen.

2
include/svx/svdglev.hxx
View File

@ -78,7 +78,7 @@ public:
void DeleteMarkedGluePoints();
void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false);
void ResizeMarkedGluePoints(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bCopy=false);
void ResizeMarkedGluePoints(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bCopy=false);
void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false);
void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, bool bCopy=false);
void MirrorMarkedGluePointsHorizontal(bool bCopy=false);

22
include/svx/svdmodel.hxx
View File

@ -155,12 +155,12 @@ protected:
Link aIOProgressLink;
OUString aTablePath;
Size aMaxObjSize; // e.g. for auto-growing text
boost::rational<long> aObjUnit; // description of the coordinate units for ClipBoard, Drag&Drop, ...
boost::rational<sal_Int64> aObjUnit; // description of the coordinate units for ClipBoard, Drag&Drop, ...
MapUnit eObjUnit; // see above
FieldUnit eUIUnit; // unit, scale (e.g. 1/1000) for the UI (status bar) is set by ImpSetUIUnit()
boost::rational<long> aUIScale; // see above
boost::rational<sal_Int64> aUIScale; // see above
OUString aUIUnitStr; // see above
boost::rational<long> aUIUnitFact; // see above
boost::rational<sal_Int64> aUIUnitFact; // see above
int nUIUnitKomma; // see above
SdrLayerAdmin* pLayerAdmin;
@ -374,10 +374,10 @@ public:
// with the correct sizes.
MapUnit GetScaleUnit() const { return eObjUnit; }
void SetScaleUnit(MapUnit eMap);
const boost::rational<long>& GetScaleFraction() const { return aObjUnit; }
void SetScaleFraction(const boost::rational<long>& rFrac);
const boost::rational<sal_Int64>& GetScaleFraction() const { return aObjUnit; }
void SetScaleFraction(const boost::rational<sal_Int64>& rFrac);
// Setting both simultaneously performs a little better
void SetScaleUnit(MapUnit eMap, const boost::rational<long>& rFrac);
void SetScaleUnit(MapUnit eMap, const boost::rational<sal_Int64>& rFrac);
// maximal size e.g. for auto growing texts
const Size& GetMaxObjSize() const { return aMaxObjSize; }
@ -387,12 +387,12 @@ public:
void SetUIUnit(FieldUnit eUnit);
FieldUnit GetUIUnit() const { return eUIUnit; }
// The scale of the drawing. Default 1/1.
void SetUIScale(const boost::rational<long>& rScale);
const boost::rational<long>& GetUIScale() const { return aUIScale; }
void SetUIScale(const boost::rational<sal_Int64>& rScale);
const boost::rational<sal_Int64>& GetUIScale() const { return aUIScale; }
// Setting both simultaneously performs a little better
void SetUIUnit(FieldUnit eUnit, const boost::rational<long>& rScale);
void SetUIUnit(FieldUnit eUnit, const boost::rational<sal_Int64>& rScale);
const boost::rational<long>& GetUIUnitFact() const { return aUIUnitFact; }
const boost::rational<sal_Int64>& GetUIUnitFact() const { return aUIUnitFact; }
const OUString& GetUIUnitStr() const { return aUIUnitStr; }
int GetUIUnitKomma() const { return nUIUnitKomma; }
bool IsUIOnlyKomma() const { return bUIOnlyKomma; }
@ -400,7 +400,7 @@ public:
static void TakeUnitStr(FieldUnit eUnit, OUString& rStr);
void TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const;
void TakeWinkStr(long nWink, OUString& rStr, bool bNoDegChar = false) const;
void TakePercentStr(const boost::rational<long>& rVal, OUString& rStr, bool bNoPercentChar = false) const;
void TakePercentStr(const boost::rational<sal_Int64>& rVal, OUString& rStr, bool bNoPercentChar = false) const;
// RecalcPageNums is ordinarily only called by the Page.
bool IsPagNumsDirty() const { return bPagNumsDirty; };

4
include/svx/svdoashp.hxx
View File

@ -188,13 +188,13 @@ public:
virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE;
virtual void Move(const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;

4
include/svx/svdobj.hxx
View File

@ -672,13 +672,13 @@ public:
// Objekte sollten i.d.R. nur die Nbc-Methoden ueberladen.
// Nbc bedeutet: 'NoBroadcast'.
virtual void NbcMove (const Size& rSiz);
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact);
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear);
virtual void Move (const Size& rSiz);
virtual void Resize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bUnsetRelative = true);
virtual void Resize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bUnsetRelative = true);
virtual void Rotate(const Point& rRef, long nWink, double sn, double cs);
virtual void Mirror(const Point& rRef1, const Point& rRef2);
virtual void Shear (const Point& rRef, long nWink, double tn, bool bVShear);

2
include/svx/svdocapt.hxx
View File

@ -116,7 +116,7 @@ public:
virtual Pointer GetCreatePointer() const SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetRelativePos(const Point& rPnt) SAL_OVERRIDE;
virtual Point GetRelativePos() const SAL_OVERRIDE;

2
include/svx/svdocirc.hxx
View File

@ -112,7 +112,7 @@ public:
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE;
virtual Pointer GetCreatePointer() const SAL_OVERRIDE;
virtual void NbcMove(const Size& aSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE;

2
include/svx/svdoedge.hxx
View File

@ -264,7 +264,7 @@ public:
virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcMove(const Size& aSize) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRefPnt, const boost::rational<long>& aXFact, const boost::rational<long>& aYFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRefPnt, const boost::rational<sal_Int64>& aXFact, const boost::rational<sal_Int64>& aYFact) SAL_OVERRIDE;
// #i54102# added rotate, mirrorn and shear support
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;

2
include/svx/svdograf.hxx
View File

@ -162,7 +162,7 @@ public:
virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE;
virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;

4
include/svx/svdogrp.hxx
View File

@ -85,7 +85,7 @@ public:
virtual long GetShearAngle(bool bVertical = false) const SAL_OVERRIDE;
virtual void Move(const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
@ -95,7 +95,7 @@ public:
virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;

2
include/svx/svdomeas.hxx
View File

@ -117,7 +117,7 @@ public:
virtual Pointer GetCreatePointer() const SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;

4
include/svx/svdoole2.hxx
View File

@ -136,7 +136,7 @@ public:
SdrOle2Obj& operator=(const SdrOle2Obj& rObj);
virtual void NbcMove(const Size& rSize) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual void SetGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE;
@ -167,7 +167,7 @@ public:
const OUString& aMediaType );
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetParentXModel() const;
bool CalculateNewScaling( boost::rational<long>& aScaleWidth, boost::rational<long>& aScaleHeight, Size& aObjAreaSize );
bool CalculateNewScaling( boost::rational<sal_Int64>& aScaleWidth, boost::rational<sal_Int64>& aScaleHeight, Size& aObjAreaSize );
bool AddOwnLightClient();
// handy to get the empty replacement graphic without accessing all the old stuff

2
include/svx/svdopath.hxx
View File

@ -114,7 +114,7 @@ public:
basegfx::B2DPolyPolygon getDragPolyPolygon(const SdrDragStat& rDrag) const;
virtual void NbcMove(const Size& aSize) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRefPnt, const boost::rational<long>& aXFact, const boost::rational<long>& aYFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRefPnt, const boost::rational<sal_Int64>& aXFact, const boost::rational<sal_Int64>& aYFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2) SAL_OVERRIDE;
virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear) SAL_OVERRIDE;

2
include/svx/svdorect.hxx
View File

@ -105,7 +105,7 @@ public:
virtual Pointer GetCreatePointer() const SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;

2
include/svx/svdotable.hxx
View File

@ -241,7 +241,7 @@ public:
virtual Pointer GetCreatePointer() const SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE;
virtual void EndTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE;

6
include/svx/svdotext.hxx
View File

@ -264,7 +264,7 @@ private:
Rectangle& rTextRect,
Rectangle& rAnchorRect,
Rectangle& rPaintRect,
boost::rational<long>& aFitXKorreg ) const;
boost::rational<sal_Int64>& aFitXKorreg ) const;
void ImpAutoFitText( SdrOutliner& rOutliner ) const;
static void ImpAutoFitText( SdrOutliner& rOutliner, const Size& rShapeSize, bool bIsVerticalWriting );
SVX_DLLPRIVATE SdrObject* ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const;
@ -284,7 +284,7 @@ protected:
SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr = false) const;
SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const;
void ImpSetTextStyleSheetListeners();
void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, boost::rational<long>& rFitXKorreg) const;
void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, boost::rational<sal_Int64>& rFitXKorreg) const;
void ImpJustifyRect(Rectangle& rRect) const;
void ImpCheckShear();
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
@ -465,7 +465,7 @@ public:
virtual Pointer GetCreatePointer() const SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;

2
include/svx/svdouno.hxx
View File

@ -80,7 +80,7 @@ public:
virtual SdrUnoObj* Clone() const SAL_OVERRIDE;
SdrUnoObj& operator= (const SdrUnoObj& rObj);
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE;
// SpecialDrag support

4
include/svx/svdovirt.hxx
View File

@ -101,13 +101,13 @@ public:
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE;
virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;
virtual void Move(const Size& rSiz) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
virtual void Resize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bUnsetRelative = true) SAL_OVERRIDE;
virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE;
virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE;
virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE;

2
include/svx/svdpoev.hxx
View File

@ -64,7 +64,7 @@ public:
bool IsDeleteMarkedPointsPossible() const SAL_OVERRIDE;
void MoveMarkedPoints(const Size& rSiz);
void ResizeMarkedPoints(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact);
void ResizeMarkedPoints(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact);
void RotateMarkedPoints(const Point& rRef, long nWink);
// Hierbei entstehen eventuell beliebig viele neue Objekte:

10
include/svx/svdsnpv.hxx
View File

@ -51,8 +51,8 @@ protected:
class ImplHelpLineOverlay* mpHelpLineOverlay;
Size aMagnSiz;
boost::rational<long> aSnapWdtX;
boost::rational<long> aSnapWdtY;
boost::rational<sal_Int64> aSnapWdtX;
boost::rational<sal_Int64> aSnapWdtY;
sal_uInt16 nMagnSizPix;
long nSnapAngle;
@ -98,9 +98,9 @@ public:
virtual void BrkAction() SAL_OVERRIDE; // f.abg.Klassen Actions z,B, Draggen abbrechen.
virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE;
void SetSnapGridWidth(const boost::rational<long>& rX, const boost::rational<long>& rY) { aSnapWdtX=rX; aSnapWdtY=rY; }
const boost::rational<long>& GetSnapGridWidthX() const { return aSnapWdtX; }
const boost::rational<long>& GetSnapGridWidthY() const { return aSnapWdtY; }
void SetSnapGridWidth(const boost::rational<sal_Int64>& rX, const boost::rational<sal_Int64>& rY) { aSnapWdtX=rX; aSnapWdtY=rY; }
const boost::rational<sal_Int64>& GetSnapGridWidthX() const { return aSnapWdtX; }
const boost::rational<sal_Int64>& GetSnapGridWidthY() const { return aSnapWdtY; }
void SetSnapMagnetic(const Size& rSiz) { if (rSiz!=aMagnSiz) { aMagnSiz=rSiz; } }
const Size& GetSnapMagnetic() const { return aMagnSiz; }

32
include/svx/svdtrans.hxx
View File

@ -55,10 +55,10 @@ inline void MovePoly(Polygon& rPoly, const Size& S) { rPoly.Move(S.Width(),
inline void MovePoly(tools::PolyPolygon& rPoly, const Size& S) { rPoly.Move(S.Width(),S.Height()); }
void MoveXPoly(XPolygon& rPoly, const Size& S);
SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact, bool bNoJustify = false);
inline void ResizePoint(Point& rPnt, const Point& rRef, boost::rational<long> xFact, boost::rational<long> yFact);
void ResizePoly(Polygon& rPoly, const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact);
void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact);
SVX_DLLPUBLIC void ResizeRect(Rectangle& rRect, const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact, bool bNoJustify = false);
inline void ResizePoint(Point& rPnt, const Point& rRef, boost::rational<sal_Int64> xFact, boost::rational<sal_Int64> yFact);
void ResizePoly(Polygon& rPoly, const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact);
void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact);
inline void RotatePoint(Point& rPnt, const Point& rRef, double sn, double cs);
SVX_DLLPUBLIC void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs);
@ -102,7 +102,7 @@ void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rR
/* Inline */
/**************************************************************************************************/
inline void ResizePoint(Point& rPnt, const Point& rRef, boost::rational<long> xFact, boost::rational<long> yFact)
inline void ResizePoint(Point& rPnt, const Point& rRef, boost::rational<sal_Int64> xFact, boost::rational<sal_Int64> yFact)
{
rPnt.X()=rRef.X()+ Round(((double)(rPnt.X()-rRef.X())*xFact.numerator())/xFact.denominator());
rPnt.Y()=rRef.Y()+ Round(((double)(rPnt.Y()-rRef.Y())*yFact.numerator())/yFact.denominator());
@ -219,25 +219,25 @@ SVX_DLLPUBLIC void OrthoDistance4(const Point& rPt0, Point& rPt, bool bBigOrtho)
// Rechnung und Zwischenergebnis sind BigInt.
SVX_DLLPUBLIC long BigMulDiv(long nVal, long nMul, long nDiv);
// Fehlerbehaftetes Kuerzen einer boost::rational<long>.
// Fehlerbehaftetes Kuerzen einer boost::rational<sal_Int64>.
// nDigits gibt an, wieviele signifikante Stellen in
// Zaehler/Nenner mindestens erhalten bleiben sollen.
void Kuerzen(boost::rational<long>& rF, unsigned nDigits);
void Kuerzen(boost::rational<sal_Int64>& rF, unsigned nDigits);
class FrPair {
boost::rational<long> aX;
boost::rational<long> aY;
boost::rational<sal_Int64> aX;
boost::rational<sal_Int64> aY;
public:
FrPair() : aX(0,1),aY(0,1) {}
FrPair(const boost::rational<long>& rBoth) : aX(rBoth),aY(rBoth) {}
FrPair(const boost::rational<long>& rX, const boost::rational<long>& rY) : aX(rX),aY(rY) {}
FrPair(const boost::rational<sal_Int64>& rBoth) : aX(rBoth),aY(rBoth) {}
FrPair(const boost::rational<sal_Int64>& rX, const boost::rational<sal_Int64>& rY) : aX(rX),aY(rY) {}
FrPair(long nMul, long nDiv) : aX(nMul,nDiv),aY(nMul,nDiv) {}
FrPair(long xMul, long xDiv, long yMul, long yDiv): aX(xMul,xDiv),aY(yMul,yDiv) {}
const boost::rational<long>& X() const { return aX; }
const boost::rational<long>& Y() const { return aY; }
boost::rational<long>& X() { return aX; }
boost::rational<long>& Y() { return aY; }
const boost::rational<sal_Int64>& X() const { return aX; }
const boost::rational<sal_Int64>& Y() const { return aY; }
boost::rational<sal_Int64>& X() { return aX; }
boost::rational<sal_Int64>& Y() { return aY; }
};
// Fuer die Umrechnung von Masseinheiten
@ -263,7 +263,7 @@ inline bool IsInch(FieldUnit eU) {
}
class SVX_DLLPUBLIC SdrFormatter {
boost::rational<long> aScale;
boost::rational<sal_Int64> aScale;
long nMul_;
long nDiv_;
short nKomma_;

8
include/svx/sxfiitm.hxx
View File

@ -27,19 +27,19 @@
/*************************************************************************/
class SdrFractionItem: public SfxPoolItem {
boost::rational<long> nValue;
boost::rational<sal_Int64> nValue;
public:
TYPEINFO_VISIBILITY( SVX_DLLPUBLIC );
SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {}
SdrFractionItem(sal_uInt16 nId, const boost::rational<long>& rVal): SfxPoolItem(nId), nValue(rVal) {}
SdrFractionItem(sal_uInt16 nId, const boost::rational<sal_Int64>& rVal): SfxPoolItem(nId), nValue(rVal) {}
SdrFractionItem(sal_uInt16 nId, SvStream& rIn);
virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE;
virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE;
virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const SAL_OVERRIDE;
const boost::rational<long>& GetValue() const { return nValue; }
void SetValue(const boost::rational<long>& rVal) { nValue = rVal; }
const boost::rational<sal_Int64>& GetValue() const { return nValue; }
void SetValue(const boost::rational<sal_Int64>& rVal) { nValue = rVal; }
};

4
include/svx/sxsiitm.hxx
View File

@ -24,8 +24,8 @@
class SdrScaleItem: public SdrFractionItem {
public:
TYPEINFO_OVERRIDE();
SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId, boost::rational<long>(1,1) ) {}
SdrScaleItem(sal_uInt16 nId, const boost::rational<long>& rVal): SdrFractionItem(nId,rVal) {}
SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId, boost::rational<sal_Int64>(1,1) ) {}
SdrScaleItem(sal_uInt16 nId, const boost::rational<sal_Int64>& rVal): SdrFractionItem(nId,rVal) {}
SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
virtual bool GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE;
virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE;

8
include/tools/rational.hxx
View File

@ -15,10 +15,10 @@
class SvStream;
TOOLS_DLLPUBLIC boost::rational<long> rational_FromDouble(double dVal);
TOOLS_DLLPUBLIC void rational_ReduceInaccurate(boost::rational<long>& rRational, unsigned nSignificantBits);
TOOLS_DLLPUBLIC SvStream& ReadFraction(SvStream& rIStream, boost::rational<long>& rRational);
TOOLS_DLLPUBLIC SvStream& WriteFraction(SvStream& rOStream, const boost::rational<long>& rRational);
TOOLS_DLLPUBLIC boost::rational<sal_Int64> rational_FromDouble(double dVal);
TOOLS_DLLPUBLIC void rational_ReduceInaccurate(boost::rational<sal_Int64>& rRational, unsigned nSignificantBits);
TOOLS_DLLPUBLIC SvStream& ReadFraction(SvStream& rIStream, boost::rational<sal_Int64>& rRational);
TOOLS_DLLPUBLIC SvStream& WriteFraction(SvStream& rOStream, const boost::rational<sal_Int64>& rRational);
#endif

2
include/vcl/gdimtf.hxx
View File

@ -136,7 +136,7 @@ public:
// additional Move method getting specifics how to handle MapMode( MAP_PIXEL )
void Move( long nX, long nY, long nDPIX, long nDPIY );
void Scale( double fScaleX, double fScaleY );
void Scale( const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY );
void Scale( const boost::rational<sal_Int64>& rScaleX, const boost::rational<sal_Int64>& rScaleY );
void Rotate( long nAngle10 );
void Clip( const Rectangle& );
/* get the bound rect of the contained actions

14
include/vcl/mapmod.hxx
View File

@ -44,8 +44,8 @@ private:
sal_uLong mnRefCount;
MapUnit meUnit;
Point maOrigin;
boost::rational<long> maScaleX;
boost::rational<long> maScaleY;
boost::rational<sal_Int64> maScaleX;
boost::rational<sal_Int64> maScaleY;
bool mbSimple;
friend SvStream& ReadImplMapMode( SvStream& rIStm, ImplMapMode& rMapMode );
@ -75,7 +75,7 @@ public:
MapMode( const MapMode& rMapMode );
MapMode( MapUnit eUnit );
MapMode( MapUnit eUnit, const Point& rLogicOrg,
const boost::rational<long>& rScaleX, const boost::rational<long>& rScaleY );
const boost::rational<sal_Int64>& rScaleX, const boost::rational<sal_Int64>& rScaleY );
~MapMode();
void SetMapUnit( MapUnit eUnit );
@ -86,11 +86,11 @@ public:
const Point& GetOrigin() const
{ return mpImplMapMode->maOrigin; }
void SetScaleX( const boost::rational<long>& rScaleX );
const boost::rational<long>& GetScaleX() const
void SetScaleX( const boost::rational<sal_Int64>& rScaleX );
const boost::rational<sal_Int64>& GetScaleX() const
{ return mpImplMapMode->maScaleX; }
void SetScaleY( const boost::rational<long>& rScaleY );
const boost::rational<long>& GetScaleY() const
void SetScaleY( const boost::rational<sal_Int64>& rScaleY );
const boost::rational<sal_Int64>& GetScaleY() const
{ return mpImplMapMode->maScaleY; }
MapMode& operator=( const MapMode& rMapMode );

2
include/vcl/virdev.hxx
View File

@ -124,7 +124,7 @@ public:
bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true );
bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize,
const boost::rational<long>& rScale,
const boost::rational<sal_Int64>& rScale,
const Point& rNewOffset,
const basebmp::RawMemorySharedArray &pBuffer,
const bool bTopDown = false );

4
include/vcl/window.hxx
View File

@ -1011,8 +1011,8 @@ public:
void SetCursor( vcl::Cursor* pCursor );
vcl::Cursor* GetCursor() const;
void SetZoom( const boost::rational<long>& rZoom );
const boost::rational<long>& GetZoom() const;
void SetZoom( const boost::rational<sal_Int64>& rZoom );
const boost::rational<sal_Int64>& GetZoom() const;
bool IsZoom() const;
long CalcZoom( long n ) const;

6
reportdesign/inc/RptObject.hxx
View File

@ -148,7 +148,7 @@ protected:
OCustomShape(const OUString& _sComponentName);
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
@ -196,7 +196,7 @@ protected:
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;
@ -244,7 +244,7 @@ protected:
virtual ~OUnoObject();
virtual void NbcMove( const Size& rSize ) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<long>& xFact, const boost::rational<long>& yFact) SAL_OVERRIDE;
virtual void NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFact, const boost::rational<sal_Int64>& yFact) SAL_OVERRIDE;
virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE;
virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE;

6
reportdesign/source/core/sdr/RptObject.cxx
View File

@ -538,7 +538,7 @@ void OCustomShape::NbcMove( const Size& rSize )
SdrObjCustomShape::NbcMove( rSize );
}
void OCustomShape::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
void OCustomShape::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrObjCustomShape::NbcResize( rRef, xFract, yFract );
@ -749,7 +749,7 @@ void OUnoObject::NbcMove( const Size& rSize )
void OUnoObject::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
void OUnoObject::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrUnoObj::NbcResize( rRef, xFract, yFract );
@ -1050,7 +1050,7 @@ void OOle2Obj::NbcMove( const Size& rSize )
void OOle2Obj::NbcResize(const Point& rRef, const boost::rational<long>& xFract, const boost::rational<long>& yFract)
void OOle2Obj::NbcResize(const Point& rRef, const boost::rational<sal_Int64>& xFract, const boost::rational<sal_Int64>& yFract)
{
SdrOle2Obj::NbcResize( rRef, xFract, yFract );

2
reportdesign/source/ui/inc/DesignView.hxx
View File

@ -257,7 +257,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
void zoom(const boost::rational<long>& _aZoom);
void zoom(const boost::rational<sal_Int64>& _aZoom);
/** fills the vector with all selected control models
/param _rSelection The vector will be filled and will not be cleared before.

2
reportdesign/source/ui/inc/ReportWindow.hxx
View File

@ -211,7 +211,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
void zoom(const boost::rational<long>& _aZoom);
void zoom(const boost::rational<sal_Int64>& _aZoom);
/** fills the vector with all selected control models
/param _rSelection The vector will be filled and will not be cleared before.

2
reportdesign/source/ui/inc/ScrollHelper.hxx
View File

@ -202,7 +202,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
void zoom(const boost::rational<long>& _aZoom);
void zoom(const boost::rational<sal_Int64>& _aZoom);
/** fills the vector with all selected control models
/param _rSelection The vector will be filled and will not be cleared before.

2
reportdesign/source/ui/inc/SectionWindow.hxx
View File

@ -120,7 +120,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
void zoom(const boost::rational<long>& _aZoom);
void zoom(const boost::rational<sal_Int64>& _aZoom);
void scrollChildren(long _nThumbPosX);
};

2
reportdesign/source/ui/inc/StartMarker.hxx
View File

@ -71,7 +71,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
void zoom(const boost::rational<long>& _aZoom);
void zoom(const boost::rational<sal_Int64>& _aZoom);
};
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_STARTMARKER_HXX

2
reportdesign/source/ui/inc/UITools.hxx
View File

@ -176,7 +176,7 @@ namespace rptui
@param _aZoom the zoom scale
@param _rWindow where to set the map mode
*/
void setZoomFactor(const boost::rational<long>& _aZoom, ::vcl::Window& _rWindow);
void setZoomFactor(const boost::rational<sal_Int64>& _aZoom, ::vcl::Window& _rWindow);
}
#endif // INCLUDED_REPORTDESIGN_SOURCE_UI_INC_UITOOLS_HXX

2
reportdesign/source/ui/inc/ViewsWindow.hxx
View File

@ -331,7 +331,7 @@ namespace rptui
/** zoom the ruler and view windows
*/
void zoom(const boost::rational<long>& _aZoom);
void zoom(const boost::rational<sal_Int64>& _aZoom);
void scrollChildren(const Point& _aThumbPos);

2
reportdesign/source/ui/misc/UITools.cxx
View File

@ -991,7 +991,7 @@ void correctOverlapping(SdrObject* _pControl,OReportSection& _aReportSection,boo
rSectionView.InsertObjectAtView(_pControl,*rSectionView.GetSdrPageView(),SDRINSERT_ADDMARK);
}
void setZoomFactor(const boost::rational<long>& _aZoom, vcl::Window& _rWindow)
void setZoomFactor(const boost::rational<sal_Int64>& _aZoom, vcl::Window& _rWindow)
{
MapMode aMapMode( _rWindow.GetMapMode() );
aMapMode.SetScaleX(_aZoom);

2
reportdesign/source/ui/report/DesignView.cxx
View File

@ -684,7 +684,7 @@ sal_uInt32 ODesignView::getMarkedObjectCount() const
return m_aScrollWindow.getMarkedObjectCount();
}
void ODesignView::zoom(const boost::rational<long>& _aZoom)
void ODesignView::zoom(const boost::rational<sal_Int64>& _aZoom)
{
m_aScrollWindow.zoom(_aZoom);
}

2
reportdesign/source/ui/report/EndMarker.cxx
View File

@ -45,7 +45,7 @@ OEndMarker::~OEndMarker()
void OEndMarker::Paint( const Rectangle& /*rRect*/ )
{
boost::rational<long> aCornerSpace(long(CORNER_SPACE));
boost::rational<sal_Int64> aCornerSpace(long(CORNER_SPACE));
aCornerSpace *= GetMapMode().GetScaleX();
const long nCornerSpace = boost::rational_cast<long>(aCornerSpace);

2
reportdesign/source/ui/report/ReportController.cxx
View File

@ -4171,7 +4171,7 @@ void OReportController::impl_fillState_nothrow(const OUString& _sProperty,dbaui:
void OReportController::impl_zoom_nothrow()
{
boost::rational<long> aZoom(m_nZoomValue,100);
boost::rational<sal_Int64> aZoom(m_nZoomValue,100);
setZoomFactor( aZoom,*getDesignView() );
getDesignView()->zoom(aZoom);
InvalidateFeature(SID_ATTR_ZOOM,Reference< XStatusListener >(), true);

4
reportdesign/source/ui/report/ReportSection.cxx
View File

@ -202,8 +202,8 @@ void OReportSection::fill()
m_pView->SetGridFine(aGridSizeFine);
// #i93595# set snap grid width to snap to all existing subdivisions
const boost::rational<long> aX(aGridSizeFine.A());
const boost::rational<long> aY(aGridSizeFine.B());
const boost::rational<sal_Int64> aX(aGridSizeFine.A());
const boost::rational<sal_Int64> aY(aGridSizeFine.B());
m_pView->SetSnapGridWidth(aX, aY);
m_pView->SetGridSnap( pDesignView->isGridSnap() );

20
reportdesign/source/ui/report/ReportWindow.cxx
View File

@ -141,10 +141,10 @@ void OReportWindow::showRuler(bool _bShow)
sal_Int32 OReportWindow::getMaxMarkerWidth(bool _bWithEnd) const
{
boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= m_aViewsWindow.GetMapMode().GetScaleX();
if ( _bWithEnd )
aStartWidth += boost::rational<long>(long(REPORT_ENDMARKER_WIDTH));
aStartWidth += boost::rational<sal_Int64>(long(REPORT_ENDMARKER_WIDTH));
return sal_Int32(boost::rational_cast<long>(aStartWidth));
}
@ -153,11 +153,11 @@ sal_Int32 OReportWindow::GetTotalWidth() const
sal_Int32 nWidth = 0;
if ( !m_aViewsWindow.empty() )
{
boost::rational<long> aStartWidth(long(REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH ));
const boost::rational<long> aZoom(m_pView->getController().getZoomValue(),100);
boost::rational<sal_Int64> aStartWidth(long(REPORT_ENDMARKER_WIDTH + REPORT_STARTMARKER_WIDTH ));
const boost::rational<sal_Int64> aZoom(m_pView->getController().getZoomValue(),100);
aStartWidth *= aZoom;
const sal_Int32 nPaperWidth = getStyleProperty<awt::Size>(m_pView->getController().getReportDefinition(),PROPERTY_PAPERSIZE).Width;
boost::rational<long> aPaperWidth(nPaperWidth,1);
boost::rational<sal_Int64> aPaperWidth(nPaperWidth,1);
aPaperWidth *= aZoom;
const Size aPageSize = LogicToPixel(Size(boost::rational_cast<long>(aPaperWidth),0));
nWidth = aPageSize.Width() + boost::rational_cast<long>(aStartWidth);
@ -171,7 +171,7 @@ void OReportWindow::Resize()
if ( !m_aViewsWindow.empty() )
{
const Size aTotalOutputSize = GetOutputSizePixel();
boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH)*m_pView->getController().getZoomValue(),100);
boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH)*m_pView->getController().getZoomValue(),100);
const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, 0 ), MAP_APPFONT );
Point aStartPoint(boost::rational_cast<long>(aStartWidth) + aOffset.X(),0);
@ -372,7 +372,7 @@ sal_uInt32 OReportWindow::getMarkedObjectCount() const
return m_aViewsWindow.getMarkedObjectCount();
}
void OReportWindow::zoom(const boost::rational<long>& _aZoom)
void OReportWindow::zoom(const boost::rational<sal_Int64>& _aZoom)
{
m_aHRuler.SetZoom(_aZoom);
m_aHRuler.Invalidate();
@ -414,14 +414,14 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const
break;
case SVX_ZOOM_WHOLEPAGE:
{
nZoom = (sal_uInt16) boost::rational_cast<long>( boost::rational<long>(aSize.Width() * 100, impl_getRealPixelWidth()) );
nZoom = (sal_uInt16) boost::rational_cast<long>( boost::rational<sal_Int64>(aSize.Width() * 100, impl_getRealPixelWidth()) );
MapMode aMap( MAP_100TH_MM );
const Size aHeight = m_aViewsWindow.LogicToPixel(m_aViewsWindow.PixelToLogic(Size(0,GetTotalHeight() + m_aHRuler.GetSizePixel().Height())),aMap);
nZoom = ::std::min(nZoom, (sal_uInt16) boost::rational_cast<long>( boost::rational<long>(aSize.Height() * 100, aHeight.Height()) ));
nZoom = ::std::min(nZoom, (sal_uInt16) boost::rational_cast<long>( boost::rational<sal_Int64>(aSize.Height() * 100, aHeight.Height()) ));
}
break;
case SVX_ZOOM_PAGEWIDTH:
nZoom = (sal_uInt16)boost::rational_cast<long>( boost::rational<long>(aSize.Width() * 100, this->impl_getRealPixelWidth()) );
nZoom = (sal_uInt16)boost::rational_cast<long>( boost::rational<sal_Int64>(aSize.Width() * 100, this->impl_getRealPixelWidth()) );
break;
default:
break;

6
reportdesign/source/ui/report/ScrollHelper.cxx
View File

@ -101,7 +101,7 @@ void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight)
m_aTotalPixelSize.Height() = _nHeight;
// now set the ranges without start marker
boost::rational<long> aStartWidth(REPORT_STARTMARKER_WIDTH * m_pParent->getController().getZoomValue(),100);
boost::rational<sal_Int64> aStartWidth(REPORT_STARTMARKER_WIDTH * m_pParent->getController().getZoomValue(),100);
long nWidth = long(_nWidth - boost::rational_cast<double>(aStartWidth));
m_aHScroll.SetRangeMax( nWidth );
m_aVScroll.SetRangeMax( m_aTotalPixelSize.Height() );
@ -163,7 +163,7 @@ Size OScrollWindowHelper::ResizeScrollBars()
const Point aOffset = LogicToPixel( Point( SECTION_OFFSET, SECTION_OFFSET ), MAP_APPFONT );
// resize scrollbars and set their ranges
{
boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100);
boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH*m_pParent->getController().getZoomValue()),100);
const sal_Int32 nNewWidth = aOutPixSz.Width() - aOffset.X() - boost::rational_cast<long>(aStartWidth);
lcl_setScrollBar(nNewWidth,Point( boost::rational_cast<long>(aStartWidth) + aOffset.X(), aOutPixSz.Height() ),Size( nNewWidth, nScrSize ),m_aHScroll);
}
@ -382,7 +382,7 @@ sal_uInt32 OScrollWindowHelper::getMarkedObjectCount() const
return m_aReportWindow.getMarkedObjectCount();
}
void OScrollWindowHelper::zoom(const boost::rational<long>& _aZoom)
void OScrollWindowHelper::zoom(const boost::rational<sal_Int64>& _aZoom)
{
m_aReportWindow.zoom(_aZoom);
Resize();

6
reportdesign/source/ui/report/SectionWindow.cxx
View File

@ -220,7 +220,7 @@ void OSectionWindow::Resize()
Window::Resize();
Size aOutputSize = GetOutputSizePixel();
boost::rational<long> aEndWidth(long(REPORT_ENDMARKER_WIDTH));
boost::rational<sal_Int64> aEndWidth(long(REPORT_ENDMARKER_WIDTH));
aEndWidth *= GetMapMode().GetScaleX();
const Point aThumbPos = m_pParent->getView()->getThumbPos();
@ -236,7 +236,7 @@ void OSectionWindow::Resize()
{
const bool bShowEndMarker = m_pParent->getView()->GetTotalWidth() <= (aThumbPos.X() + aOutputSize.Width() );
boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= GetMapMode().GetScaleX();
// set start marker
@ -299,7 +299,7 @@ IMPL_LINK( OSectionWindow, Collapsed, OColorListener *, _pMarker )
return 0L;
}
void OSectionWindow::zoom(const boost::rational<long>& _aZoom)
void OSectionWindow::zoom(const boost::rational<sal_Int64>& _aZoom)
{
setZoomFactor(_aZoom,*this);
m_aStartMarker.zoom(_aZoom);

6
reportdesign/source/ui/report/StartMarker.cxx
View File

@ -89,7 +89,7 @@ OStartMarker::~OStartMarker()
sal_Int32 OStartMarker::getMinHeight() const
{
boost::rational<long> aExtraWidth(long(2*REPORT_EXTRA_SPACE));
boost::rational<sal_Int64> aExtraWidth(long(2*REPORT_EXTRA_SPACE));
aExtraWidth *= GetMapMode().GetScaleX();
return LogicToPixel(Size(0,m_aText.GetTextHeight())).Height() + boost::rational_cast<long>(aExtraWidth);
}
@ -221,7 +221,7 @@ void OStartMarker::Resize()
aImageSize.Width() = long(aImageSize.Width() * boost::rational_cast<double>(rMapMode.GetScaleX()));
aImageSize.Height() = long(aImageSize.Height() * boost::rational_cast<double>(rMapMode.GetScaleY()));
boost::rational<long> aExtraWidth(long(REPORT_EXTRA_SPACE));
boost::rational<sal_Int64> aExtraWidth(long(REPORT_EXTRA_SPACE));
aExtraWidth *= rMapMode.GetScaleX();
Point aPos(aImageSize.Width() + boost::rational_cast<long>((aExtraWidth + aExtraWidth)), boost::rational_cast<long>(aExtraWidth));
@ -281,7 +281,7 @@ void OStartMarker::setCollapsed(bool _bCollapsed)
changeImage();
}
void OStartMarker::zoom(const boost::rational<long>& _aZoom)
void OStartMarker::zoom(const boost::rational<sal_Int64>& _aZoom)
{
setZoomFactor(_aZoom,*this);
m_aVRuler.SetZoom(_aZoom);

6
reportdesign/source/ui/report/ViewsWindow.cxx
View File

@ -263,7 +263,7 @@ void OViewsWindow::Paint( const Rectangle& rRect )
Window::Paint( rRect );
Size aOut = GetOutputSizePixel();
boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= GetMapMode().GetScaleX();
aOut.Width() -= boost::rational_cast<long>(aStartWidth);
@ -1685,11 +1685,11 @@ void OViewsWindow::collapseSections(const uno::Sequence< beans::PropertyValue>&
}
}
void OViewsWindow::zoom(const boost::rational<long>& _aZoom)
void OViewsWindow::zoom(const boost::rational<sal_Int64>& _aZoom)
{
const MapMode& aMapMode = GetMapMode();
boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
if ( _aZoom < aMapMode.GetScaleX() )
aStartWidth *= aMapMode.GetScaleX();
else

2
reportdesign/source/ui/report/dlgedfunc.cxx
View File

@ -78,7 +78,7 @@ void DlgEdFunc::ForceScroll( const Point& rPos )
OScrollWindowHelper* pScrollWindow = pReportWindow->getScrollWindow();
Size aOut = pReportWindow->GetOutputSizePixel();
boost::rational<long> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
boost::rational<sal_Int64> aStartWidth(long(REPORT_STARTMARKER_WIDTH));
aStartWidth *= m_pParent->GetMapMode().GetScaleX();
aOut.Width() -= boost::rational_cast<long>(aStartWidth);

4
sc/inc/column.hxx
View File

@ -456,12 +456,12 @@ public:
long GetNeededSize(
SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bWidth, const ScNeededSizeOptions& rOptions, const ScPatternAttr** pPatternChange ) const;
sal_uInt16 GetOptimalColWidth(
OutputDevice* pDev, double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bFormula, sal_uInt16 nOldWidth, const ScMarkData* pMarkData, const ScColWidthParam* pParam) const;
void GetOptimalHeight(

6
sc/inc/document.hxx
View File

@ -1453,7 +1453,7 @@ public:
void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY );
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY );
bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
@ -1521,7 +1521,7 @@ public:
sal_uInt16 GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bFormula,
const ScMarkData* pMarkData = NULL,
const ScColWidthParam* pParam = NULL );
@ -1534,7 +1534,7 @@ public:
long GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bWidth, bool bTotalSize = false );
SC_DLLPUBLIC void ShowCol(SCCOL nCol, SCTAB nTab, bool bShow);

6
sc/inc/editutil.hxx
View File

@ -44,8 +44,8 @@ class ScEditUtil
OutputDevice* pDev; // MapMode has to be set
double nPPTX;
double nPPTY;
boost::rational<long> aZoomX;
boost::rational<long> aZoomY;
boost::rational<sal_Int64> aZoomX;
boost::rational<sal_Int64> aZoomY;
static const char pCalcDelimiters[];
@ -82,7 +82,7 @@ public:
ScEditUtil( ScDocument* pDocument, SCCOL nX, SCROW nY, SCTAB nZ,
const Point& rScrPosPixel,
OutputDevice* pDevice, double nScaleX, double nScaleY,
const boost::rational<long>& rX, const boost::rational<long>& rY ) :
const boost::rational<sal_Int64>& rX, const boost::rational<sal_Int64>& rY ) :
pDoc(pDocument),nCol(nX),nRow(nY),nTab(nZ),
aScrPos(rScrPosPixel),pDev(pDevice),
nPPTX(nScaleX),nPPTY(nScaleY),aZoomX(rX),aZoomY(rY) {}

4
sc/inc/patattr.hxx
View File

@ -84,14 +84,14 @@ public:
static void GetFont( vcl::Font& rFont, const SfxItemSet& rItemSet,
ScAutoFontColorMode eAutoMode,
OutputDevice* pOutDev = NULL,
const boost::rational<long>* pScale = NULL,
const boost::rational<sal_Int64>* pScale = NULL,
const SfxItemSet* pCondSet = NULL,
sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL,
const Color* pTextConfigColor = NULL );
/** Fills a font object from the own item set. */
void GetFont( vcl::Font& rFont, ScAutoFontColorMode eAutoMode,
OutputDevice* pOutDev = NULL,
const boost::rational<long>* pScale = NULL,
const boost::rational<sal_Int64>* pScale = NULL,
const SfxItemSet* pCondSet = NULL,
sal_uInt8 nScript = 0, const Color* pBackConfigColor = NULL,
const Color* pTextConfigColor = NULL ) const;

10
sc/inc/rowheightcontext.hxx
View File

@ -22,8 +22,8 @@ class SC_DLLPUBLIC RowHeightContext
{
double mfPPTX;
double mfPPTY;
boost::rational<long> maZoomX;
boost::rational<long> maZoomY;
boost::rational<sal_Int64> maZoomX;
boost::rational<sal_Int64> maZoomY;
OutputDevice* mpOutDev;
sal_uInt16 mnExtraHeight;
@ -31,15 +31,15 @@ class SC_DLLPUBLIC RowHeightContext
public:
RowHeightContext(
double fPPTX, double fPPTY, const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
double fPPTX, double fPPTY, const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
OutputDevice* pOutDev );
~RowHeightContext();
double getPPTX() const { return mfPPTX;}
double getPPTY() const { return mfPPTY;}
const boost::rational<long>& getZoomX() const { return maZoomX;}
const boost::rational<long>& getZoomY() const { return maZoomY;}
const boost::rational<sal_Int64>& getZoomX() const { return maZoomX;}
const boost::rational<sal_Int64>& getZoomY() const { return maZoomY;}
OutputDevice* getOutputDevice() { return mpOutDev;}

6
sc/inc/table.hxx
View File

@ -637,7 +637,7 @@ public:
void StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY );
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY );
bool IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const;
@ -672,7 +672,7 @@ public:
sal_uInt16 GetOptimalColWidth( SCCOL nCol, OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bFormula, const ScMarkData* pMarkData,
const ScColWidthParam* pParam );
bool SetOptimalHeight(
@ -686,7 +686,7 @@ public:
long GetNeededSize( SCCOL nCol, SCROW nRow,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bWidth, bool bTotalSize );
void SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth );
void SetColWidthOnly( SCCOL nCol, sal_uInt16 nNewWidth );

6
sc/source/core/data/column2.cxx
View File

@ -83,7 +83,7 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript )
long ScColumn::GetNeededSize(
SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bWidth, const ScNeededSizeOptions& rOptions,
const ScPatternAttr** ppPatternChange ) const
{
@ -240,7 +240,7 @@ long ScColumn::GetNeededSize(
// bGetFont is set also if script type changes
if (rOptions.bGetFont)
{
boost::rational<long> aFontZoom = ( eOrient == SVX_ORIENTATION_STANDARD ) ? rZoomX : rZoomY;
boost::rational<sal_Int64> aFontZoom = ( eOrient == SVX_ORIENTATION_STANDARD ) ? rZoomX : rZoomY;
vcl::Font aFont;
// font color doesn't matter here
pPattern->GetFont( aFont, SC_AUTOCOL_BLACK, pDev, &aFontZoom, pCondSet, nScript );
@ -616,7 +616,7 @@ public:
}
sal_uInt16 ScColumn::GetOptimalColWidth(
OutputDevice* pDev, double nPPTX, double nPPTY, const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
OutputDevice* pDev, double nPPTX, double nPPTY, const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bFormula, sal_uInt16 nOldWidth, const ScMarkData* pMarkData, const ScColWidthParam* pParam) const
{
if (maCells.block_size() == 1 && maCells.begin()->type == sc::element_type_empty)

4
sc/source/core/data/dociter.cxx
View File

@ -2544,7 +2544,7 @@ void ScDocRowHeightUpdater::update()
ScProgress aProgress(mrDoc.GetDocumentShell(), ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), nCellCount);
boost::rational<long> aZoom(1, 1);
boost::rational<sal_Int64> aZoom(1, 1);
itr = mpTabRangesArray->begin();
sal_uInt32 nProgressStart = 0;
sc::RowHeightContext aCxt(mfPPTX, mfPPTY, aZoom, aZoom, mpOutDev);
@ -2582,7 +2582,7 @@ void ScDocRowHeightUpdater::updateAll()
ScProgress aProgress(mrDoc.GetDocumentShell(), ScGlobal::GetRscString(STR_PROGRESS_HEIGHTING), nCellCount);
boost::rational<long> aZoom(1, 1);
boost::rational<sal_Int64> aZoom(1, 1);
sc::RowHeightContext aCxt(mfPPTX, mfPPTY, aZoom, aZoom, mpOutDev);
sal_uLong nProgressStart = 0;
for (SCTAB nTab = 0; nTab < mrDoc.GetTableCount(); ++nTab)

4
sc/source/core/data/documen8.cxx
View File

@ -569,7 +569,7 @@ bool ScDocument::IdleCalcTextWidth() // true = demnaechst wieder vers
}
sal_uInt16 nZoom = getScaleValue(*pStyle, ATTR_PAGE_SCALE);
boost::rational<long> aZoomFract(nZoom, 100);
boost::rational<sal_Int64> aZoomFract(nZoom, 100);
// Start at specified cell position (nCol, nRow, nTab).
ScColumn* pCol = &pTab->aCol[aScope.Col()];
@ -655,7 +655,7 @@ bool ScDocument::IdleCalcTextWidth() // true = demnaechst wieder vers
if (getScaleValue(*pStyle, ATTR_PAGE_SCALETOPAGES) == 0)
{
nZoom = getScaleValue(*pStyle, ATTR_PAGE_SCALE);
aZoomFract = boost::rational<long>(nZoom, 100);
aZoomFract = boost::rational<sal_Int64>(nZoom, 100);
}
else
nZoom = 0;

6
sc/source/core/data/document.cxx
View File

@ -3883,7 +3883,7 @@ sal_uLong ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab, bool bHiddenAsZero )
sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bFormula, const ScMarkData* pMarkData,
const ScColWidthParam* pParam )
{
@ -3897,7 +3897,7 @@ sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice*
long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY,
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY,
bool bWidth, bool bTotalSize )
{
if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] )
@ -4594,7 +4594,7 @@ const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con
void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved,
OutputDevice* pDev,
double nPPTX, double nPPTY,
const boost::rational<long>& rZoomX, const boost::rational<long>& rZoomY )
const boost::rational<sal_Int64>& rZoomX, const boost::rational<sal_Int64>& rZoomY )
{
TableContainer::iterator it = maTabs.begin();
for (; it != maTabs.end(); ++it)

8
sc/source/core/data/drwlayer.cxx
View File

@ -1421,19 +1421,19 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const
long nWidthDiff = nDestWidth - nSourceWidth;
long nHeightDiff = nDestHeight - nSourceHeight;
boost::rational<long> aHorFract(1,1);
boost::rational<long> aVerFract(1,1);
boost::rational<sal_Int64> aHorFract(1,1);
boost::rational<sal_Int64> aVerFract(1,1);
bool bResize = false;
// sizes can differ by 1 from twips->1/100mm conversion for equal cell sizes,
// don't resize to empty size when pasting into hidden columns or rows
if ( std::abs(nWidthDiff) > 1 && nDestWidth > 1 && nSourceWidth > 1 )
{
aHorFract = boost::rational<long>( nDestWidth, nSourceWidth );
aHorFract = boost::rational<sal_Int64>( nDestWidth, nSourceWidth );
bResize = true;
}
if ( std::abs(nHeightDiff) > 1 && nDestHeight > 1 && nSourceHeight > 1 )
{
aVerFract = boost::rational<long>( nDestHeight, nSourceHeight );
aVerFract = boost::rational<sal_Int64>( nDestHeight, nSourceHeight );
bResize = true;
}
Point aRefPos = rDestRange.TopLeft(); // for resizing (after moving)

8
sc/source/core/data/patattr.cxx
View File

@ -216,7 +216,7 @@ SvxCellOrientation ScPatternAttr::GetCellOrientation( const SfxItemSet* pCondSet
void ScPatternAttr::GetFont(
vcl::Font& rFont, const SfxItemSet& rItemSet, ScAutoFontColorMode eAutoMode,
OutputDevice* pOutDev, const boost::rational<long>* pScale,
OutputDevice* pOutDev, const boost::rational<sal_Int64>* pScale,
const SfxItemSet* pCondSet, sal_uInt8 nScript,
const Color* pBackConfigColor, const Color* pTextConfigColor )
{
@ -376,7 +376,7 @@ void ScPatternAttr::GetFont(
if ( pOutDev != NULL )
{
Size aEffSize;
boost::rational<long> aFraction( 1,1 );
boost::rational<sal_Int64> aFraction( 1,1 );
if (pScale)
aFraction = *pScale;
Size aSize( 0, (long) nFontHeight );
@ -386,7 +386,7 @@ void ScPatternAttr::GetFont(
aEffSize = pOutDev->LogicToPixel( aSize, aSrcMode );
else
{
boost::rational<long> aFractOne(1,1);
boost::rational<sal_Int64> aFractOne(1,1);
aDestMode.SetScaleX( aFractOne );
aDestMode.SetScaleY( aFractOne );
aEffSize = OutputDevice::LogicToLogic( aSize, aSrcMode, aDestMode );
@ -482,7 +482,7 @@ void ScPatternAttr::GetFont(
void ScPatternAttr::GetFont(
vcl::Font& rFont, ScAutoFontColorMode eAutoMode,
OutputDevice* pOutDev, const boost::rational<long>* pScale,
OutputDevice* pOutDev, const boost::rational<sal_Int64>* pScale,
const SfxItemSet* pCondSet, sal_uInt8 nScript,
const Color* pBackConfigColor, const Color* pTextConfigColor ) const
{

Some files were not shown because too many files have changed in this diff Show More