Repository.mk | 2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4e678058267bb0749cc427b22d4583af72d86217
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Oct 3 18:52:22 2014 +0300
Try putting vcldemo in instdir/program
Chris Sherlock says that should make it possible to get it to actually
run. (Didn't work for me, though.)
Change-Id: I69a7badaf1f19481546866cfa2a417029c305105
diff --git a/Repository.mk b/Repository.mk
index 29dbf6e..16189e4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
svdemo \
svptest \
svpclient \
- vcldemo \
pixelctl ) \
))
@@ -100,6 +99,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \
) \
uri-encode \
ui-previewer \
+ vcldemo \
tiledrendering \
$(if $(and $(ENABLE_GTK), $(filter LINUX,$(OS))), gtktiledviewer) \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
commit ff978f9728e808290e5ae87ef2e4549a8e6cb68b
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Oct 3 15:58:59 2014 +0300
WaE: implicit conversion of NULL constant to 'boost::detail::sp_nullptr_t'
Change-Id: Id0f3345613ae3b9c19cc5f5845140fa1c067bee0
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index eb08875..bec1542 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1654,11 +1654,11 @@ void DomainMapper_Impl::CheckRedline( uno::Reference<
text::XTextRange > const&
// (and so if that happens, it may be better to fix Writer).
// Create the redlines here from lowest (formats) to highest
(inserts/removals) priority, since the last one is
// what Writer presents graphically, so this will show deletes as deleted
text and not as just formatted text being there.
- if( GetTopContextOfType(CONTEXT_PARAGRAPH) != NULL )
+ if( GetTopContextOfType(CONTEXT_PARAGRAPH) )
for( std::vector<RedlineParamsPtr>::const_iterator it =
GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines().begin();
it != GetTopContextOfType(CONTEXT_PARAGRAPH)->Redlines().end();
++it )
CreateRedline( xRange, *it );
- if( GetTopContextOfType(CONTEXT_CHARACTER) != NULL )
+ if( GetTopContextOfType(CONTEXT_CHARACTER) )
for( std::vector<RedlineParamsPtr>::const_iterator it =
GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().begin();
it != GetTopContextOfType(CONTEXT_CHARACTER)->Redlines().end();
++it )
CreateRedline( xRange, *it );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
