inline
-void lyx_advance(string & data, unsigned int n)
+void lyx_advance(string & data, string::size_type n)
{
data.erase(0, n);
}
string const LyXLength::asString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
buffer << val << unit_name[uni]; // setw?
return buffer.str().c_str();
}
string const LyXLength::asLatexString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
switch(uni) {
case PW:
case PE:
buffer << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\columnwidth";
break;
case PP:
- buffer << "." << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\pagewidth";
+ buffer << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\pagewidth";
break;
case PL:
- buffer << "." << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\linewidth";
+ buffer << abs(static_cast<int>(val/100)) << "." << abs(static_cast<int>(val)%100) << "\\linewidth";
break;
default:
buffer << val << unit_name[uni]; // setw?
string const LyXGlueLength::asString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
if (plus_val != 0.0)
if (minus_val != 0.0)
string const LyXGlueLength::asLatexString() const
{
- std::ostringstream buffer;
+ ostringstream buffer;
if (plus_val != 0.0)
if (minus_val != 0.0)
float value;
string input = strip(data);
- int length = input.length();
+ string::size_type const length = input.length();
if (length > 1 && input[length-1] == '*') {
kp = true;
int VSpace::inPixels(BufferView * bv) const
{
// Height of a normal line in pixels (zoom factor considered)
- int height = bv->text->DefaultHeight(); // [pixels]
+ int height = bv->text->defaultHeight(); // [pixels]
int skip = 0;
int width = bv->workWidth();
// can't display negative anyway
result = 0.0;
value = len.value();
- short val_sign = value < 0.0 ? -1 : 1;
+ int val_sign = value < 0.0 ? -1 : 1;
switch (len.unit()) {
case LyXLength::SP: