[Libreoffice-commits] core.git: ucb/source

Stephan Bergmann sbergman at redhat.com
Sun Mar 24 14:31:51 PDT 2013


 ucb/source/ucp/gio/gio_content.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c17eaa63273a7544ea812990d7e0e5644385a220
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Mar 24 22:30:48 2013 +0100

    Does not compile
    
    Change-Id: If7d24a6378a6645baf9d0c40e3c3cf0ae7d4f317

diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 68e693c..4b7c304 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -645,12 +645,12 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
 #if OSL_DEBUG_LEVEL > 1
         g_warning("Set prop '%s'", rtl::OUStringToOString(rValue.Name, RTL_TEXTENCODING_UTF8).getStr());
 #endif
-        if ( rValue.Name == "ContentType" ) ||
-             rValue.Name == "MediaType" ) ||
-             rValue.Name == "IsDocument" ) ||
-             rValue.Name == "IsFolder" ) ||
-             rValue.Name == "Size" ) ||
-             rValue.Name == "CreatableContentsInfo" ) )
+        if ( rValue.Name == "ContentType" ||
+             rValue.Name == "MediaType" ||
+             rValue.Name == "IsDocument" ||
+             rValue.Name == "IsFolder" ||
+             rValue.Name == "Size" ||
+             rValue.Name == "CreatableContentsInfo" )
         {
             aRet[ n ] <<= getReadOnlyException( static_cast< cppu::OWeakObject * >(this) );
         }
@@ -931,7 +931,7 @@ uno::Any SAL_CALL Content::execute(
             ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
         aRet <<= setPropertyValues( aProperties, xEnv );
     }
-    else if (aCommand.Name.equals == "createNewContent" )
+    else if (aCommand.Name == "createNewContent"
              && isFolder( xEnv ) )
     {
         ucb::ContentInfo arg;


More information about the Libreoffice-commits mailing list