summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-11-14 11:09:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-06-06 17:24:43 +0100
commit7c486ba2574486f886612b8c4c130c55acd7d93e (patch)
treee0ff8ca0306e71bab1ff59932c26e896a596cd07 /sc/source/filter
parentdb77d9700e1301c7cb47a76721639dd4c7829f31 (diff)
Resolves: #i121334# Changed default for charts background to be none...
(from white) to allow fill settings in the various apps to have an effect (cherry picked from commit 0050a8e4eace17ed1b55c7ec919edaa0daadc3a7) Conflicts: chart2/source/model/main/PageBackground.cxx sc/source/ui/drawfunc/fuins2.cxx sd/source/ui/view/viewshe2.cxx Related: #i121334# turned back chart non-fill defaults... done the non-fill using tooling when creating new chart modules (cherry picked from commit af9220c24c9d80e5415d9d7d8f273b28d0d27cdb) Conflicts: chart2/source/model/main/PageBackground.cxx sc/source/filter/starcalc/scfobj.cxx sd/source/ui/view/viewshe2.cxx svx/inc/svx/charthelper.hxx svx/source/svdraw/charthelper.cxx sw/source/ui/table/tablemgr.cxx Related: #i121334# deactivated setting chart OLE background to transparent... for better UI experience and better back-compatibility to other OpenOffice derivates (cherry picked from commit 5fa621198a981ea994d9903298e8a1d884ee686b) Unname unused arguments to prevent compiler warnings. (cherry picked from commit c3c4df7647d8d4ab1425bb3c7f38932c4adcbe74) Change-Id: I1b4579aca701a4d637d21d7963b87f637458d0a5 01855cc3d4ec3c321109f924f6de4cdfbec4cd5d 18757f64ae84a415dc781929db4b76f571172ab1 de9879c2e1c249c0d957e4e46723b167ae1a8e90
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/xiescher.cxx5
-rw-r--r--sc/source/filter/starcalc/scfobj.cxx5
2 files changed, 10 insertions, 0 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 7db78f34805c..87014d749d8b 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -67,6 +67,7 @@
#include <svx/unoapi.hxx>
#include <svx/svditer.hxx>
#include <editeng/writingmodeitem.hxx>
+#include <svx/charthelper.hxx>
#include "scitems.hxx"
#include <editeng/eeitem.hxx>
@@ -1660,6 +1661,10 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R
::com::sun::star::awt::Size aAwtSize( aSize.Width(), aSize.Height() );
xEmbObj->setVisualAreaSize( nAspect, aAwtSize );
+ // #i121334# 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 1ce003777c4f..cc05e719a9ec 100644
--- a/sc/source/filter/starcalc/scfobj.cxx
+++ b/sc/source/filter/starcalc/scfobj.cxx
@@ -25,6 +25,7 @@
using namespace com::sun::star;
#include <unotools/moduleoptions.hxx>
+#include <svx/charthelper.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdpage.hxx>
#include <sfx2/objsh.hxx>
@@ -76,6 +77,10 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect
aSz.Height = rRect.GetSize().Height();
xObj->setVisualAreaSize( embed::Aspects::MSOLE_CONTENT, aSz );
+ // #i121334# 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.
// Deshalb in die ChartCollection, die Daten werden dann im