From 915c7529e9b041879e8c63f15306028a6f649f48 Mon Sep 17 00:00:00 2001 From: Noel Date: Wed, 21 Oct 2020 09:28:47 +0200 Subject: use tools::Long in accessibility..basctl Change-Id: I67087c7a281e5bdecbaf227bd3147e7c12828791 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104587 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basctl/source/basicide/baside2.cxx | 34 ++++++++++----------- basctl/source/basicide/baside2.hxx | 10 +++---- basctl/source/basicide/baside2b.cxx | 46 ++++++++++++++--------------- basctl/source/basicide/baside3.cxx | 2 +- basctl/source/basicide/basides1.cxx | 10 +++---- basctl/source/basicide/basobj3.cxx | 8 ++--- basctl/source/basicide/layout.cxx | 34 ++++++++++----------- basctl/source/basicide/linenumberwindow.cxx | 4 +-- basctl/source/basicide/linenumberwindow.hxx | 6 ++-- basctl/source/dlged/dlged.cxx | 34 ++++++++++----------- basctl/source/dlged/dlgedfunc.cxx | 14 ++++----- basctl/source/dlged/propbrw.cxx | 10 +++---- basctl/source/inc/baside3.hxx | 2 +- basctl/source/inc/basobj.hxx | 3 +- basctl/source/inc/dlged.hxx | 2 +- basctl/source/inc/layout.hxx | 12 ++++---- 16 files changed, 116 insertions(+), 115 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index a114332e42b2..bccf765c786b 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -76,11 +76,11 @@ namespace namespace Print { - long const nLeftMargin = 1700; - long const nRightMargin = 900; - long const nTopMargin = 2000; - long const nBottomMargin = 1000; - long const nBorder = 300; + tools::Long const nLeftMargin = 1700; + tools::Long const nRightMargin = 900; + tools::Long const nTopMargin = 2000; + tools::Long const nBottomMargin = 1000; + tools::Long const nBorder = 300; } short const ValidWindow = 0x1234; @@ -123,13 +123,13 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, aFont.SetAlignment( ALIGN_BOTTOM ); pPrinter->SetFont( aFont ); - long nFontHeight = pPrinter->GetTextHeight(); + tools::Long nFontHeight = pPrinter->GetTextHeight(); // 1st Border => line, 2+3 Border = free space - long nYTop = Print::nTopMargin - 3*Print::nBorder - nFontHeight; + tools::Long nYTop = Print::nTopMargin - 3*Print::nBorder - nFontHeight; - long nXLeft = Print::nLeftMargin - Print::nBorder; - long nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder; + tools::Long nXLeft = Print::nLeftMargin - Print::nBorder; + tools::Long nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder; if( bOutput ) pPrinter->DrawRect(tools::Rectangle( @@ -138,7 +138,7 @@ void lcl_PrintHeader( Printer* pPrinter, sal_uInt16 nPages, sal_uInt16 nCurPage, )); - long nY = Print::nTopMargin - 2*Print::nBorder; + tools::Long nY = Print::nTopMargin - 2*Print::nBorder; Point aPos(Print::nLeftMargin, nY); if( bOutput ) pPrinter->DrawText( aPos, rTitle ); @@ -740,12 +740,12 @@ void ModulWindow::EditMacro( const OUString& rMacroName ) AssertValidEditEngine(); TextView * pView = GetEditView(); // scroll if applicable so that first line is at the top - long nVisHeight = GetOutputSizePixel().Height(); + tools::Long nVisHeight = GetOutputSizePixel().Height(); if ( pView->GetTextEngine()->GetTextHeight() > nVisHeight ) { - long nMaxY = pView->GetTextEngine()->GetTextHeight() - nVisHeight; - long nOldStartY = pView->GetStartDocPos().Y(); - long nNewStartY = static_cast(nStart) * pView->GetTextEngine()->GetCharHeight(); + tools::Long nMaxY = pView->GetTextEngine()->GetTextHeight() - nVisHeight; + tools::Long nOldStartY = pView->GetStartDocPos().Y(); + tools::Long nNewStartY = static_cast(nStart) * pView->GetTextEngine()->GetCharHeight(); nNewStartY = std::min( nNewStartY, nMaxY ); pView->Scroll( 0, -(nNewStartY-nOldStartY) ); pView->ShowCursor( false ); @@ -834,7 +834,7 @@ sal_Int32 ModulWindow::FormatAndPrint( Printer* pPrinter, sal_Int32 nPrintPage ) // nLinepPage is not correct if there's a line break sal_Int32 nLinespPage = aPaperSz.Height()/nLineHeight; - long nXTextWidth = pPrinter->approximate_digit_width(); + tools::Long nXTextWidth = pPrinter->approximate_digit_width(); sal_Int32 nCharspLine = aPaperSz.Width() / std::max(nXTextWidth, 1); const sal_uInt32 nParas = GetEditEngine()->GetParagraphCount(); @@ -1163,7 +1163,7 @@ void ModulWindow::DoScroll( ScrollBar* pCurScrollBar ) if ( ( pCurScrollBar == GetHScrollBar() ) && GetEditView() ) { // don't scroll with the value but rather use the Thumb-Pos for the VisArea: - long nDiff = GetEditView()->GetStartDocPos().X() - pCurScrollBar->GetThumbPos(); + tools::Long nDiff = GetEditView()->GetStartDocPos().X() - pCurScrollBar->GetThumbPos(); GetEditView()->Scroll( nDiff, 0 ); GetEditView()->ShowCursor( false ); pCurScrollBar->SetThumbPos( GetEditView()->GetStartDocPos().X() ); @@ -1510,7 +1510,7 @@ void ModulWindowLayout::BasicRemoveWatch () aWatchWindow->RemoveSelectedWatch(); } -void ModulWindowLayout::OnFirstSize (long const nWidth, long const nHeight) +void ModulWindowLayout::OnFirstSize (tools::Long const nWidth, tools::Long const nHeight) { AddToLeft(&rObjectCatalog, Size(nWidth * 0.20, nHeight * 0.75)); AddToBottom(aWatchWindow.get(), Size(nWidth * 0.67, nHeight * 0.25)); diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index b999767aaeb1..0f304adb83b0 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -76,7 +76,7 @@ private: css::uno::Reference< css::beans::XMultiPropertySet > notifier_; - long nCurTextWidth; + tools::Long nCurTextWidth; ImplSVEvent* m_nSetSourceInBasicId; @@ -159,7 +159,7 @@ public: class BreakPointWindow final : public vcl::Window { ModulWindow& rModulWindow; - long nCurYOffset; + tools::Long nCurYOffset; sal_uInt16 nMarkerPos; BreakPointList aBreakPointList; bool bErrorMarker; @@ -184,8 +184,8 @@ public: void SetMarkerPos( sal_uInt16 nLine, bool bErrorMarker = false ); void SetNoMarker (); - void DoScroll( long nVertScroll ); - long& GetCurYOffset() { return nCurYOffset; } + void DoScroll( tools::Long nVertScroll ); + tools::Long& GetCurYOffset() { return nCurYOffset; } BreakPointList& GetBreakPoints() { return aBreakPointList; } }; @@ -410,7 +410,7 @@ protected: // Window: virtual void Paint (vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; // Layout: - virtual void OnFirstSize (long nWidth, long nHeight) override; + virtual void OnFirstSize (tools::Long nWidth, tools::Long nHeight) override; private: // main child window diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index 391a8fe0a91e..0fe305fc990f 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -75,10 +75,10 @@ namespace { sal_uInt16 const NoMarker = 0xFFFF; -long const nBasePad = 2; -long const nCursorPad = 5; +tools::Long const nBasePad = 2; +tools::Long const nCursorPad = 5; -long nVirtToolBoxHeight; // inited in WatchWindow, used in Stackwindow +tools::Long nVirtToolBoxHeight; // inited in WatchWindow, used in Stackwindow // Returns pBase converted to SbxVariable if valid and is not an SbxMethod. SbxVariable* IsSbxVariable (SbxBase* pBase) @@ -420,11 +420,11 @@ void EditorWindow::Resize() if ( !pEditView ) return; - long nVisY = pEditView->GetStartDocPos().Y(); + tools::Long nVisY = pEditView->GetStartDocPos().Y(); pEditView->ShowCursor(); Size aOutSz( GetOutputSizePixel() ); - long nMaxVisAreaStart = pEditView->GetTextEngine()->GetTextHeight() - aOutSz.Height(); + tools::Long nMaxVisAreaStart = pEditView->GetTextEngine()->GetTextHeight() - aOutSz.Height(); if ( nMaxVisAreaStart < 0 ) nMaxVisAreaStart = 0; if ( pEditView->GetStartDocPos().Y() > nMaxVisAreaStart ) @@ -1089,8 +1089,8 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if ( pEditView->GetStartDocPos().Y() ) { - long nOutHeight = GetOutputSizePixel().Height(); - long nTextHeight = pEditEngine->GetTextHeight(); + tools::Long nOutHeight = GetOutputSizePixel().Height(); + tools::Long nTextHeight = pEditEngine->GetTextHeight(); if ( nTextHeight < nOutHeight ) pEditView->Scroll( 0, pEditView->GetStartDocPos().Y() ); @@ -1103,7 +1103,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) { if ( rModulWindow.GetHScrollBar() ) { - const long nWidth = pEditEngine->CalcTextWidth(); + const tools::Long nWidth = pEditEngine->CalcTextWidth(); if ( nWidth != nCurTextWidth ) { nCurTextWidth = nWidth; @@ -1111,7 +1111,7 @@ void EditorWindow::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint ) rModulWindow.GetHScrollBar()->SetThumbPos( pEditView->GetStartDocPos().X() ); } } - long nPrevTextWidth = nCurTextWidth; + tools::Long nPrevTextWidth = nCurTextWidth; nCurTextWidth = pEditEngine->CalcTextWidth(); if ( nCurTextWidth != nPrevTextWidth ) SetScrollBarRanges(); @@ -1327,10 +1327,10 @@ void EditorWindow::ParagraphInsertedDeleted( sal_uLong nPara, bool bInserted ) { rModulWindow.GetBreakPoints().AdjustBreakPoints( static_cast(nPara)+1, bInserted ); - long nLineHeight = GetTextHeight(); + tools::Long nLineHeight = GetTextHeight(); Size aSz = rModulWindow.GetBreakPointWindow().GetOutputSize(); tools::Rectangle aInvRect( Point( 0, 0 ), aSz ); - long nY = nPara*nLineHeight - rModulWindow.GetBreakPointWindow().GetCurYOffset(); + tools::Long nY = nPara*nLineHeight - rModulWindow.GetBreakPointWindow().GetCurYOffset(); aInvRect.SetTop( nY ); rModulWindow.GetBreakPointWindow().Invalidate( aInvRect ); @@ -1387,7 +1387,7 @@ void BreakPointWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Re return; Size const aOutSz = rRenderContext.GetOutputSize(); - long const nLineHeight = rRenderContext.GetTextHeight(); + tools::Long const nLineHeight = rRenderContext.GetTextHeight(); Image const aBrk[2] = { @@ -1416,7 +1416,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext) return; Size const aOutSz = GetOutputSize(); - long const nLineHeight = GetTextHeight(); + tools::Long const nLineHeight = GetTextHeight(); Image aMarker = GetImage(bErrorMarker ? std::u16string_view(u"" RID_BMP_ERRORMARKER) : std::u16string_view(u"" RID_BMP_STEPMARKER)); @@ -1433,7 +1433,7 @@ void BreakPointWindow::ShowMarker(vcl::RenderContext& rRenderContext) rRenderContext.DrawImage(aPos, aMarker); } -void BreakPointWindow::DoScroll( long nVertScroll ) +void BreakPointWindow::DoScroll( tools::Long nVertScroll ) { nCurYOffset -= nVertScroll; Window::Scroll( 0, nVertScroll ); @@ -1476,11 +1476,11 @@ void BreakPointWindow::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 2 ) { Point aMousePos( PixelToLogic( rMEvt.GetPosPixel() ) ); - long nLineHeight = GetTextHeight(); + tools::Long nLineHeight = GetTextHeight(); if(nLineHeight) { - long nYPos = aMousePos.Y() + nCurYOffset; - long nLine = nYPos / nLineHeight + 1; + tools::Long nYPos = aMousePos.Y() + nCurYOffset; + tools::Long nLine = nYPos / nLineHeight + 1; rModulWindow.ToggleBreakPoint( static_cast(nLine) ); Invalidate(); } @@ -1536,7 +1536,7 @@ bool BreakPointWindow::SyncYOffset() TextView* pView = rModulWindow.GetEditView(); if ( pView ) { - long nViewYOffset = pView->GetStartDocPos().Y(); + tools::Long nViewYOffset = pView->GetStartDocPos().Y(); if ( nCurYOffset != nViewYOffset ) { nCurYOffset = nViewYOffset; @@ -1982,8 +1982,8 @@ void ComplexEditorWindow::Resize() Size aSz(aOutSz); aSz.AdjustWidth( -(2*DWBORDER) ); aSz.AdjustHeight( -(2*DWBORDER) ); - long nBrkWidth = 20; - long nSBWidth = aEWVScrollBar->GetSizePixel().Width(); + tools::Long nBrkWidth = 20; + tools::Long nSBWidth = aEWVScrollBar->GetSizePixel().Width(); Size aBrkSz(nBrkWidth, aSz.Height()); @@ -2011,7 +2011,7 @@ IMPL_LINK(ComplexEditorWindow, ScrollHdl, ScrollBar *, pCurScrollBar, void ) if (aEdtWindow->GetEditView()) { DBG_ASSERT( pCurScrollBar == aEWVScrollBar.get(), "Who is scrolling?" ); - long nDiff = aEdtWindow->GetEditView()->GetStartDocPos().Y() - pCurScrollBar->GetThumbPos(); + tools::Long nDiff = aEdtWindow->GetEditView()->GetStartDocPos().Y() - pCurScrollBar->GetThumbPos(); aEdtWindow->GetEditView()->Scroll( 0, nDiff ); aBrkWindow->DoScroll( nDiff ); aLineNumberWindow->DoScroll( nDiff ); @@ -2790,7 +2790,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox() // if there is at least one element inside // calculate basic position: under the current line tools::Rectangle aRect = static_cast(pParent->GetEditEngine())->PaMtoEditCursor( pParent->GetEditView()->GetSelection().GetEnd() ); - long nViewYOffset = pParent->GetEditView()->GetStartDocPos().Y(); + tools::Long nViewYOffset = pParent->GetEditView()->GetStartDocPos().Y(); Point aPos = aRect.BottomRight();// this variable will be used later (if needed) aPos.setY( (aPos.Y() - nViewYOffset) + nBasePad ); @@ -2809,7 +2809,7 @@ void CodeCompleteWindow::ResizeAndPositionListBox() if( aVisArea.TopRight().getY() + aPos.getY() + aSize.getHeight() > aBottomPoint.getY() ) {//clipped at the bottom: move it up - const long& nParentFontHeight = pParent->GetEditEngine()->GetFont().GetFontHeight(); //parent's font (in the IDE): needed for height + const tools::Long& nParentFontHeight = pParent->GetEditEngine()->GetFont().GetFontHeight(); //parent's font (in the IDE): needed for height aPos.AdjustY( -(aSize.getHeight() + nParentFontHeight + nCursorPad) ); } diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 4799e8f7a299..ab451f482a15 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -1366,7 +1366,7 @@ void DialogWindowLayout::GetState (SfxItemSet& rSet, unsigned nWhich) } } -void DialogWindowLayout::OnFirstSize (long const nWidth, long const nHeight) +void DialogWindowLayout::OnFirstSize (tools::Long const nWidth, tools::Long const nHeight) { AddToLeft(&rObjectCatalog, Size(nWidth * 0.25, nHeight * 0.35)); if (pPropertyBrowser) diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index e42ad914390a..25967f4f4ca4 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -708,13 +708,13 @@ void Shell::ExecuteGlobal( SfxRequest& rReq ) --nLine; // scroll window and set selection - long nVisHeight = pModWin->GetOutputSizePixel().Height(); - long nTextHeight = pTextEngine->GetTextHeight(); + tools::Long nVisHeight = pModWin->GetOutputSizePixel().Height(); + tools::Long nTextHeight = pTextEngine->GetTextHeight(); if ( nTextHeight > nVisHeight ) { - long nMaxY = nTextHeight - nVisHeight; - long nOldY = pTextView->GetStartDocPos().Y(); - long nNewY = nLine * pTextEngine->GetCharHeight() - nVisHeight / 2; + tools::Long nMaxY = nTextHeight - nVisHeight; + tools::Long nOldY = pTextView->GetStartDocPos().Y(); + tools::Long nNewY = nLine * pTextEngine->GetCharHeight() - nVisHeight / 2; nNewY = std::min( nNewY, nMaxY ); pTextView->Scroll( 0, -( nNewY - nOldY ) ); pTextView->ShowCursor( false ); diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index 64255fc1162a..f71bbb206378 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -54,7 +54,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::container; extern "C" { - SAL_DLLPUBLIC_EXPORT long basicide_handle_basic_error( void const * pPtr ) + SAL_DLLPUBLIC_EXPORT tools::Long basicide_handle_basic_error( void const * pPtr ) { return HandleBasicError( static_cast(pPtr) ); } @@ -368,7 +368,7 @@ void InvalidateDebuggerSlots() pBindings->Update( SID_BASICIDE_STAT_TITLE ); } -long HandleBasicError( StarBASIC const * pBasic ) +tools::Long HandleBasicError( StarBASIC const * pBasic ) { EnsureIde(); BasicStopped(); @@ -379,7 +379,7 @@ long HandleBasicError( StarBASIC const * pBasic ) if (GetExtraData()->ShellInCriticalSection()) return 2; - long nRet = 0; + tools::Long nRet = 0; Shell* pShell = nullptr; if ( SvtModuleOptions::IsBasicIDE() ) { @@ -418,7 +418,7 @@ long HandleBasicError( StarBASIC const * pBasic ) } if ( pShell ) - nRet = long(pShell->CallBasicErrorHdl( pBasic )); + nRet = tools::Long(pShell->CallBasicErrorHdl( pBasic )); else ErrorHandler::HandleError( StarBASIC::GetErrorCode() ); diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index 0549e2ca110f..8ec80e8e20a4 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -29,7 +29,7 @@ namespace basctl namespace { // the thickness of the splitting lines -long const nSplitThickness = 3; +tools::Long const nSplitThickness = 3; } // namespace // ctor for derived classes @@ -89,7 +89,7 @@ void Layout::ArrangeWindows () bInArrangeWindows = true; Size const aSize = GetOutputSizePixel(); - long const nWidth = aSize.Width(), nHeight = aSize.Height(); + tools::Long const nWidth = aSize.Width(), nHeight = aSize.Height(); if (nWidth && nHeight) // non-empty size { // On first call the derived classes initializes the sizes of the @@ -186,8 +186,8 @@ void Layout::SplittedSide::dispose() // Add() -- adds a new window to the side (after construction) void Layout::SplittedSide::Add (DockingWindow* pWin, Size const& rSize) { - long const nSize1 = (bVertical ? rSize.Width() : rSize.Height()) + nSplitThickness; - long const nSize2 = bVertical ? rSize.Height() : rSize.Width(); + tools::Long const nSize1 = (bVertical ? rSize.Width() : rSize.Height()) + nSplitThickness; + tools::Long const nSize2 = bVertical ? rSize.Height() : rSize.Width(); // nSize if (nSize1 > nSize) nSize = nSize1; @@ -229,11 +229,11 @@ void Layout::SplittedSide::Remove (DockingWindow* pWin) // creating a Point or a Size object // The coordinate order depends on bVertical (reversed if true). -inline Size Layout::SplittedSide::MakeSize (long A, long B) const +inline Size Layout::SplittedSide::MakeSize (tools::Long A, tools::Long B) const { return bVertical ? Size(B, A) : Size(A, B); } -inline Point Layout::SplittedSide::MakePoint (long A, long B) const +inline Point Layout::SplittedSide::MakePoint (tools::Long A, tools::Long B) const { return bVertical ? Point(B, A) : Point(A, B); } @@ -254,7 +254,7 @@ bool Layout::SplittedSide::IsEmpty () const } // GetSize() -- returns the width or height of the strip (depending on the direction) -long Layout::SplittedSide::GetSize () const +tools::Long Layout::SplittedSide::GetSize () const { return IsEmpty() ? 0 : nSize; } @@ -267,13 +267,13 @@ void Layout::SplittedSide::ArrangeIn (tools::Rectangle const& rRect) aRect = rRect; // the length of the side - long const nLength = bVertical ? aRect.GetSize().Height() : aRect.GetSize().Width(); - long const nOtherSize = bVertical ? aRect.GetSize().Width() : aRect.GetSize().Height(); + tools::Long const nLength = bVertical ? aRect.GetSize().Height() : aRect.GetSize().Width(); + tools::Long const nOtherSize = bVertical ? aRect.GetSize().Width() : aRect.GetSize().Height(); // bVertical ? horizontal position : vertical position - long const nPos1 = (bVertical ? aRect.Left() : aRect.Top()) + + tools::Long const nPos1 = (bVertical ? aRect.Left() : aRect.Top()) + (bLower ? 0 : nOtherSize - (nSize - nSplitThickness)); // bVertical ? vertical position : horizontal position - long const nPos2 = bVertical ? aRect.Top() : aRect.Left(); + tools::Long const nPos2 = bVertical ? aRect.Top() : aRect.Left(); // main line bool const bEmpty = IsEmpty(); @@ -296,7 +296,7 @@ void Layout::SplittedSide::ArrangeIn (tools::Rectangle const& rRect) // positioning separator lines and windows bool bPrevDocking = false; // is the previous window docked? - long nStartPos = 0; // window position in the strip + tools::Long nStartPos = 0; // window position in the strip std::vector::size_type iLastWin = vItems.size(); // index of last docking window in the strip for (std::vector::size_type i = 0; i != vItems.size(); ++i) @@ -395,18 +395,18 @@ IMPL_LINK(Layout::SplittedSide, SplitHdl, Splitter*, pSplitter, void) void Layout::SplittedSide::CheckMarginsFor (Splitter* pSplitter) { // The splitter line cannot be closer to the edges than nMargin pixels. - static long const nMargin = 16; + static tools::Long const nMargin = 16; // Checking margins: - long const nLength = pSplitter->IsHorizontal() ? + tools::Long const nLength = pSplitter->IsHorizontal() ? aRect.GetWidth() : aRect.GetHeight(); if (!nLength) return; // bounds - long const nLower = (pSplitter->IsHorizontal() ? aRect.Left() : aRect.Top()) + nMargin; - long const nUpper = nLower + nLength - 2*nMargin; + tools::Long const nLower = (pSplitter->IsHorizontal() ? aRect.Left() : aRect.Top()) + nMargin; + tools::Long const nUpper = nLower + nLength - 2*nMargin; // split position - long const nPos = pSplitter->GetSplitPosPixel(); + tools::Long const nPos = pSplitter->GetSplitPosPixel(); // checking bounds if (nPos < nLower) pSplitter->SetSplitPosPixel(nLower); diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index 4fa6ebf8f5aa..196339cb1b33 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -102,7 +102,7 @@ void LineNumberWindow::DataChanged(DataChangedEvent const & rDCEvt) } } -void LineNumberWindow::DoScroll(long nVertScroll) +void LineNumberWindow::DoScroll(tools::Long nVertScroll) { m_nCurYOffset -= nVertScroll; Window::Scroll(0, nVertScroll); @@ -115,7 +115,7 @@ bool LineNumberWindow::SyncYOffset() if (!pView) return false; - long nViewYOffset = pView->GetStartDocPos().Y(); + tools::Long nViewYOffset = pView->GetStartDocPos().Y(); if (m_nCurYOffset == nViewYOffset) return false; diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx index 5e268c69254b..4125672689e1 100644 --- a/basctl/source/basicide/linenumberwindow.hxx +++ b/basctl/source/basicide/linenumberwindow.hxx @@ -21,7 +21,7 @@ class LineNumberWindow : public vcl::Window private: VclPtr m_pModulWindow; int m_nWidth; - long m_nCurYOffset; + tools::Long m_nCurYOffset; int m_nBaseWidth; virtual void DataChanged (DataChangedEvent const& rDCEvt) override; @@ -33,10 +33,10 @@ public: virtual ~LineNumberWindow() override; virtual void dispose() override; - void DoScroll( long nVertScroll ); + void DoScroll( tools::Long nVertScroll ); bool SyncYOffset(); - long& GetCurYOffset() { return m_nCurYOffset;} + tools::Long& GetCurYOffset() { return m_nCurYOffset;} int GetWidth() const { return m_nWidth;} }; diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 481e669d765b..b9da399830ac 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -302,8 +302,8 @@ void DlgEditor::DoScroll() aScrollPos = rWindow.LogicToPixel( aScrollPos ); aScrollPos = rWindow.PixelToLogic( aScrollPos ); - long nX = aScrollPos.Width() + aOrg.X(); - long nY = aScrollPos.Height() + aOrg.Y(); + tools::Long nX = aScrollPos.Width() + aOrg.X(); + tools::Long nY = aScrollPos.Height() + aOrg.Y(); if( !nX && !nY ) return; @@ -493,7 +493,7 @@ void DlgEditor::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle Size aSize = rRenderContext.PixelToLogic( Size( 400, 300 ) ); // align with grid - Size aGridSize_(long(pDlgEdView->GetSnapGridWidthX()), long(pDlgEdView->GetSnapGridWidthY())); + Size aGridSize_(tools::Long(pDlgEdView->GetSnapGridWidthX()), tools::Long(pDlgEdView->GetSnapGridWidthY())); aSize.AdjustWidth( -(aSize.Width() % aGridSize_.Width()) ); aSize.AdjustHeight( -(aSize.Height() % aGridSize_.Height()) ); @@ -1086,11 +1086,11 @@ void DlgEditor::ClearModifyFlag() namespace Print { - long const nLeftMargin = 1700; - long const nRightMargin = 900; - long const nTopMargin = 2000; - long const nBottomMargin = 1000; - long const nBorder = 300; + tools::Long const nLeftMargin = 1700; + tools::Long const nRightMargin = 900; + tools::Long const nTopMargin = 2000; + tools::Long const nBottomMargin = 1000; + tools::Long const nBorder = 300; } static void lcl_PrintHeader( Printer* pPrinter, const OUString& rTitle ) // not working yet @@ -1108,20 +1108,20 @@ static void lcl_PrintHeader( Printer* pPrinter, const OUString& rTitle ) // not aFont.SetAlignment( ALIGN_BOTTOM ); pPrinter->SetFont( aFont ); - long const nFontHeight = pPrinter->GetTextHeight(); + tools::Long const nFontHeight = pPrinter->GetTextHeight(); // 1st border => line, 2+3 border = free space - long const nYTop = Print::nTopMargin - 3*Print::nBorder - nFontHeight; + tools::Long const nYTop = Print::nTopMargin - 3*Print::nBorder - nFontHeight; - long const nXLeft = Print::nLeftMargin - Print::nBorder; - long const nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder; + tools::Long const nXLeft = Print::nLeftMargin - Print::nBorder; + tools::Long const nXRight = aSz.Width() - Print::nRightMargin + Print::nBorder; pPrinter->DrawRect(tools::Rectangle( Point(nXLeft, nYTop), Size(nXRight - nXLeft, aSz.Height() - nYTop - Print::nBottomMargin + Print::nBorder) )); - long nY = Print::nTopMargin - 2*Print::nBorder; + tools::Long nY = Print::nTopMargin - 2*Print::nBorder; Point aPos(Print::nLeftMargin, nY); pPrinter->DrawText( aPos, rTitle ); @@ -1169,13 +1169,13 @@ void DlgEditor::Print( Printer* pPrinter, const OUString& rTitle ) // not wor Size aOutputSz; if( nBmpSzHeight * nScaleX <= nPaperSzHeight ) { - aOutputSz.setWidth( static_cast(nBmpSzWidth * nScaleX) ); - aOutputSz.setHeight( static_cast(nBmpSzHeight * nScaleX) ); + aOutputSz.setWidth( static_cast(nBmpSzWidth * nScaleX) ); + aOutputSz.setHeight( static_cast(nBmpSzHeight * nScaleX) ); } else { - aOutputSz.setWidth( static_cast(nBmpSzWidth * nScaleY) ); - aOutputSz.setHeight( static_cast(nBmpSzHeight * nScaleY) ); + aOutputSz.setWidth( static_cast(nBmpSzWidth * nScaleY) ); + aOutputSz.setHeight( static_cast(nBmpSzHeight * nScaleY) ); } Point aPosOffs( diff --git a/basctl/source/dlged/dlgedfunc.cxx b/basctl/source/dlged/dlgedfunc.cxx index 78fe1ef96966..b16cf695a26a 100644 --- a/basctl/source/dlged/dlgedfunc.cxx +++ b/basctl/source/dlged/dlgedfunc.cxx @@ -47,8 +47,8 @@ void DlgEdFunc::ForceScroll( const Point& rPos ) ScrollBar* pHScroll = rParent.GetHScroll(); ScrollBar* pVScroll = rParent.GetVScroll(); - long nDeltaX = pHScroll->GetLineSize(); - long nDeltaY = pVScroll->GetLineSize(); + tools::Long nDeltaX = pHScroll->GetLineSize(); + tools::Long nDeltaY = pVScroll->GetLineSize(); if( !aOutRect.IsInside( rPos ) ) { @@ -173,8 +173,8 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) case KEY_LEFT: case KEY_RIGHT: { - long nX = 0; - long nY = 0; + tools::Long nX = 0; + tools::Long nY = 0; if ( nCode == KEY_UP ) { @@ -297,9 +297,9 @@ bool DlgEdFunc::KeyInput( const KeyEvent& rKEvt ) ScrollBar* pScrollBar = ( nX != 0 ) ? rParent.GetHScroll() : rParent.GetVScroll(); if ( pScrollBar ) { - long nRangeMin = pScrollBar->GetRangeMin(); - long nRangeMax = pScrollBar->GetRangeMax(); - long nThumbPos = pScrollBar->GetThumbPos() + ( ( nX != 0 ) ? nX : nY ) * pScrollBar->GetLineSize(); + tools::Long nRangeMin = pScrollBar->GetRangeMin(); + tools::Long nRangeMax = pScrollBar->GetRangeMax(); + tools::Long nThumbPos = pScrollBar->GetThumbPos() + ( ( nX != 0 ) ? nX : nY ) * pScrollBar->GetLineSize(); if ( nThumbPos < nRangeMin ) nThumbPos = nRangeMin; if ( nThumbPos > nRangeMax ) diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx index 6aa1691ad9ad..50631babe24c 100644 --- a/basctl/source/dlged/propbrw.cxx +++ b/basctl/source/dlged/propbrw.cxx @@ -72,13 +72,13 @@ void PropBrw::Update( const SfxViewShell* pShell ) namespace { -const long STD_WIN_SIZE_X = 300; -const long STD_WIN_SIZE_Y = 350; +const tools::Long STD_WIN_SIZE_X = 300; +const tools::Long STD_WIN_SIZE_Y = 350; -const long STD_MIN_SIZE_X = 250; -const long STD_MIN_SIZE_Y = 250; +const tools::Long STD_MIN_SIZE_X = 250; +const tools::Long STD_MIN_SIZE_Y = 250; -const long WIN_BORDER = 2; +const tools::Long WIN_BORDER = 2; } // namespace diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx index a56b5972e2e5..15f157565fb2 100644 --- a/basctl/source/inc/baside3.hxx +++ b/basctl/source/inc/baside3.hxx @@ -134,7 +134,7 @@ public: virtual void UpdateDebug (bool) override {}; protected: // Layout: - virtual void OnFirstSize (long nWidth, long nHeight) override; + virtual void OnFirstSize (tools::Long nWidth, tools::Long nHeight) override; private: // dockable windows: diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index d87eedf08297..46d0f9392896 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -19,6 +19,7 @@ #pragma once #include "scriptdocument.hxx" +#include class SbMethod; class SbModule; @@ -40,7 +41,7 @@ namespace basctl StarBASIC* FindBasic( const SbxVariable* pVar ); void StopBasic(); - long HandleBasicError( StarBASIC const * pBasic ); + tools::Long HandleBasicError( StarBASIC const * pBasic ); void BasicStopped( bool* pbAppWindowDisabled = nullptr, bool* pbDispatcherLocked = nullptr, sal_uInt16* pnWaitCount = nullptr, SfxUInt16Item** ppSWActionCount = nullptr, SfxUInt16Item** ppSWLockViewCount = nullptr ); diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 8e6909d14a2a..6b83c402959b 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -129,7 +129,7 @@ private: tools::Rectangle aPaintRect; bool bDialogModelChanged; Idle aMarkIdle; - long mnPaintGuard; + tools::Long mnPaintGuard; css::uno::Reference< css::frame::XModel > m_xDocument; public: diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx index 495afe4be4d5..c3aba7427ce0 100644 --- a/basctl/source/inc/layout.hxx +++ b/basctl/source/inc/layout.hxx @@ -65,7 +65,7 @@ protected: virtual void Resize () override; virtual void DataChanged (DataChangedEvent const& rDCEvt) override; // new: - virtual void OnFirstSize (long nWidth, long nHeight) = 0; + virtual void OnFirstSize (tools::Long nWidth, tools::Long nHeight) = 0; private: // the main child window (either ModulWindow or DialogWindow) @@ -83,7 +83,7 @@ private: void Add (DockingWindow*, Size const&); void Remove (DockingWindow*); bool IsEmpty () const; - long GetSize () const; + tools::Long GetSize () const; void ArrangeIn (tools::Rectangle const&); void dispose(); @@ -97,7 +97,7 @@ private: // rectangle to move in tools::Rectangle aRect; // size (width or height) - long nSize; + tools::Long nSize; // the main splitting line VclPtr aSplitter; // the dockable windows (and some data) @@ -110,15 +110,15 @@ private: // the window may fill the space of the adjacent currently // non-docking windows, but this change is not stored in these // variables. These change only when the splitter lines are moved. - long nStartPos, nEndPos; + tools::Long nStartPos, nEndPos; // splitter line window before the window // (the first one is always nullptr) VclPtr pSplit; }; std::vector vItems; - Point MakePoint (long, long) const; - Size MakeSize (long, long) const; + Point MakePoint (tools::Long, tools::Long) const; + Size MakeSize (tools::Long, tools::Long) const; static bool IsDocking (DockingWindow const&); DECL_LINK(SplitHdl, Splitter*, void); void CheckMarginsFor (Splitter*); -- cgit