Merge remote-tracking branch 'rcutmore/bug-3331'

apps/opencs/model/world/idtable.cpp

@@ -159,7 +159,9 @@ void CSMWorld::IdTable::addRecordWithData (const std::string& id,
     mIdCollection->appendBlankRecord (id, type);
 
     for (std::map<int, QVariant>::const_iterator iter (data.begin()); iter!=data.end(); ++iter)
-        mIdCollection->setData (index, iter->first, iter->second);
+    {
+        mIdCollection->setData(index, iter->first, iter->second);
+    }
 
     endInsertRows();
 }

apps/opencs/view/world/startscriptcreator.cpp

@@ -24,15 +24,6 @@ CSMWorld::IdTable& CSVWorld::StartScriptCreator::getStartScriptsTable() const
     );
 }
 
-void CSVWorld::StartScriptCreator::configureCreateCommand(CSMWorld::CreateCommand& command) const
-{
-    CSMWorld::IdTable& table = getStartScriptsTable();
-    int column = table.findColumnIndex(CSMWorld::Columns::ColumnId_Id);
-
-    // Set script ID to be added to start scripts table.
-    command.addValue(column, mScript->text());
-}
-
 CSVWorld::StartScriptCreator::StartScriptCreator(
     CSMWorld::Data &data,
     QUndoStack &undoStack,

apps/opencs/view/world/startscriptcreator.hpp

@@ -31,10 +31,6 @@ namespace CSVWorld
             /// \return reference to table containing start scripts.
             CSMWorld::IdTable& getStartScriptsTable() const;
 
-            /// \brief Add user input to command for creating start script.
-            /// \param command Creation command to configure.
-            virtual void configureCreateCommand(CSMWorld::CreateCommand& command) const;
-
         public:
 
             StartScriptCreator(