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

[Stephan Bergmann]

 chart2/source/tools/CharacterProperties.cxx |   31 ++++++++++------------------
 include/comphelper/InlineContainer.hxx      |   23 --------------------
 2 files changed, 12 insertions(+), 42 deletions(-)

New commits:
commit b477a9e0b620a5e1c709e404c5a4e816ef5794f1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Apr 22 21:58:20 2016 +0200

    Kill comphelper::MakeVector
    
    Change-Id: I6525f9189b25f007d3ffd190b37c73552a900de2
    Reviewed-on: https://gerrit.libreoffice.org/24341
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index c908870..fe3d287 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -39,9 +39,6 @@
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
-#include <comphelper/InlineContainer.hxx>
-#include <comphelper/sequence.hxx>
-
 #include <unotools/lingucfg.hxx>
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
@@ -476,22 +473,18 @@ awt::FontDescriptor CharacterProperties::createFontDescriptorFromPropertySet(
 {
     awt::FontDescriptor aResult;
     // Note: keep this sorted!
-    ::comphelper::MakeVector< OUString > aPropNames
-        ( "CharFontCharSet");                // CharSet
-    aPropNames
-        ( "CharFontFamily")                  // Family
-        ( "CharFontName")                    // Name
-        ( "CharFontPitch")                   // Pitch
-        ( "CharFontStyleName")               // StyleName
-        ( "CharHeight")                      // Height
-        ( "CharPosture")                     // Slant
-        ( "CharStrikeout")                   // Strikeout
-        ( "CharUnderline")                   // Underline
-        ( "CharWeight")                      // Weight
-        ( "CharWordMode")                    // WordLineMode
-        ;
-
-    uno::Sequence< OUString > aPropNameSeq( comphelper::containerToSequence( aPropNames ));
+    uno::Sequence< OUString > aPropNameSeq{
+        "CharFontCharSet",   // CharSet
+        "CharFontFamily",    // Family
+        "CharFontName",      // Name
+        "CharFontPitch",     // Pitch
+        "CharFontStyleName", // StyleName
+        "CharHeight",        // Height
+        "CharPosture",       // Slant
+        "CharStrikeout",     // Strikeout
+        "CharUnderline",     // Underline
+        "CharWeight",        // Weight
+        "CharWordMode"};     // WordLineMode
     uno::Sequence< uno::Any > aValues( xMultiPropSet->getPropertyValues( aPropNameSeq ));
 
     sal_Int32 i=0;
diff --git a/include/comphelper/InlineContainer.hxx b/include/comphelper/InlineContainer.hxx
index 023bc43..384203a 100644
--- a/include/comphelper/InlineContainer.hxx
+++ b/include/comphelper/InlineContainer.hxx
@@ -21,7 +21,6 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <vector>
 #include <map>
 #include <set>
 
@@ -54,28 +53,6 @@ public:
 };
 
 
-/** Creates a vector which contains an arbitrary number of elements.
-
-    usage:
-
-    vector< t > aVec( MakeVector< t >( t_1 )( t_2 )...( t_n ) );
- */
-template < typename T >
-class MakeVector : public ::std::vector< T >
-{
-public:
-    explicit MakeVector(const T &a)
-        : ::std::vector< T >(1, a)
-    {
-    }
-    MakeVector &operator()(const T &a)
-    {
-        this->push_back(a);
-        return *this;
-    }
-};
-
-
 /** Creates a set which contains an arbitrary number of elements.
 
     usage: