solenv/gdb/boost/ptr_container.py | 8 ++++---- solenv/gdb/boost/unordered.py | 4 ++-- sw/inc/poolfmt.hxx | 5 +---- sw/source/core/doc/DocumentStylePoolManager.cxx | 8 ++++++++ sw/source/core/undo/unattr.cxx | 5 ++++- 5 files changed, 19 insertions(+), 11 deletions(-)
New commits: commit 37e936996acb4a8329fad2ec73a35f66be446e90 Author: Michael Stahl <[email protected]> Date: Wed Jul 29 23:59:43 2015 +0200 tdf#83223: sw: fix Undo of format change of conditional para style SwUndoFormatAttr was simply missing a case for RES_CONDTXTFMTCOLL. Handle it the same way as an oridnary paragraph style, which seems to work for me. Change-Id: Ib529beb1116633e4890d5b51df39da21de485db9 diff --git a/sw/source/core/undo/unattr.cxx b/sw/source/core/undo/unattr.cxx index 2ba9bb34..80d068c 100644 --- a/sw/source/core/undo/unattr.cxx +++ b/sw/source/core/undo/unattr.cxx @@ -204,6 +204,7 @@ bool SwUndoFormatAttr::IsFormatInDoc( SwDoc* pDoc ) switch ( m_nFormatWhich ) { case RES_TXTFMTCOLL: + case RES_CONDTXTFMTCOLL: bFound = pDoc->GetTextFormatColls()->Contains( m_pFormat ); break; @@ -301,7 +302,9 @@ void SwUndoFormatAttr::RepeatImpl(::sw::RepeatContext & rContext) } break; - case RES_TXTFMTCOLL: { + case RES_TXTFMTCOLL: + case RES_CONDTXTFMTCOLL: + { SwTextNode *const pNd = rContext.GetRepeatPaM().GetNode().GetTextNode(); if( pNd ) { commit fc805abce250f68e1d9848b1c127fa673f646715 Author: Michael Stahl <[email protected]> Date: Wed Jul 29 23:32:33 2015 +0200 sw: un-inline IsConditionalByPoolId why rebuild half of sw to add a comment? Change-Id: I72796a704aadc820004f519ed43cb54ba18f918a diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index b80e0ed..2bc91f4 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -401,10 +401,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId ); SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage); -inline bool IsConditionalByPoolId(sal_uInt16 nId) - { - return RES_POOLCOLL_TEXT == nId; - } +bool IsConditionalByPoolId(sal_uInt16 nId); #endif diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx index e8d4b64..d06574e 100644 --- a/sw/source/core/doc/DocumentStylePoolManager.cxx +++ b/sw/source/core/doc/DocumentStylePoolManager.cxx @@ -67,6 +67,14 @@ using namespace ::editeng; using namespace ::com::sun::star; +bool IsConditionalByPoolId(sal_uInt16 nId) +{ + // TODO: why is this style conditional? + // If it is changed to no longer be conditional, then a style "Text Body" + // will be imported without its conditions from ODF. + return RES_POOLCOLL_TEXT == nId; +} + namespace { static const sal_uInt16 PT_3 = 3 * 20; // 3 pt commit 396643d46a778539f2bde30569d35ec05d7d867b Author: Michael Stahl <[email protected]> Date: Wed Jul 29 22:46:26 2015 +0200 gdb pretty printers for boost can't iterate with Python 3 Change-Id: Ie2d1cb7312de6f14a5c6de81eefd7a00be6f75c0 diff --git a/solenv/gdb/boost/ptr_container.py b/solenv/gdb/boost/ptr_container.py index 38f3b2f..425d812 100644 --- a/solenv/gdb/boost/ptr_container.py +++ b/solenv/gdb/boost/ptr_container.py @@ -70,7 +70,7 @@ class PtrStdPrinterBase(object): return self def __next__(self): - (index, value) = self.impl.next() + (index, value) = six.advance_iterator(self.impl) return (index, value.cast(self.type).dereference()) def _import_std(self): @@ -137,7 +137,7 @@ class PtrMapPrinter(PtrStdPrinterBase): return self def __next__(self): - (index, value) = self.impl.next() + (index, value) = six.advance_iterator(self.impl) if self.key: value = value.cast(self.key_type) else: @@ -190,7 +190,7 @@ class PtrUnorderedMapPrinter(PtrBoostPrinterBase): def __next__(self): if self.step: - self.value = self.impl.next() + self.value = six.advance_iterator(self.impl) value = self.value[0] else: value = self.value[1].cast(self.value_type).dereference() @@ -216,7 +216,7 @@ class PtrUnorderedSetPrinter(PtrBoostPrinterBase): return self def __next__(self): - return ("", self.impl.next()[1].cast(self.value_type).dereference()) + return ("", six.advance_iterator(self.impl)[1].cast(self.value_type).dereference()) printer = None diff --git a/solenv/gdb/boost/unordered.py b/solenv/gdb/boost/unordered.py index c21d31a..2c56721 100644 --- a/solenv/gdb/boost/unordered.py +++ b/solenv/gdb/boost/unordered.py @@ -63,7 +63,7 @@ class UnorderedMapPrinter(PrinterBase): def __next__(self): if self.step: - self.value = self.impl.next() + self.value = six.advance_iterator(self.impl) value = self.value[0] else: value = self.value[1] @@ -87,7 +87,7 @@ class UnorderedSetPrinter(PrinterBase): return self def __next__(self): - return ("", self.impl.next()[1]) + return ("", six.advance_iterator(self.impl)[1]) printer = None _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
