diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 11:28:36 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-14 11:28:36 +0100 |
| commit | 3ae6837ccd2d6bca0ddf2e0de15c9f2d7c790316 (patch) | |
| tree | 6367d8dfbf943afb129477191a6256aacda7f3f4 /sw | |
| parent | 08def50728729806b30b1fb5376cdc4f82388520 (diff) | |
#i10000# resolve conflict
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/fields/docufld.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index e3a0a01e285b..e5796a87bba8 100644 --- 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 } } } |