diff options
Diffstat (limited to 'src/tools/viewcsv.cpp')
| -rw-r--r-- | src/tools/viewcsv.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/viewcsv.cpp b/src/tools/viewcsv.cpp index 46db319..5009ea8 100644 --- a/src/tools/viewcsv.cpp +++ b/src/tools/viewcsv.cpp | |||
| @@ -105,8 +105,8 @@ public: | |||
| 105 | int maxx, maxy; | 105 | int maxx, maxy; |
| 106 | getmaxyx( stdscr, maxy, maxx ); | 106 | getmaxyx( stdscr, maxy, maxx ); |
| 107 | 107 | ||
| 108 | int iRows = min( (int)doc.sgData.getSize(), maxy-((bHeaderRow)?(4):(3)) ); | 108 | int iRows = buMin( (int)doc.sgData.getSize(), maxy-((bHeaderRow)?(4):(3)) ); |
| 109 | int iCols = min( doc.iMaxCols, (int)maxx-1 ); | 109 | int iCols = buMin( doc.iMaxCols, (int)maxx-1 ); |
| 110 | 110 | ||
| 111 | int iHdrHeight = 1; | 111 | int iHdrHeight = 1; |
| 112 | if( bHeaderRow ) | 112 | if( bHeaderRow ) |
| @@ -129,7 +129,7 @@ public: | |||
| 129 | { | 129 | { |
| 130 | if( iXPos >= maxx ) | 130 | if( iXPos >= maxx ) |
| 131 | break; | 131 | break; |
| 132 | int iWidth = min( doc.aWidths[iCol+iXOff], maxx-iXPos-1 ); | 132 | int iWidth = buMin( doc.aWidths[iCol+iXOff], maxx-iXPos-1 ); |
| 133 | char buf[6]; | 133 | char buf[6]; |
| 134 | snprintf( buf, 6, "%d", iCol+iXOff ); | 134 | snprintf( buf, 6, "%d", iCol+iXOff ); |
| 135 | mvaddch( 0, iXPos, ACS_VLINE ); | 135 | mvaddch( 0, iXPos, ACS_VLINE ); |
| @@ -165,7 +165,7 @@ public: | |||
| 165 | { | 165 | { |
| 166 | if( iXPos >= maxx ) | 166 | if( iXPos >= maxx ) |
| 167 | break; | 167 | break; |
| 168 | int iWidth = min( doc.aWidths[iCol+iXOff], maxx-iXPos-1 ); | 168 | int iWidth = buMin( doc.aWidths[iCol+iXOff], maxx-iXPos-1 ); |
| 169 | mvaddch( iRow+iHdrHeight+1, iXPos, ACS_VLINE ); | 169 | mvaddch( iRow+iHdrHeight+1, iXPos, ACS_VLINE ); |
| 170 | mvaddnstr( iRow+iHdrHeight+1, iXPos+1, | 170 | mvaddnstr( iRow+iHdrHeight+1, iXPos+1, |
| 171 | doc.sgData[iRow+iYOff][iCol+iXOff].getStr(), iWidth ); | 171 | doc.sgData[iRow+iYOff][iCol+iXOff].getStr(), iWidth ); |