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

[Matúš Kukan]

 sw/source/core/inc/DocumentTimerManager.hxx       |    2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7321a659713aeb08cd3d2db13e0bfa17dc3da6aa
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Jul 15 19:55:37 2014 +0200

    -Werror,-Wheader-guard
    
    Change-Id: I6b13c77975d8aeef63b424e418a4a4a98ced159f

diff --git a/sw/source/core/inc/DocumentTimerManager.hxx b/sw/source/core/inc/DocumentTimerManager.hxx
index 6bd7fcd..5becf1b 100644
--- a/sw/source/core/inc/DocumentTimerManager.hxx
+++ b/sw/source/core/inc/DocumentTimerManager.hxx
@@ -18,7 +18,7 @@
  */
 
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTTIMERMANAGER_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTTIMERMANAGER_HX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCUMENTTIMERMANAGER_HXX
 
 #include <IDocumentTimerAccess.hxx>
 #include <boost/utility.hpp>
commit 6e6cbf44d80ffff6457512c142c64cf857eacfaa
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Jul 15 19:52:43 2014 +0200

    WaE: unused variable 'sMarker'
    
    Change-Id: Idba194e9bafa17dcedd5d1d45c5e0b4e3db54cee

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 6645e23..9983b99 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1123,7 +1123,7 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr pPropertyMap )
                         if (xCursor.is())
                             xCursor->gotoEnd(false);
                         PropertyMapPtr pEmpty(new PropertyMap());
-                        appendTextPortion("X", pEmpty);
+                        appendTextPortion(sMarker, pEmpty);
                     }
 
                     xTextRange = xTextAppend->finishParagraph( aProperties );