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

fix issue with unsupported typedef on Mac

Browse Source
This commit is contained in:
Norbert Thiebaud
2011-11-17 18:38:37 -06:00
parent cc09ce22e9
commit ae78e3e913
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
basctl/source/basicide/linenumberwindow.cxx
View File

@@ -30,12 +30,12 @@ void LineNumberWindow::Paint( const Rectangle& )
GetParent()->Resize(); GetParent()->Resize();
ulong windowHeight = GetOutputSize().Height(); int windowHeight = GetOutputSize().Height();
ulong nLineHeight = GetTextHeight(); int nLineHeight = GetTextHeight();
ulong startY = txtView->GetStartDocPos().Y(); int startY = txtView->GetStartDocPos().Y();
ulong nStartLine = startY / nLineHeight + 1; int nStartLine = startY / nLineHeight + 1;
ulong nEndLine = (startY + windowHeight) / nLineHeight + 1; int nEndLine = (startY + windowHeight) / nLineHeight + 1;
if(txtEngine->GetParagraphCount() + 1 < nEndLine) if(txtEngine->GetParagraphCount() + 1 < nEndLine)
nEndLine = txtEngine->GetParagraphCount() + 1; nEndLine = txtEngine->GetParagraphCount() + 1;
@@ -43,7 +43,7 @@ void LineNumberWindow::Paint( const Rectangle& )
nWidth = String::CreateFromInt64(nEndLine).Len() * 10; nWidth = String::CreateFromInt64(nEndLine).Len() * 10;
sal_Int64 y = (nStartLine - 1) * nLineHeight; 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)); DrawText(Point(0, y - nCurYOffset), String::CreateFromInt64(i));
} }
@@ -88,7 +88,7 @@ bool LineNumberWindow::SyncYOffset()
return true; return true;
} }
ulong LineNumberWindow::GetWidth() int LineNumberWindow::GetWidth()
{ {
return (nWidth < 20 ? 20 : nWidth); return (nWidth < 20 ? 20 : nWidth);
} }

4
basctl/source/basicide/linenumberwindow.hxx
View File

@@ -9,7 +9,7 @@ class LineNumberWindow : public Window
{ {
private: private:
ModulWindow* pModulWindow; ModulWindow* pModulWindow;
ulong nWidth; int nWidth;
long nCurYOffset; long nCurYOffset;
virtual void DataChanged(DataChangedEvent const & rDCEvt); virtual void DataChanged(DataChangedEvent const & rDCEvt);
@@ -26,7 +26,7 @@ public:
bool SyncYOffset(); bool SyncYOffset();
long& GetCurYOffset(); long& GetCurYOffset();
ulong GetWidth(); int GetWidth();
}; };
#endif // BASICIDE_LINENUMBERWINDOW_HXX #endif // BASICIDE_LINENUMBERWINDOW_HXX