svx/source/svdraw/svdotext.cxx | 2 +- svx/source/unodraw/unoshap2.cxx | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 5e02310180605c7dfc1539eeb0b95d691b1557be Author: matteocam <matteo.campane...@gmail.com> Date: Wed Jul 29 09:06:41 2015 +0200 Add chaining constant in unoshap Change-Id: I4a7d69636df9d5b80420da8fa5bd9bea8cf1d3f0 diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index f01fe9e..5ceff5f 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -670,6 +670,7 @@ SvxShapeControlPropertyMapping[] = { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_CHAR_COLOR), RTL_CONSTASCII_STRINGPARAM("TextColor") }, { RTL_CONSTASCII_STRINGPARAM("CharBackColor"), RTL_CONSTASCII_STRINGPARAM("CharBackColor") }, { RTL_CONSTASCII_STRINGPARAM("CharBackTransparent"), RTL_CONSTASCII_STRINGPARAM("CharBackTransparent") }, + { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_TEXT_CHAINNEXTNAME), RTL_CONSTASCII_STRINGPARAM(UNO_NAME_TEXT_CHAINNEXTNAME) }, { RTL_CONSTASCII_STRINGPARAM("CharRelief"), RTL_CONSTASCII_STRINGPARAM("FontRelief") }, { RTL_CONSTASCII_STRINGPARAM("CharUnderlineColor"), RTL_CONSTASCII_STRINGPARAM("TextLineColor") }, { RTL_CONSTASCII_STRINGPARAM(UNO_NAME_EDIT_PARA_ADJUST), RTL_CONSTASCII_STRINGPARAM("Align") }, commit b240c7016c0a305c06918ff8e629226806f3f7ba Author: matteocam <matteo.campane...@gmail.com> Date: Wed Jul 29 08:48:54 2015 +0200 Fixed operator Change-Id: Ib82ad17855654dafc92bdf423691f3e76b54b387 diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index de5859e..66b8a7a 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -1989,7 +1989,7 @@ bool SdrTextObj::IsChainable() const // Read it as item const SfxItemSet& rSet = GetObjectItemSet(); OUString aNextName = static_cast<const SfxStringItem&>(rSet.Get(SDRATTR_TEXT_CHAINNEXTNAME)).GetValue(); - return aNextName == ""; + return aNextName != ""; // XXX if (!GetName().startsWith("Chainable")) { _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits