summaryrefslogtreecommitdiffstats
path: root/stoc
diff options
context:
space:
mode:
authorOliver-Rainer Wittmann <orw@apache.org>2014-05-23 14:28:40 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-05-23 21:32:31 +0100
commit05e07167e422caf58d23ff883edda30acc3ba88d (patch)
tree5477d57879b9db24ce272397e66c7a785df3539f /stoc
parentPrefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part20 (diff)
downloadcore-05e07167e422caf58d23ff883edda30acc3ba88d.tar.gz
core-05e07167e422caf58d23ff883edda30acc3ba88d.zip
Resolves: #i124946# only apply new embedded stream name...
for a graphic, if is already has one. - needed correction for the fix made for issue #i114361# (cherry picked from commit 23a4bd91ceb89e5e0a2413f80fc987db106a0bc9) Conflicts: sw/inc/ndgrf.hxx sw/source/core/graphic/ndgrf.cxx sw/source/filter/xml/xmltexte.cxx Change-Id: Ia9771932ae5b380ccae9b0a3cbb79d41f5d9bdb8
Diffstat (limited to 'stoc')
0 files changed, 0 insertions, 0 deletions