← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/plugins/scriptplugin/cmdtext.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/plugins/scriptplugin/cmdtext.cpp
262
262
        Daten.replace(QChar('\n') , SpecialChars::PARSEP);
263
263
        PyMem_Free(Text);
264
264
        currItem->itemText.clear();
265
 
        currItem->CPos = 0;
266
265
        for (int a = 0; a < ScCore->primaryMainWindow()->doc->FrameItems.count(); ++a)
267
266
        {
268
267
                ScCore->primaryMainWindow()->doc->FrameItems.at(a)->ItemNr = a;
304
303
        if (pos == -1)
305
304
                pos = it->itemText.length();
306
305
        it->itemText.insertChars(pos, Daten);
307
 
        it->CPos = pos + Daten.length();
308
306
        it->Dirty = true;
309
307
        if (ScCore->primaryMainWindow()->doc->DoDrawing)
310
308
        {
612
610
        else
613
611
        {
614
612
                it->itemText.clear();
615
 
                it->CPos = 0;
616
613
                for (int a = 0; a < ScCore->primaryMainWindow()->doc->FrameItems.count(); ++a)
617
614
                {
618
615
                        ScCore->primaryMainWindow()->doc->FrameItems.at(a)->ItemNr = a;
940
937
 
941
938
PyObject *scribus_istextoverflowing(PyObject * self, PyObject* args, PyObject* kw)
942
939
{
 
940
        int nolinks = 0;
943
941
        char *name = const_cast<char*>("");
944
 
        bool nolinks = false;
945
942
        char *kwargs[] = {const_cast<char*>("name"), const_cast<char*>("nolinks"), NULL};
946
943
        if (!PyArg_ParseTupleAndKeywords(args, kw, "|esi", kwargs, "utf-8", &name, &nolinks))
947
944
                return NULL;