diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 22:06:52 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-27 12:55:10 +0000 |
| commit | 0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c (patch) | |
| tree | b371e874cd9909f48bfed8cb1ae1c2d190d51c3b /svx/source/svdraw/svdobj.cxx | |
| parent | b13e1d306e3302b23745b91d291f023f94613f31 (diff) | |
re-base on ALv2 code. Includes:
Patch contributed by Christian Lippka
impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx
http://svn.apache.org/viewvc?view=revision&revision=1167619
Patches contributed by Mathias Bauer
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
cws mba34issues01: #i117712#: fix several resource errors introduced by
IAccessible2 implementation
http://svn.apache.org/viewvc?view=revision&revision=1172343
cws mba34issues01: #i117719#: use correct resource ID
http://svn.apache.org/viewvc?view=revision&revision=1172351
Patch contributed by Andre Fischer
Do not add targets for junit tests when junit is disabled.
http://svn.apache.org/viewvc?view=revision&revision=1241508
Patches contributed by Armin Le-Grand
#118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested
http://svn.apache.org/viewvc?view=revision&revision=1240195
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118485# - Styles for OLEs are not saved.
http://svn.apache.org/viewvc?view=revision&revision=1182166
#118524: apply patch, followup fixes to 118485
http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68
Patch contributed by Regina Henschel
linecap: Reintegrating finished LineCap feature
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patch contributed by Wang Lei (leiw)
#i118760# split the first table cell vertically, then undo&redo,
the Presentation app will crash
http://svn.apache.org/viewvc?view=revision&revision=1301361
cleanup globlmn hacks, undo dependent fixmes.
Diffstat (limited to 'svx/source/svdraw/svdobj.cxx')
| -rw-r--r-- | svx/source/svdraw/svdobj.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 51b908955bbf..0ea722dc6178 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -2689,7 +2689,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, bool bForceLineDash) SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const { - SdrObject* pRet = DoConvertToPolyObj(bBezier /*, true */); // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE + SdrObject* pRet = DoConvertToPolyObj(bBezier, true); if(pRet && bLineToArea) { @@ -2709,8 +2709,7 @@ SdrObject* SdrObject::ConvertToPolyObj(bool bBezier, bool bLineToArea) const //////////////////////////////////////////////////////////////////////////////////////////////////// -// FIXME_REMOVE_WHEN_RE_BASE_COMPLETE comment .. -SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/ /*, bool */ /*bAddText*/) const +SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/, bool /*bAddText*/) const { return NULL; } |