summaryrefslogtreecommitdiff
path: root/basctl/source/dlged
diff options
context:
space:
mode:
Diffstat (limited to 'basctl/source/dlged')
-rw-r--r--basctl/source/dlged/dlged.cxx34
-rw-r--r--basctl/source/dlged/dlgedfunc.cxx14
-rw-r--r--basctl/source/dlged/propbrw.cxx10
3 files changed, 29 insertions, 29 deletions
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<long>(nBmpSzWidth * nScaleX) );
- aOutputSz.setHeight( static_cast<long>(nBmpSzHeight * nScaleX) );
+ aOutputSz.setWidth( static_cast<tools::Long>(nBmpSzWidth * nScaleX) );
+ aOutputSz.setHeight( static_cast<tools::Long>(nBmpSzHeight * nScaleX) );
}
else
{
- aOutputSz.setWidth( static_cast<long>(nBmpSzWidth * nScaleY) );
- aOutputSz.setHeight( static_cast<long>(nBmpSzHeight * nScaleY) );
+ aOutputSz.setWidth( static_cast<tools::Long>(nBmpSzWidth * nScaleY) );
+ aOutputSz.setHeight( static_cast<tools::Long>(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