[Libreoffice-commits] .: 2 commits - sal/qa

[Libreoffice Gerrit user]

 sal/qa/rtl/strings/test_ostring_stringliterals.cxx  |    2 --
 sal/qa/rtl/strings/test_oustring_stringliterals.cxx |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 214bfee28551ca6aaa9e70f2b2838faf536f06d9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Dec 1 09:00:12 2012 +0100

    unused variables
    
    Change-Id: Ia8b2ac25d3949508b132d1b0b05e5384633d935f

diff --git a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
index 877c45e..8a78b89 100644
--- a/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_ostring_stringliterals.cxx
@@ -165,7 +165,6 @@ void test::ostring::StringLiterals::checkUsage()
     rtl::OString FooBaRfoo( "FooBaRfoo" );
     rtl::OString FooBaR( "FooBaR" );
     rtl::OString bar( "bar" );
-    rtl::OString test( "test" );
 
     rtl_string_unittest_const_literal = false; // start checking for OString conversions
     rtl_string_unittest_non_const_literal_function = false; // and check for non-const variants
@@ -232,7 +231,6 @@ void test::ostring::StringLiterals::checkNonConstUsage()
     rtl::OString FooBaRfoo( "FooBaRfoo" );
     rtl::OString FooBaR( "FooBaR" );
     rtl::OString bar( "bar" );
-    rtl::OString test( "test" );
     char foo_c[] = "foo";
     char bar_c[] = "bar";
     char fOo_c[] = "fOo";
commit 0222bdb752fef6363c5118efdf30b59817f4445e
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sat Dec 1 08:58:08 2012 +0100

    but back a unittest check about invalid char[] -> OUString(Buffer) conversion
    
    It's invalid, so the additional ambiguity here doesn't matter, but I'd
    still prefer to check that it remains invalid.
    
    Change-Id: Ie05d393ad7f51738383bb98b911938506abd64fc

diff --git a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
index 09b55c6..8d82543 100644
--- a/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
+++ b/sal/qa/rtl/strings/test_oustring_stringliterals.cxx
@@ -181,6 +181,8 @@ void test::oustring::StringLiterals::checkBuffer()
     buf.insert( 3, "baz" );
     CPPUNIT_ASSERT_EQUAL( rtl::OUString( "foobazbar" ), buf.toString());
     char d[] = "d";
+    CPPUNIT_ASSERT( !VALID_CONVERSION( buf.append( rtl::OUString( d ))));
+    CPPUNIT_ASSERT( !VALID_CONVERSION( buf.append( rtl::OUStringBuffer( d ))));
     CPPUNIT_ASSERT( !VALID_CONVERSION( buf.insert( 0, d )));
 }