From ae78e3e913f39e2cc6d2b6f83f38c2ea225ab53e Mon Sep 17 00:00:00 2001
From: Norbert Thiebaud <nthiebaud@gmail.com>
Date: Thu, 17 Nov 2011 18:38:37 -0600
Subject: fix issue with unsupported typedef on Mac

---
 basctl/source/basicide/linenumberwindow.cxx | 14 +++++++-------
 basctl/source/basicide/linenumberwindow.hxx |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'basctl')

diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index deba85df526c..fb7bed6118f3 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -30,12 +30,12 @@ void LineNumberWindow::Paint( const Rectangle& )
 
   GetParent()->Resize();
 
-  ulong windowHeight = GetOutputSize().Height();
-  ulong nLineHeight = GetTextHeight();
+  int windowHeight = GetOutputSize().Height();
+  int nLineHeight = GetTextHeight();
 
-  ulong startY = txtView->GetStartDocPos().Y();
-  ulong nStartLine = startY / nLineHeight + 1;
-  ulong nEndLine = (startY + windowHeight) / nLineHeight + 1;
+  int startY = txtView->GetStartDocPos().Y();
+  int nStartLine = startY / nLineHeight + 1;
+  int nEndLine = (startY + windowHeight) / nLineHeight + 1;
 
   if(txtEngine->GetParagraphCount() + 1 < nEndLine)
     nEndLine = txtEngine->GetParagraphCount() + 1;
@@ -43,7 +43,7 @@ void LineNumberWindow::Paint( const Rectangle& )
   nWidth = String::CreateFromInt64(nEndLine).Len() * 10;
 
   sal_Int64 y = (nStartLine - 1) * nLineHeight;
-  for(ulong i = nStartLine; i <= nEndLine; ++i, y += nLineHeight)
+  for(int i = nStartLine; i <= nEndLine; ++i, y += nLineHeight)
     DrawText(Point(0, y - nCurYOffset), String::CreateFromInt64(i));
 }
 
@@ -88,7 +88,7 @@ bool LineNumberWindow::SyncYOffset()
   return true;
 }
 
-ulong LineNumberWindow::GetWidth()
+int LineNumberWindow::GetWidth()
 {
   return (nWidth < 20 ? 20 : nWidth);
 }
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index fd30171a0d20..b94fae9e2a78 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -9,7 +9,7 @@ class LineNumberWindow : public Window
 {
 private:
   ModulWindow* pModulWindow;
-  ulong nWidth;
+  int nWidth;
   long nCurYOffset;
 
   virtual void DataChanged(DataChangedEvent const & rDCEvt);
@@ -26,7 +26,7 @@ public:
   bool SyncYOffset();
   long& GetCurYOffset();
 
-  ulong GetWidth();
+  int GetWidth();
 };
 
 #endif // BASICIDE_LINENUMBERWINDOW_HXX
-- 
cgit