[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - shell/source slideshow/source
Herbert Dürr
hdu at apache.org
Tue Feb 4 06:09:10 PST 2014
shell/source/unix/sysshell/recently_used_file_handler.cxx | 2 +-
slideshow/source/engine/animationnodes/basecontainernode.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 89c96a623f4cb113d8b174bd61c3caf2a71dd2a7
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Feb 4 12:38:12 2014 +0000
#i123817# replaced boost::shared_dynamic_cast in slideshow
Boost's shared_dynamic_cast and shared_static_cast were deprecated since
boost 1.35 and removed in boost 1.53, so they have to be replaced
Found-by: Ariel Constenla-Haile <arielch at apache.org>
Suggested-by: Ariel Constenla-Haile <arielch at apache.org>
Reviewed-by: Herbert Duerr <hdu at apache.org>
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index 78a63c2..01bea91 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -154,7 +154,7 @@ void BaseContainerNode::showState() const
for( std::size_t i=0; i<maChildren.size(); ++i )
{
BaseNodeSharedPtr pNode =
- boost::shared_dynamic_cast<BaseNode>(maChildren[i]);
+ boost::dynamic_pointer_cast<BaseNode>(maChildren[i]);
VERBOSE_TRACE(
"Node connection: n0x%X -> n0x%X",
(const char*)this+debugGetCurrentOffset(),
commit 184b8052b07eda16c474657e484f80de7325da50
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Feb 4 12:20:11 2014 +0000
#i123964# mark add_to_recently_used_file_list() as DLLPUBLIC
so its symbol can be used for dynamic loading, e.g. in vcl
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 8c2fc1d..93161ed 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -494,7 +494,7 @@ namespace /* private */ {
</RecentFiles>
*/
-extern "C" void add_to_recently_used_file_list(const rtl::OUString& file_url, const rtl::OUString& mime_type)
+extern "C" void SAL_DLLPUBLIC_EXPORT add_to_recently_used_file_list( const rtl::OUString& file_url, const rtl::OUString& mime_type)
{
try
{
More information about the Libreoffice-commits
mailing list