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 /include/svx/charthelper.hxx | |
| 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 'include/svx/charthelper.hxx')
| -rw-r--r-- | include/svx/charthelper.hxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx index 3b43c4bb7f10..1575a0b78488 100644 --- a/include/svx/charthelper.hxx +++ b/include/svx/charthelper.hxx @@ -24,6 +24,7 @@ #include <basegfx/range/b2drange.hxx> #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <com/sun/star/embed/XEmbeddedObject.hpp> ////////////////////////////////////////////////////////////////////////////// // predeclarations @@ -45,6 +46,17 @@ public: static drawinglayer::primitive2d::Primitive2DSequence tryToGetChartContentAsPrimitive2DSequence( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rXModel, basegfx::B2DRange& rRange); + + // #i121334# Allow to switch off line and fill style by setting these as attributes + // at the OLE chart object. This is needed to allow fill styles of the covering objects + // to make their own fill/line settings work. This should not be done by changing + // the defaults at the chart (see StaticPageBackgroundDefaults_Initializer::lcl_AddDefaultsToMap) + // since this would not be saved/loaded, thus the compatibility will be better when setting it at + // newly created charts using this method + static void AdaptDefaultsForChart( + const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > & xEmbObj, + bool bNoFillStyle = true, + bool bNoLineStyle = true); }; ////////////////////////////////////////////////////////////////////////////// |