diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-08 09:02:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-07 22:01:02 +0100 |
| commit | 6311f7ffce8f64b0773d2ad3ea7be3be683924c0 (patch) | |
| tree | 67a59c93ca968838e86b63da214c75e98f8d0626 /editeng | |
| parent | 128bec2c4bf57c2d82ce61319cbd1778bcabfeb1 (diff) | |
move SvTreeListBox to vcl
Change-Id: I04a146d3d8a428ac1678827dc883525c40240a44
Reviewed-on: https://gerrit.libreoffice.org/62787
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.cxx | 2 | ||||
| -rw-r--r-- | editeng/source/rtf/svxrtf.cxx | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index 053b485cc46f..0f91a4fa24eb 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp> #include <editeng/flditem.hxx> #include <svl/intitem.hxx> -#include <svtools/transfer.hxx> +#include <vcl/transfer.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx index 53fa36f92698..6f8299e0716e 100644 --- a/editeng/source/rtf/svxrtf.cxx +++ b/editeng/source/rtf/svxrtf.cxx @@ -352,10 +352,7 @@ void SvxRTFParser::ReadStyleTable() case RTF_CHRFMT: case RTF_BRDRDEF: case RTF_TABSTOPDEF: -#ifndef NDEBUG - auto nEnteringToken = nToken; -#endif - auto nEnteringIndex = m_nTokenIndex; + if( RTF_SWGDEFS & nToken) { if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId ) @@ -367,17 +364,6 @@ void SvxRTFParser::ReadStyleTable() } } ReadAttr( nToken, &pStyle->aAttrSet ); - if (m_nTokenIndex == nEnteringIndex - 1) - { - // we called SkipToken to go back one, but - // ReadAttrs read nothing, so on next loop - // of outer while we would end up in the - // same state again (assert that) - assert(nEnteringToken == GetNextToken()); - // and loop endlessly, skip format a token - // instead to avoid that - SkipToken(1); - } break; } break; |