diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-07-03 16:10:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-04 16:45:02 +0000 |
| commit | dc17dad5fd7509f191718df8690e5847ab87669a (patch) | |
| tree | 427c7467fe367ae48a126ae7677e33db09b9accc /svl | |
| parent | 3372b1e0b36f3f7e89e88bb7495efad78fdd3417 (diff) | |
fdo#78908 Revert "Merge back branch alg_writerframes to trunk"
This reverts commit 6e61ecd09679a66060f932835622821d39e92f01. Better not
to have this on libreoffice-4-3 without
7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step
of DrawingLayer FillAttributes..., 2014-06-02).
Conflicts:
cui/source/inc/backgrnd.hxx
cui/source/inc/cuitabarea.hxx
cui/source/tabpages/backgrnd.cxx
cui/source/tabpages/tparea.cxx
include/basegfx/numeric/ftools.hxx
include/svx/svxids.hrc
include/svx/unoshprp.hxx
sc/source/ui/drawfunc/drawsh.cxx
sd/source/ui/func/fuarea.cxx
sfx2/source/dialog/tabdlg.cxx
sw/inc/fillattributes.hxx
sw/inc/format.hxx
sw/inc/frmatr.hxx
sw/inc/swatrset.hxx
sw/inc/unobrushitemhelper.hxx
sw/qa/extras/rtfexport/rtfexport.cxx
sw/source/core/attr/format.cxx
sw/source/core/attr/swatrset.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/notxtfrm.cxx
sw/source/core/inc/frame.hxx
sw/source/core/inc/frmtool.hxx
sw/source/core/layout/fillattributes.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/txtnode/fntcache.cxx
sw/source/core/uibase/shells/frmsh.cxx
sw/source/core/unocore/unobrushitemhelper.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unostyle.cxx
xmloff/source/text/txtexppr.cxx
xmloff/source/text/txtprhdl.cxx
Also:
Revert "cppcheck: Prefer prefix ++/-- operators for non-primitive types"
This reverts commit 80ec4885e97b3fcb34b93e71ced52a4aab43ce93.
Revert "WaE: implicit conversion of literal of type 'sal_Bool' to 'bool'"
This reverts commit d5d10b03b1f3e4bf784ad35254cb55d719a8c1b3.
Revert "i#124638 support for DrawingLayre FillStyle for GraphicFrames and ..."
This reverts commit 4a0b5e569d070c286daefb0fdfe45c0dd15d241c.
Revert "svx: fix SID_OFFER_IMPORT and SID_ATTR_CHAR_GRABBAG having the same SID"
This reverts commit b66d87086804460c1986df1b832fd6b2ea075a90.
Revert "SwXStyle::getPropertyValue: don't try to read a float into a sal_Int32"
This reverts commit 1e3c7b854baac2502bed72ff8e3e1b21b507735b.
Revert "SwXTextFrame: also restore semi-lost BackColorTransparency property"
This reverts commit 102bb87ca1a5dee3a09442bf503a54bb703c79ea.
Revert "SwXTextFrame: restore semi-lost BackColor property"
This reverts commit 5ce92b73ce06c805c66e53c48aa2c70c722aaf60.
Revert "DocxAttributeOutput: port to FillAttributes"
This reverts commit ec221b7339f8fe5520926ef85b450daa94392780.
Revert "MSWordExportBase::OutputItemSet: handle fill attributes as frame ones"
This reverts commit 84c40768f8acb0342dcfa223133497f57620fc14.
Revert "sw: put getSvx* and setSvx* to a namespace, now that these are public"
This reverts commit ebf960960a69c1edb5da1994c330ddddbecac44d.
Revert "sw: fix DOC/DOCX/RTF export of TextFrame background color"
This reverts commit c7837b8caad61b8c0dfd3704a133cdeaffd69b06.
Revert "sw: still use SvxBrushItem for page style background"
This reverts commit e826950e9d7736a6e3f9042755ba1b528f58a505.
Revert "cui: unused code in SvxAreaTabPage::ClickBitmapHdl_Impl"
This reverts commit 2032e9f5d7683e49b8753d7c7362899c690005b6.
Revert "cui: unused code in SvxAreaTabPage::ClickGradientHdl_Impl"
This reverts commit f4fa202b31277276dc4f05046c82152c0830ef21.
Revert "cui: unused code in SvxAreaTabPage::ClickColorHdl_Impl"
This reverts commit 1478e89e08a54f02a137c74c0cde6ae75e80d9f3.
Revert "cui: unused code in SvxAreaTabPage::ClickHatchingHdl_Impl()"
This reverts commit e9c9f3f793a91525ac4fb74f8791ba74222515e4.
Revert "svx: fix Writer's insert -> frame crash"
This reverts commit 831b8751fc9f423fd4e459623e54801c0a020eb3.
Revert "sw: adapt frame/templatedialog4.ui to FillAttributes"
This reverts commit 55916fc50a5b2d6273bca8c9ef6253011cf4fdbc.
Revert "-Werror,-Wunused-variable"
This reverts commit d0542fe7251d9c6538331b22a4b5e2e294a92e97.
Revert "loplugin:implicitboolconversion,literaltoboolconversion"
This reverts commit 47862e75de51a4ac7476acff773b504fdc0d6e76.
Revert "loplugin:saloverride"
This reverts commit be89e8b8ac19c0feca8850ccaddd90205c63dbe5.
Revert "loplugin:literaltoboolconversion"
This reverts commit 355b31fe347479f63906e41300042ec5cb38837c.
Revert "-Werror,-Wunused-private-field"
This reverts commit df9d13dd2e754184a4c6e321b8910ee1bc0cafa1.
Revert "-Werror,-Wunused-const-variable"
This reverts commit d757a98001a65baf4066c2eda037a08ab1beda46.
Revert "unused XFillStyleItem ctor"
This reverts commit b735fe1d67e6ad7ad448e448f237dcabef1a1c38.
Revert "unused XGradient::VclGradient"
This reverts commit 5bbc90be755aae4b87125f9d748828d74efe645d.
Revert "fix "transparency" of floating tables in docx import (fdo#77723)"
This reverts commit 313b59d787357ef3da34e2833fefcf1143b09b5e.
Change-Id: If855b090f94288d384f8733f88ef1172e68c50a6
Reviewed-on: https://gerrit.libreoffice.org/10077
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/source/undo/undo.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 4b3c13143247..3f4cfe8bdea7 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -581,10 +581,6 @@ bool SfxUndoManager::ImplAddUndoAction_NoNotify( SfxUndoAction *pAction, bool bT { --m_pData->pActUndoArray->nCurUndoAction; } - else - { - OSL_ENSURE(false, "CurrentUndoAction going negative (!)"); - } // fdo#66071 invalidate the current empty mark when removing --m_pData->mnEmptyMark; } |