diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-12 17:21:24 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-15 16:06:08 +0000 |
| commit | 17ff7b41d15ab9928e2e2706faa26234a09802cd (patch) | |
| tree | 597ca5fd177dfd74990db5b8ce49e21759a612f6 /xmloff/source/draw/ximpshap.cxx | |
| parent | f2d8b05b73f058cd4b9e3e8b5a3e54c5047c2c8a (diff) | |
re-base on ALv2 code. Includes:
Patches contributed by: Armin Le Grand.
#118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task.
http://svn.apache.org/viewvc?view=revision&revision=1195906
#118485# - Styles for OLEs are not saved.
http://svn.apache.org/viewvc?view=revision&revision=1182166
#118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles
http://svn.apache.org/viewvc?view=revision&revision=1293316
#119337# Solves the wrong get/setPropertyValue calls in
SvxShapeText (and thus in SvxOle2Shape)
http://svn.apache.org/viewvc?view=revision&revision=1344156
Patches contributed by Mathias Bauer (and others)
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
cws mba34issues01: #i117717#: remove wrong assertion
http://svn.apache.org/viewvc?view=revision&revision=1172349
Patch contributed by Herbert Duerr
goodbye Registration and License dialogs, don't let the door hit you
http://svn.apache.org/viewvc?view=revision&revision=1172613
help gcc 4.6.0 on 32bit ubuntu 11.10"
http://svn.apache.org/viewvc?view=revision&revision=1245357
Do not add targets for junit tests when junit is disabled.
Patch contributed by Andre Fischer
http://svn.apache.org/viewvc?view=revision&revision=1241508
Revert "sb140: #i117082# avoid unncessary static class data members
commit 21d97438e2944861e26e4984195f959a0cce1e41.
remove obsolete FreeBSD visibility special case.
retain consolidated BSD bridge code, remove OS/2 pieces.
Diffstat (limited to 'xmloff/source/draw/ximpshap.cxx')
| -rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 6ed3cb6aef95..314391038ac8 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -2699,11 +2699,7 @@ void SdXMLObjectShapeContext::EndElement() // #i67705# const sal_uInt16 nGeneratorVersion(GetImport().getGeneratorVersion()); -#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE if(nGeneratorVersion < SvXMLImport::OOo_34x) -#else - if(nGeneratorVersion < SvXMLImport::OOo_Current) -#endif { // #i118485# // If it's an old file from us written before OOo3.4, we need to correct |