#i10000# resolve conflict

2009-12-14 11:28:36 +01:00 · 2009-12-14 11:28:36 +01:00 · 3ae6837ccd
commit 3ae6837ccd
parent 08def50728
1 changed files with 0 additions and 6 deletions
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@ -1153,11 +1153,6 @@ String SwDocInfoField::Expand() const
                    ::rtl::OUString sVal;
                    uno::Reference < script::XTypeConverter > xConverter( comphelper::getProcessServiceFactory()
                        ->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")), uno::UNO_QUERY );
-<<<<<<< local
-                    uno::Any aNew = xConverter->convertToSimpleType( aAny, uno::TypeClass_STRING );
-                    aNew >>= sVal;
-                    const_cast<SwDocInfoField*>(this)->aContent = sVal;
-=======
                    util::Date aDate;
                    util::DateTime aDateTime;
                    util::Duration aDuration;
@ -1193,7 +1188,6 @@ String SwDocInfoField::Expand() const
                        aNew >>= sVal;
                    }
                    ((SwDocInfoField*)this)->aContent = sVal;
->>>>>>> other
                }
            }
        }