[Libreoffice-commits] core.git: sw/qa sw/source

[Caolán McNamara]

 sw/qa/cppunit/tox/test_ToxTextGenerator.cxx |    1 +
 sw/source/core/tox/ToxTextGenerator.cxx     |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 68e18231b94f6db7999ff58f9b7edd9ae8164fb7
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Jun 6 09:30:57 2014 +0100

    tweak to get building universally
    
    Change-Id: I5760dc1fccb7ad726663727b9404e014da519755

diff --git a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx 
b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
index 41f4bd0..12dea3d 100644
--- a/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
+++ b/sw/qa/cppunit/tox/test_ToxTextGenerator.cxx
@@ -25,6 +25,7 @@ public:
     void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem();
     void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem();
     void EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet();
+    void EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty();
 
     CPPUNIT_TEST_SUITE(ToxTextGeneratorTest);
     CPPUNIT_TEST(EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems);
diff --git a/sw/source/core/tox/ToxTextGenerator.cxx 
b/sw/source/core/tox/ToxTextGenerator.cxx
index 10a3e2f..1360f6d 100644
--- a/sw/source/core/tox/ToxTextGenerator.cxx
+++ b/sw/source/core/tox/ToxTextGenerator.cxx
@@ -311,7 +311,7 @@ void ToxTextGenerator::GenerateText(SwDoc* pDoc, const 
std::vector<SwTOXSortTabB
 /*static*/ boost::shared_ptr<SfxItemSet>
 ToxTextGenerator::CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& 
pool)
 {
-    boost::shared_ptr<SfxItemSet> retval = 
boost::make_shared<SfxItemSet>(pool);
+    boost::shared_ptr<SfxItemSet> retval(new SfxItemSet(pool));
     if (hint.Which() != RES_TXTATR_AUTOFMT) {
         return retval;
     }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits