diff options
author | Armin Le Grand <alg@apache.org> | 2012-11-16 09:18:33 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2012-11-16 09:18:33 +0000 |
commit | 5fa621198a981ea994d9903298e8a1d884ee686b (patch) | |
tree | 9eb25ad776e413f1c757976345b8556e8e93db24 | |
parent | c3c4df7647d8d4ab1425bb3c7f38932c4adcbe74 (diff) |
#121334# deactivated setting chart OLE background to transparent for better UI experience and better back-compatibility to other OpenOffice derivates
Notes
Notes:
merged as: 7c486ba2574486f886612b8c4c130c55acd7d93e
-rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 5 | ||||
-rw-r--r-- | sc/source/filter/starcalc/scfobj.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/fuins2.cxx | 5 | ||||
-rw-r--r-- | sc/source/ui/unoobj/chartuno.cxx | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index a60993d7319a..617b1a2c0fed 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1732,8 +1732,9 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R ::com::sun::star::awt::Size aAwtSize( aSize.Width(), aSize.Height() ); xEmbObj->setVisualAreaSize( nAspect, aAwtSize ); - // #121334# - ChartHelper::AdaptDefaultsForChart( xEmbObj ); + // #121334# This call will change the chart's default background fill from white to transparent. + // Add here again if this is wanted (see task description for details) + // ChartHelper::AdaptDefaultsForChart( xEmbObj ); // create the container OLE object xSdrObj.reset( new SdrOle2Obj( svt::EmbeddedObjectRef( xEmbObj, nAspect ), aEmbObjName, rAnchorRect ) ); diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 97f5e456da1d..c9797060daa3 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.cxx @@ -87,8 +87,9 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect aSz.Height = rRect.GetSize().Height(); xObj->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, aSz ); - // #121334# - ChartHelper::AdaptDefaultsForChart( xObj ); + // #121334# This call will change the chart's default background fill from white to transparent. + // Add here again if this is wanted (see task description for details) + // ChartHelper::AdaptDefaultsForChart( xObj ); // hier kann das Chart noch nicht mit Daten gefuettert werden, // weil die Formeln noch nicht berechnet sind. diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f2bfe807ade2..5ebd98e35fc0 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -666,8 +666,9 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* SdrOle2Obj* pObj = new SdrOle2Obj( svt::EmbeddedObjectRef( xObj, nAspect ), aName, aRect); SdrPageView* pPV = pView->GetSdrPageView(); - // #121334# - ChartHelper::AdaptDefaultsForChart( xObj ); + // #121334# This call will change the chart's default background fill from white to transparent. + // Add here again if this is wanted (see task description for details) + // ChartHelper::AdaptDefaultsForChart( xObj ); // pView->InsertObjectAtView(pObj, *pPV);//this call leads to an immidiate redraw and asks the chart for a visual representation diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 6f896ac8b717..a8d9bb952888 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -292,8 +292,9 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, if( xObj.is()) xObj->setVisualAreaSize( nAspect, aSz ); - // #121334# - ChartHelper::AdaptDefaultsForChart( xObj ); + // #121334# This call will change the chart's default background fill from white to transparent. + // Add here again if this is wanted (see task description for details) + // ChartHelper::AdaptDefaultsForChart( xObj ); pPage->InsertObject( pObj ); pModel->AddUndo( new SdrUndoNewObj( *pObj ) ); |