1. 25 Mar, 2016 7 kayıt (commit)
  2. 24 Mar, 2016 33 kayıt (commit)
    • Michael Stahl's avatar
      vcl: let's try to convert that to an assert · 62ab87f7
      Michael Stahl yazdı
      Change-Id: I41867f0d18e604ffb67a37ba3ab3a08a59749c13
      62ab87f7
    • Michael Stahl's avatar
      vcl: tdf#98812: acquire reference count of WinFontInstances · 99207a26
      Michael Stahl yazdı
      ... when they are inserted in WinSalGraphics::mpWinFontEntry.
      
      Not sure why one of these drops to 0 but is not removed from the
      WinSalGraphics when formatting this particular bugdoc.
      
      Acquiring the instances when retaining pointers to them should make
      the life cycle a little less insane.
      
      Change-Id: If1404f46a13736b2a226e198bdf0c3ca8e09bb38
      99207a26
    • Michael Stahl's avatar
      unordf: replace boost::shared_array with std::shared_ptr · 1cd0a315
      Michael Stahl yazdı
      It was using a custom deleter anyway.
      
      Change-Id: I700b7cf314b7f837a7143206ba42e412c5a1670d
      1cd0a315
    • Michael Stahl's avatar
      unordf: replace boost::noncopyable with C++11 delete · 9cdfc240
      Michael Stahl yazdı
      Change-Id: I996ca0589db8b73db045c87bbecfab03be9dbaef
      9cdfc240
    • Michael Stahl's avatar
      filter: [loplugin:simplifybool] · a764d03e
      Michael Stahl yazdı
      Change-Id: I491708d12c0c220705fe79a16ca85cf874692b77
      a764d03e
    • Jan-Marek Glogowski's avatar
      MM: fix debug document dumping · bfa50217
      Jan-Marek Glogowski yazdı
      Previously the debug documents were dumped to the temporary mail
      merge directory, which is removed at the end of MM. So this dumps
      the document to an extra directory.
      
      Also fixes the broken reinterpret_cast "env" => "int" conversation
      to get the real number of documents, which work with multi-digit
      numbers.
      
      Change-Id: I456b506e9a70cffdfc93cb3eadd39c454a536343
      bfa50217
    • Jan-Marek Glogowski's avatar
      MM: remove lock from saved documents · c0e1567f
      Jan-Marek Glogowski yazdı
      Actually we have to call DoSaveCompleted to get rid of the locking.
      Instead this adds a parameter to skip the recent file registration
      used in non bCreateSingleFile modes.
      
      Change-Id: I57151f08ad8d737007da84c4566685cc37612dfb
      c0e1567f
    • Jan-Marek Glogowski's avatar
      MM: remove multiple unneeded indention levels · c2cdb653
      Jan-Marek Glogowski yazdı
      Change-Id: Ia363904d3c3fbabdb7aa0dd9aa0715d7d6982f85
      c2cdb653
    • Jan-Marek Glogowski's avatar
      MM: rename MergeNew => Merge · bc477f93
      Jan-Marek Glogowski yazdı
      Since all old code from the original Merge function is gone, just
      do the rename.
      
      Change-Id: I7cc1b4b58cc73bea83a723b2478a8b4bf59a382f
      bc477f93
    • Jan-Marek Glogowski's avatar
      MM: don't try to save the source MM document · 55654acd
      Jan-Marek Glogowski yazdı
      Just create in internal copy, if the source document is modified.
      
      Change-Id: I4587b3df5ff0b42c98f1b69fe18b4f11f5c9b8e4
      55654acd
    • Jan-Marek Glogowski's avatar
      MM: just show the print progress dialog for print · 2a6cd03f
      Jan-Marek Glogowski yazdı
      Change-Id: I75a33c14f4a2b5ab404ce937e5d23392f6021a1b
      2a6cd03f
    • Jan-Marek Glogowski's avatar
      MM: fix silent mode on merge start · 83d747d5
      Jan-Marek Glogowski yazdı
      We currently don't handle the change of silent mode during a running
      mail merge job correctly, so don't allow it.
      
      Change-Id: I2cb8cc1c737e93e8b2a90a6e73fb3e49008fe91d
      83d747d5
    • Jan-Marek Glogowski's avatar
      MM: move mail creation into a local function · e3e2a4a2
      Jan-Marek Glogowski yazdı
      And also use C++11 range-based for loop loops.
      
      Change-Id: I7bafc419a21cdd6bb7aaed7d67b640409d308f79
      e3e2a4a2
    • Jan-Marek Glogowski's avatar
      MM: don't register files in recently used... · f97c84f4
      Jan-Marek Glogowski yazdı
      ... in email and !bCreateSingleFile file mode. Also saves a bunch
      of instructions. For my simple document it was ~10% of the save
      time and 75% is the creation of the preview thumbnails...
      
      Change-Id: I14f7092007b1acfed6cbe0f2f4cd6eaecd32b514
      f97c84f4
    • Jan-Marek Glogowski's avatar
      MM: use working doc DB manager on save · d2f21bfc
      Jan-Marek Glogowski yazdı
      This is related to tdf#97318 but doesn't fix it, as the wizard
      works with a single merged document, which is split later.
      
      When saving the working document in !bCreateSingleFile mode, we
      have to restore the documents DB manager for two reasons:
      
      1. We otherwise would save the whole database content.
      2. We crash with embedded databases of the original DB manager.
      
      Change-Id: I9b209854703ec95c2c63c83019e857f2d26f753d
      d2f21bfc
    • Jan-Marek Glogowski's avatar
      MM: correctly handle directory in dialog · 2b11dee4
      Jan-Marek Glogowski yazdı
      For convenience we present file URLs in the systems local file
      notation. But the directory selection dialog expects an URL, so
      we have to convert the local notation from the edit entry to a
      file URL.
      
      Change-Id: Idff6f7d4b135eef087c61560b0603b9a6669dbf7
      2b11dee4
    • Jan-Marek Glogowski's avatar
      tdf#96914 MM: don't round trip the source document · aeb01b75
      Jan-Marek Glogowski yazdı
      To get a unmodified document, the mail merge via File -> Print
      used to write a document and reload it. This is not a problem with
      normal documents, but with embedded databases this results in a
      second database with the same name, which disposes the first
      registered database and the xResultSet from the mail merge dialog.
      
      As a workaround this just creates an internal copy, sets the
      correct database settings and resets the modified status.
      
      We still need a more general solution to handle documents with the
      same embedded DB name in a sane way, probably by making the embedded
      database a private object of the documents database manager.
      
      We also need to keep the IsLabelDoc information, otherwise
      cloning label documents breaks MM due to undetected, existing
      section links. This is currently handled MM internal when creating
      a document clone, but probably a reset function for the rest of the
      document settings should be created and used.
      
      Change-Id: I20ddea30196d65cb89f69977867f012816ec6001
      aeb01b75
    • Jan-Marek Glogowski's avatar
      tdf#95292 MM: cleanup bEndOfDB handling · bdb0c4e1
      Jan-Marek Glogowski yazdı
      bEndOfDB was handled inconsistently in ToNextRecord for record
      selections and normal record iteration. The new unified semantics
      are defined to set bEndOfDB for the first failing record fetch.
      
      This includes a rename of the function ExistsNextRecord, which
      did never check for a next record, but just verified the current
      record set to be valid.
      
      This way we can also drop the bAfterSelection selection, which
      was just needed for the inconsistent bEndOfDB handling.
      
      Change-Id: Ibbd7ae95e5969b51e32f44b442e5dc778655e8a9
      bdb0c4e1
    • Jan-Marek Glogowski's avatar
      MM: move SwPageDesc handling into SwDoc::AppendDoc · e817940a
      Jan-Marek Glogowski yazdı
      If you append a doc, you want to handle styles correctly. So it's
      actually the correct way to handle the styles in AppendDoc.
      
      The nDocNo is used instead of a boolean to speed up finding better
      unique names in the mail merge case.
      
      Change-Id: I4b16e89588164b9e0763759c7d719dfc204b63a1
      e817940a
    • Jan-Marek Glogowski's avatar
      MM: merge cancel and error variable · 435ca34e
      Jan-Marek Glogowski yazdı
      An error always includes the "cancel", while a cancel doesn't have
      to be an error. So merge handling by using an enum.
      
      Change-Id: I154dccbd3063d7ce37ee3cb90b4f193cb1edd466
      435ca34e
    • Jan-Marek Glogowski's avatar
      MM: cleanup of comments and asserts · 5c1433d8
      Jan-Marek Glogowski yazdı
      Also adds a README to explain some of the code flow of MM.
      
      Change-Id: I363fdd73824a8d41f7073b6de2e9c24184005397
      5c1433d8
    • Jan-Marek Glogowski's avatar
      MM: a failing print job is an error · 30bb83c8
      Jan-Marek Glogowski yazdı
      Change-Id: I0476d0084d6f7e70b123dbb25927822053ca4e1a
      30bb83c8
    • Jan-Marek Glogowski's avatar
      MM: don't send email if document generation failed · 09401b49
      Jan-Marek Glogowski yazdı
      Change-Id: I91d13d0694c0586a2dbc159f7ba9d53086b6746c
      09401b49
    • Jan-Marek Glogowski's avatar
      MM: some assertion on MM input · 88761228
      Jan-Marek Glogowski yazdı
      Change-Id: Id29ede49acf86ad6109eab88fbae5d9bbb2d8720
      88761228
    • Jan-Marek Glogowski's avatar
      MM: abort email MM without an email DB column · d9702989
      Jan-Marek Glogowski yazdı
      Change-Id: Ia35a64d08f47af577426749712fa37c3b3b0b6e6
      d9702989
    • Jan-Marek Glogowski's avatar
      MM: move email subject and address into descriptor · e637b674
      Jan-Marek Glogowski yazdı
      Both are not related to the DBManager, but the mail merge job.
      
      While at it, also drop the insane bSubjectIsFilename handling, add
      an independent sPath, rename sAddressFromColumn to a more general
      sDBcolumn, as it's also used for file name lookup in FILE mode, and
      unify the DB column data handling.
      
      Change-Id: I1b583f4a67279a229329ba7cd15fb8d2c215737c
      e637b674
    • Jan-Marek Glogowski's avatar
      MM: cleanup bCreateSingleFile finish · 3e33c891
      Jan-Marek Glogowski yazdı
      Took me a while to realize most of the post-mm finalization code
      actually depends on bCreateSingleFile. This allows us to simplify
      the code structure.
      
      Change-Id: Ifd8a8a882d9902bedd40c8b1d1e4a8507b5877fe
      3e33c891
    • Jan-Marek Glogowski's avatar
      MM: rename and constify variables · ffe0b2c3
      Jan-Marek Glogowski yazdı
      Instead of the huge comparisons (in terms of text space), this
      deconstructs the mail merge type into smaller uppercase variables.
      
      bCancel is renamed to m_bCancel to especially distinguish it from
      the bNoError local variable, as both are supposed to be handled
      together.
      
      Otherall this should improve the readability of the code.
      
      Change-Id: I51ab17f7cd90a9e195d09dfcf37a0d194aa9fbbd
      ffe0b2c3
    • Jan-Marek Glogowski's avatar
      MM: refactor DBManager related duplicated code · c103bded
      Jan-Marek Glogowski yazdı
      Moves the duplicated code for saving documents, configuring the
      printer and DB cursor forwarding (next record) into static local
      functions.
      
      Change-Id: I75f183a2a515ecbae276461613a05ab50c56e600
      c103bded
    • Jan-Marek Glogowski's avatar
      tdf#93236 Revert "support fast MM printing in... · dea0abc5
      Jan-Marek Glogowski yazdı
      non-single-file mode only for CUPS"
      
      This reverts commit 138d29aa.
      
      The patch breaks all print opions affecting multiple pages, i.e.
      page range selection, pages per sheet, blank pages, reverse page
      order and copies.
      
      Conflicts:
      	configure.ac
      	sw/source/uibase/dbui/dbmgr.cxx
      	vcl/inc/cupsmgr.hxx
      	vcl/unx/generic/printer/cupsmgr.cxx
      
      Change-Id: I8c39e7f0e71ef9688254c0a0dba049e1836b733c
      dea0abc5
    • Jan-Marek Glogowski's avatar
      Revert "tdf93236 N-UP printing in combination 1/4" · 4ba9bf6a
      Jan-Marek Glogowski yazdı
      Whole subject was: "tdf93236 N-UP printing in with mailmerge broken
      file-print 1/4"
      
      This reverts all dbmgr.cxx changes, which were a result of this
      commit. This patch merges the reverts for the following patches:
      
      * "sw: remove include of sw/source/inc/uibase/dbui.hxx from dbmgr.hxx"
        commit 4b01af28
      * "coverity#1346891 Unused value"
        commit 1876d9a8
      * "tdf93236 N-UP printing in combination with mailmerge broken file-print 1/4"
        commit d8ff9071
      
      Change-Id: Ic51230c484fb9ee5dba2331c51ced1d20a787afa
      4ba9bf6a
    • Miklos Vajna's avatar
      cid#1357166 null pointer dereference · e7fb8dc9
      Miklos Vajna yazdı
      Change-Id: Id1db85f7f52c2b35e069a0252457959b16a2fd02
      e7fb8dc9
    • Miklos Vajna's avatar
      cid#1357167 missing break · 80e3a7a6
      Miklos Vajna yazdı
      Change-Id: I847106a409035b6432c799994008cd2dc7c05de0
      80e3a7a6