You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2012/11/16 11:18:34 UTC
svn commit: r1410282 - in /incubator/ooo/trunk/main/sc/source:
filter/excel/xiescher.cxx filter/starcalc/scfobj.cxx ui/drawfunc/fuins2.cxx
ui/unoobj/chartuno.cxx
Author: alg
Date: Fri Nov 16 10:18:33 2012
New Revision: 1410282
URL: http://svn.apache.org/viewvc?rev=1410282&view=rev
Log:
#121334# deactivated setting chart OLE background to transparent for better UI experience and better back-compatibility to other OpenOffice derivates
Modified:
incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx
incubator/ooo/trunk/main/sc/source/filter/starcalc/scfobj.cxx
incubator/ooo/trunk/main/sc/source/ui/drawfunc/fuins2.cxx
incubator/ooo/trunk/main/sc/source/ui/unoobj/chartuno.cxx
Modified: incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx?rev=1410282&r1=1410281&r2=1410282&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/filter/excel/xiescher.cxx Fri Nov 16 10:18:33 2012
@@ -1732,8 +1732,9 @@ SdrObject* XclImpChartObj::DoCreateSdrOb
::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 ) );
Modified: incubator/ooo/trunk/main/sc/source/filter/starcalc/scfobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/filter/starcalc/scfobj.cxx?rev=1410282&r1=1410281&r2=1410282&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/filter/starcalc/scfobj.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/filter/starcalc/scfobj.cxx Fri Nov 16 10:18:33 2012
@@ -87,8 +87,9 @@ void Sc10InsertObject::InsertChart( ScDo
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.
Modified: incubator/ooo/trunk/main/sc/source/ui/drawfunc/fuins2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/drawfunc/fuins2.cxx?rev=1410282&r1=1410281&r2=1410282&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/drawfunc/fuins2.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/ui/drawfunc/fuins2.cxx Fri Nov 16 10:18:33 2012
@@ -666,8 +666,9 @@ FuInsertChart::FuInsertChart(ScTabViewSh
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
Modified: incubator/ooo/trunk/main/sc/source/ui/unoobj/chartuno.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/ui/unoobj/chartuno.cxx?rev=1410282&r1=1410281&r2=1410282&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/ui/unoobj/chartuno.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/ui/unoobj/chartuno.cxx Fri Nov 16 10:18:33 2012
@@ -292,8 +292,9 @@ void SAL_CALL ScChartsObj::addNewByName(
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 ) );