diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-19 15:18:15 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-20 08:04:53 +0200 |
| commit | 1e822e401ea8fe950c7fb62172ac61d8396c98e9 (patch) | |
| tree | 3a29227adfe1c5ec9209d7e7deb2035633104986 /sw/source/uibase/uiview/view2.cxx | |
| parent | b225980d2d65694278c9ed89512fbe21b08febd6 (diff) | |
use tools::Long in sw
Change-Id: I44be72b3a9b14823ec37a3c799cffb4fb4d6e1de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104527
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase/uiview/view2.cxx')
| -rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 6866c8b4788a..b0e133d92403 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -586,7 +586,7 @@ void SwView::Execute(SfxRequest &rReq) case SID_ZOOM_IN: case SID_ZOOM_OUT: { - long nFact = m_pWrtShell->GetViewOptions()->GetZoom(); + tools::Long nFact = m_pWrtShell->GetViewOptions()->GetZoom(); if (SID_ZOOM_OUT == nSlot) nFact = basegfx::zoomtools::zoomIn(nFact); else @@ -894,7 +894,7 @@ void SwView::Execute(SfxRequest &rReq) } m_pViewImpl->InitRequest( rReq ); - long nFound = InsertDoc( nSlot, sFileName, sFilterName, nVersion ); + tools::Long nFound = InsertDoc( nSlot, sFileName, sFilterName, nVersion ); if ( bHasFileName ) { @@ -1562,13 +1562,13 @@ void SwView::StateStatusLine(SfxItemSet &rSet) const Size& rEditSize = GetEditWin().GetOutputSizePixel(); const Size aWindowSize( GetEditWin().PixelToLogic( rEditSize, aTmpMap ) ); - const long nOf = pVOpt->GetDocumentBorder() * 2; - long nTmpWidth = bAutomaticViewLayout ? aPageSize.Width() : aRootSize.Width(); + const tools::Long nOf = pVOpt->GetDocumentBorder() * 2; + tools::Long nTmpWidth = bAutomaticViewLayout ? aPageSize.Width() : aRootSize.Width(); nTmpWidth += nOf; aPageSize.AdjustHeight(nOf ); - long nFac = aWindowSize.Width() * 100 / nTmpWidth; + tools::Long nFac = aWindowSize.Width() * 100 / nTmpWidth; - long nVisPercent = aWindowSize.Height() * 100 / aPageSize.Height(); + tools::Long nVisPercent = aWindowSize.Height() * 100 / aPageSize.Height(); nFac = std::min( nFac, nVisPercent ); if (nFac >= MINZOOM) @@ -2205,7 +2205,7 @@ void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ) sFilter = static_cast<const SfxStringItem *>(pItem )->GetValue(); bool bHasFileName = !sFile.isEmpty(); - long nFound = InsertDoc( nSlot, sFile, sFilter ); + tools::Long nFound = InsertDoc( nSlot, sFile, sFilter ); if ( bHasFileName ) { @@ -2215,7 +2215,7 @@ void SwView::ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem ) } } -long SwView::InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName, const OUString& rFilterName, sal_Int16 nVersion ) +tools::Long SwView::InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName, const OUString& rFilterName, sal_Int16 nVersion ) { std::unique_ptr<SfxMedium> pMed; SwDocShell* pDocSh = GetDocShell(); @@ -2255,10 +2255,10 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName, const OUS return InsertMedium( nSlotId, std::move(pMed), nVersion ); } -long SwView::InsertMedium( sal_uInt16 nSlotId, std::unique_ptr<SfxMedium> pMedium, sal_Int16 nVersion ) +tools::Long SwView::InsertMedium( sal_uInt16 nSlotId, std::unique_ptr<SfxMedium> pMedium, sal_Int16 nVersion ) { bool bInsert = false, bCompare = false; - long nFound = 0; + tools::Long nFound = 0; SwDocShell* pDocSh = GetDocShell(); switch( nSlotId ) @@ -2571,7 +2571,7 @@ IMPL_LINK( SwView, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, void ) } const sal_uInt16 nSlot = m_pViewImpl->GetRequest()->GetSlot(); - long nFound = InsertMedium( nSlot, std::move(pMed), m_pViewImpl->GetParam() ); + tools::Long nFound = InsertMedium( nSlot, std::move(pMed), m_pViewImpl->GetParam() ); if ( SID_INSERTDOC == nSlot ) { |