Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 8093 → Rev 8094

/branches/Version13x/Scribus/scribus/smreplacedia.cpp
34,7 → 34,7
 
QString SMRowWidget::replaceWith()
{
return optionsCombo->currentItem() == 0 ? QString::null : optionsCombo->currentText();
return optionsCombo->currentItem() == 0 ? "" : optionsCombo->currentText();
}
 
SMRowWidget::~SMRowWidget()
/branches/Version13x/Scribus/scribus/pageitem_textframe.cpp
322,7 → 322,7
invalid = false;
PageItem_TextFrame* prevInChain = dynamic_cast<PageItem_TextFrame*>(BackBox);
if (!prevInChain)
qDebug(QString("layout(): backBox=%1").arg((uint)BackBox));
/*qDebug(QString("layout(): backBox=%1").arg((uint)BackBox))*/;
else
BackBox->layout();
return;
/branches/Version13x/Scribus/scribus/smtextstyles.cpp
257,18 → 257,13
for (uint i = 0; i < deleted_.count(); ++i)
replacement[deleted_[i].first] = deleted_[i].second;
 
doc_->redefineStyles(tmpStyles_, true);
doc_->redefineStyles(tmpStyles_, false);
doc_->replaceStyles(replacement);
 
//FIXME replace deleted styles in doc
 
deleted_.clear(); // deletion done at this point
 
doc_->scMW()->propertiesPalette->paraStyleCombo->updateFormatList();
doc_->scMW()->propertiesPalette->charStyleCombo->updateFormatList();
// CB 030107 SM does not need to update colours in propertiesPalette. this is a color list not the active item
// doc_->scMW()->propertiesPalette->updateColorList();
// FIXME private access in ScMW
// doc_->scMW()->updateColorMenu();
doc_->scMW()->view->DrawNew();
doc_->changed();
}
1369,8 → 1364,19
if (!doc_)
return;
 
deleted_.clear();
doc_->redefineCharStyles(tmpStyles_, true);
QMap<QString, QString> replacement;
for (uint i = 0; i < deleted_.count(); ++i)
replacement[deleted_[i].first] = deleted_[i].second;
 
doc_->redefineCharStyles(tmpStyles_, false);
doc_->replaceCharStyles(replacement);
 
deleted_.clear(); // deletion done at this point
 
doc_->scMW()->propertiesPalette->paraStyleCombo->updateFormatList();
doc_->scMW()->propertiesPalette->charStyleCombo->updateFormatList();
doc_->scMW()->view->DrawNew();
doc_->changed();
}
 
void SMCharacterStyle::editMode(bool isOn)