[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source slideshow/source solenv/bin sw/source writerfilter/source
Andre Fischer
af at apache.org
Tue Jan 21 08:08:27 PST 2014
sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 2 +-
slideshow/source/engine/animatedsprite.cxx | 2 +-
slideshow/source/engine/shapes/viewshape.cxx | 2 +-
slideshow/source/engine/shapesubset.cxx | 2 +-
slideshow/source/engine/slide/slideanimations.cxx | 2 +-
slideshow/source/inc/shapeattributelayer.hxx | 2 +-
slideshow/source/inc/shapeattributelayerholder.hxx | 2 +-
solenv/bin/patch_tool.pl | 9 ++++++++-
sw/source/core/inc/bookmrk.hxx | 2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx | 2 +-
10 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit 821f66510a7851e6e6835e0f6c86dc443482caf0
Author: Andre Fischer <af at apache.org>
Date: Tue Jan 21 14:21:45 2014 +0000
123531: Changed name of MSP to contain product name and source and target version.
diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index f7cc82d..7f2d4de 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -1549,7 +1549,14 @@ sub CreatePcp ($$$$$$%)
# Create filenames.
my $pcp_filename = File::Spec->catfile($msp_path, "openoffice.pcp");
- my $msp_filename = File::Spec->catfile($msp_path, "openoffice.msp");
+ # Create basename to include product name and source and target version.
+ # Hard code platform because that is the only platform supported at the moment.
+ my $msp_basename = sprintf("%s_%s-%s_Win_x86_patch_%s.msp",
+ $context->{'product-name'},
+ $source_msi->{'version'},
+ $target_msi->{'version'},
+ $context->{'language'});
+ my $msp_filename = File::Spec->catfile($msp_path, $msp_basename);
# Setup msp path and filename.
unlink($pcp_filename) if -f $pcp_filename;
commit 1ceda390389a3e7bf4b7bb72b533a355a0fa060d
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Jan 21 14:09:37 2014 +0000
#i123817# boost::shared_ptr doesn't have an implicit conversion to bool
Constructs that expect it fail at least in XCode4's clang in C++11 mode.
An implicit conversion from pointer to bool is already suspicious enough
and a shared_ptr->pointer->bool conversion is even worse. Cleaning up
the code fixes the build breaker seen in boost/libc++/clang environments.
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index ff088bf..003e3b6 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -469,7 +469,7 @@ void ButtonBar::Paint (
bool ButtonBar::IsMouseOverButton (void) const
{
- return mpButtonUnderMouse;
+ return (mpButtonUnderMouse.get() != NULL);
}
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 22b2cc1..0b6e612 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -157,7 +157,7 @@ namespace slideshow
}
}
- return mpSprite;
+ return (mpSprite.get() != NULL);
}
void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index 46f0f2e..0265acb 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -184,7 +184,7 @@ namespace slideshow
}
}
- return io_rCacheEntry.mpRenderer;
+ return (io_rCacheEntry.mpRenderer.get() != NULL);
}
bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 77e76a4..f6783a8 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -110,7 +110,7 @@ namespace slideshow
maTreeNode );
}
- return mpSubsetShape;
+ return (mpSubsetShape.get() != NULL);
}
void ShapeSubset::disableSubsetShape()
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index 55db7e5..16e16a0 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -80,7 +80,7 @@ namespace slideshow
SHOW_NODE_TREE( mpRootNode );
- return mpRootNode;
+ return (mpRootNode.get() != NULL);
}
bool SlideAnimations::isAnimated() const
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
index ede31f9..a41ab35 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -471,7 +471,7 @@ namespace slideshow
// ShapeAttributeLayer(const ShapeAttributeLayer&);
// ShapeAttributeLayer& operator=( const ShapeAttributeLayer& );
- bool haveChild() const { return mpChild; }
+ bool haveChild() const { return (mpChild.get() != NULL); }
void updateStateIds();
template< typename T > T calcValue( const T& rCurrValue,
diff --git a/slideshow/source/inc/shapeattributelayerholder.hxx b/slideshow/source/inc/shapeattributelayerholder.hxx
index ae63f0a..5395621 100644
--- a/slideshow/source/inc/shapeattributelayerholder.hxx
+++ b/slideshow/source/inc/shapeattributelayerholder.hxx
@@ -87,7 +87,7 @@ namespace slideshow
if( mpShape )
mpAttributeLayer = mpShape->createAttributeLayer();
- return mpAttributeLayer;
+ return (mpAttributeLayer.get() != NULL);
}
ShapeAttributeLayerSharedPtr get() const
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 0816408..7c52909 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -76,7 +76,7 @@ namespace sw { namespace mark
return GetOtherMarkPos( );
}
virtual bool IsExpanded() const
- { return m_pPos2; }
+ { return (m_pPos2.get() != NULL); }
//setters
virtual void SetName(const ::rtl::OUString& rName)
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index c92855f..960b116 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -167,7 +167,7 @@ PropertyMapPtr TableStyleSheetEntry::GetProperties( sal_Int32 nMask, StyleSheetE
pStack->push_back(pEntry);
TableStyleSheetEntry* pParent = static_cast<TableStyleSheetEntry *>( pEntry.get( ) );
- pProps->insert( pParent->GetProperties( nMask ), pStack );
+ pProps->insert( pParent->GetProperties( nMask ), (pStack.get() != NULL) );
pStack->pop_back();
}
More information about the Libreoffice-commits
mailing list