mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 10:00:33 +00:00
return string() instead of 0, make scope of int cell smaller, update no.po
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1145 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
8aff605cae
commit
0cbe2e8189
@ -1,3 +1,9 @@
|
||||
2000-10-24 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* src/tabular.C (Ascii): minimize scope of cell.
|
||||
|
||||
* src/BufferView2.C (nextWord): return string() instead of 0;
|
||||
|
||||
2000-10-23 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* src/converter.h: add a std:: qualifier
|
||||
|
@ -1,3 +1,7 @@
|
||||
2000-10-24 Lars Gullik Bjønnes <larsbj@lyx.org>
|
||||
|
||||
* no.po: slightly updated.
|
||||
|
||||
2000-10-17 Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>
|
||||
|
||||
* Makefile.in.in (${srcdir}/POTFILES.in): hopefully fix the
|
||||
|
@ -658,7 +658,7 @@ string const BufferView::nextWord(float & value)
|
||||
{
|
||||
if (!available()) {
|
||||
value = 1;
|
||||
return 0;
|
||||
return string();
|
||||
}
|
||||
|
||||
return text->SelectNextWord(this, value);
|
||||
|
@ -50,7 +50,7 @@ IndexDialogData::IndexDialogData
|
||||
index->setBackgroundMode( QWidget::PaletteBase );
|
||||
index->setFontPropagation( QWidget::NoChildren );
|
||||
index->setPalettePropagation( QWidget::NoChildren );
|
||||
index->setText( _("") );
|
||||
index->setText( _(""));
|
||||
index->setMaxLength( 32767 );
|
||||
index->setFrame( QLineEdit::Normal );
|
||||
index->setFrame( TRUE );
|
||||
|
@ -2402,13 +2402,12 @@ int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
|
||||
//+ first calculate the width of the single columns +
|
||||
//+---------------------------------------------------------------------
|
||||
vector<unsigned int> clen(columns_);
|
||||
int cell;
|
||||
|
||||
// first all non (real) multicolumn cells!
|
||||
for(int j = 0; j < columns_; ++j) {
|
||||
clen[j] = 0;
|
||||
for(int i = 0; i < rows_; ++i) {
|
||||
cell = GetCellNumber(i, j);
|
||||
int cell = GetCellNumber(i, j);
|
||||
if (IsMultiColumn(cell, true))
|
||||
continue;
|
||||
ostringstream sstr;
|
||||
@ -2420,7 +2419,7 @@ int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
|
||||
// then all (real) multicolumn cells!
|
||||
for(int j = 0; j < columns_; ++j) {
|
||||
for(int i = 0; i < rows_; ++i) {
|
||||
cell = GetCellNumber(i, j);
|
||||
int cell = GetCellNumber(i, j);
|
||||
if (!IsMultiColumn(cell, true) || IsPartOfMultiColumn(i, j))
|
||||
continue;
|
||||
ostringstream sstr;
|
||||
@ -2433,7 +2432,7 @@ int LyXTabular::Ascii(Buffer const * buf, ostream & os) const
|
||||
clen[j + n - 1] = len;
|
||||
}
|
||||
}
|
||||
cell = 0;
|
||||
int cell = 0;
|
||||
for(int i = 0; i < rows_; ++i) {
|
||||
AsciiTopHLine(os, i, clen);
|
||||
for(int j = 0; j < columns_; ++j) {
|
||||
|
Loading…
Reference in New Issue
Block a user