diff options
author | Armin Le Grand <alg@apache.org> | 2012-11-14 11:09:12 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-06 17:24:43 +0100 |
commit | 7c486ba2574486f886612b8c4c130c55acd7d93e (patch) | |
tree | e0ff8ca0306e71bab1ff59932c26e896a596cd07 /svx/source/svdraw/charthelper.cxx | |
parent | db77d9700e1301c7cb47a76721639dd4c7829f31 (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 'svx/source/svdraw/charthelper.cxx')
-rw-r--r-- | svx/source/svdraw/charthelper.cxx | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx index 9d4c52023595..0676f964d33f 100644 --- a/svx/source/svdraw/charthelper.cxx +++ b/svx/source/svdraw/charthelper.cxx @@ -29,6 +29,9 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/graphic/PrimitiveFactory2D.hpp> #include <drawinglayer/geometry/viewinformation2d.hxx> +#include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/drawing/LineStyle.hpp> using namespace ::com::sun::star; @@ -118,4 +121,35 @@ drawinglayer::primitive2d::Primitive2DSequence ChartHelper::tryToGetChartContent return aRetval; } +void ChartHelper::AdaptDefaultsForChart( + const uno::Reference < embed::XEmbeddedObject > & xEmbObj, + bool /* bNoFillStyle */, + bool /* bNoLineStyle */) +{ + if( xEmbObj.is()) + { + uno::Reference< chart2::XChartDocument > xChartDoc( xEmbObj->getComponent(), uno::UNO_QUERY ); + OSL_ENSURE( xChartDoc.is(), "Trying to set chart property to non-chart OLE" ); + if( !xChartDoc.is()) + return; + + try + { + // set background to transparent (none) + uno::Reference< beans::XPropertySet > xPageProp( xChartDoc->getPageBackground()); + if( xPageProp.is()) + xPageProp->setPropertyValue( "FillStyle", + uno::makeAny( drawing::FillStyle_NONE )); + // set no border + if( xPageProp.is()) + xPageProp->setPropertyValue( "LineStyle", + uno::makeAny( drawing::LineStyle_NONE )); + } + catch( const uno::Exception & ) + { + OSL_FAIL( "Exception caught in AdaptDefaultsForChart" ); + } + } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |