[Libreoffice-commits] core.git: include/comphelper slideshow/source

[Stephan Bergmann]

 include/comphelper/optional.hxx                                |   39 ----------
 slideshow/source/engine/slideshowimpl.cxx                      |    1 
 slideshow/source/engine/transitions/slidetransitionfactory.cxx |    7 -
 3 files changed, 3 insertions(+), 44 deletions(-)

New commits:
commit 5d78d488fd16fc7403c68cb42330e561ea30046c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 1 17:19:49 2016 +0200

    Can use boost::make_optional
    
    ...reportedly available since Boost 1.34, and configure.ac checks for at least
    Boost 1.47.
    
    Change-Id: I07952de220f1eee5f91ad83a1965420eb6b09ada

diff --git a/include/comphelper/optional.hxx b/include/comphelper/optional.hxx
deleted file mode 100644
index 42505e0..0000000
--- a/include/comphelper/optional.hxx
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_COMPHELPER_OPTIONAL_HXX
-#define INCLUDED_COMPHELPER_OPTIONAL_HXX
-
-#include <com/sun/star/beans/Optional.hpp>
-#include <boost/optional.hpp>
-
-namespace comphelper {
-
-/// Object generators for boost::optional<T>, beans::Optional<T>:
-
-template <typename T>
-inline ::boost::optional<T> make_optional( T const& v )
-{
-    return ::boost::optional<T>(v);
-}
-
-} // namespace comphelper
-
-#endif // ! defined(INCLUDED_COMPHELPER_OPTIONAL_HXX)
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index ff27372..7357054 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -30,7 +30,6 @@
 #include <comphelper/anytostring.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
 #include <comphelper/scopeguard.hxx>
-#include <comphelper/optional.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <comphelper/namecontainer.hxx>
 
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 9b6493d..fa95a7e 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -26,7 +26,6 @@
 
 #include <cppcanvas/basegfxfactory.hxx>
 
-#include <comphelper/optional.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
 
 #include <com/sun/star/rendering/XIntegerBitmap.hpp>
@@ -941,7 +940,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
             createPluginTransition(
                 nTransitionType,
                 nTransitionSubType,
-                comphelper::make_optional(pLeavingSlide),
+                boost::make_optional(pLeavingSlide),
                 pEnteringSlide,
                 rViewContainer,
                 rScreenUpdater,
@@ -1037,7 +1036,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
                     case animations::TransitionType::PUSHWIPE:
                     {
                         return createPushWipeTransition(
-                            comphelper::make_optional(pLeavingSlide),
+                            boost::make_optional(pLeavingSlide),
                             pEnteringSlide,
                             rViewContainer,
                             rScreenUpdater,
@@ -1051,7 +1050,7 @@ NumberAnimationSharedPtr TransitionFactory::createSlideTransition(
                     case animations::TransitionType::SLIDEWIPE:
                     {
                         return createSlideWipeTransition(
-                            comphelper::make_optional(pLeavingSlide),
+                            boost::make_optional(pLeavingSlide),
                             pEnteringSlide,
                             rViewContainer,
                             rScreenUpdater,