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/svdograf.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/svdograf.cxx')
| -rw-r--r-- | svx/source/svdraw/svdograf.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index f3d0f22a7403..5fd1aa33a729 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1091,9 +1091,8 @@ GDIMetaFile SdrGrafObj::getMetafileFromEmbeddedSvg() const return aRetval; } -SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier /*, bool bAddText */ ) const +SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText ) const { - bool bAddText = true; // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE SdrObject* pRetval = NULL; GraphicType aGraphicType(GetGraphicType()); GDIMetaFile aMtf; @@ -1158,8 +1157,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier /*, bool bAddText */ if( pRetval ) { SdrObject* pHalfDone = pRetval; - pRetval = pHalfDone->DoConvertToPolyObj(bBezier - /*, bAddText */ ); // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE + pRetval = pHalfDone->DoConvertToPolyObj(bBezier, bAddText); SdrObject::Free( pHalfDone ); // resulting object is newly created if( pRetval ) @@ -1180,8 +1178,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier /*, bool bAddText */ } // #i118485# convert line and fill - // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE - SdrObject* pLineFill = SdrRectObj::DoConvertToPolyObj(bBezier /*, false */); + SdrObject* pLineFill = SdrRectObj::DoConvertToPolyObj(bBezier, false); if(pLineFill) { @@ -1211,7 +1208,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier /*, bool bAddText */ case GRAPHIC_BITMAP: { // create basic object and add fill - pRetval = SdrRectObj::DoConvertToPolyObj(bBezier /*, bAddText */); // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE + pRetval = SdrRectObj::DoConvertToPolyObj(bBezier, bAddText); // save bitmap as an attribute if(pRetval) @@ -1232,7 +1229,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier /*, bool bAddText */ case GRAPHIC_NONE: case GRAPHIC_DEFAULT: { - pRetval = SdrRectObj::DoConvertToPolyObj(bBezier /*, bAddText */); // FIXME_REMOVE_WHEN_RE_BASE_COMPLETE + pRetval = SdrRectObj::DoConvertToPolyObj(bBezier, bAddText); break; } } |