[Libreoffice-commits] core.git: xmloff/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Sun Jan 17 08:46:13 UTC 2021


 xmloff/source/chart/ColorPropertySet.cxx |    4 ++--
 xmloff/source/chart/ColorPropertySet.hxx |    2 +-
 xmloff/source/chart/SchXMLExport.cxx     |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 14d61304c3f54e59cb8912fbd76fec2e4171e478
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jan 16 19:26:04 2021 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Jan 17 09:45:34 2021 +0100

    use ::Color in ColorPropertySet constructor
    
    Change-Id: I5649b39999de50d9f1fc33e2aef405be43069096
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109451
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmloff/source/chart/ColorPropertySet.cxx b/xmloff/source/chart/ColorPropertySet.cxx
index 6e3e046923df..84313c0bb49f 100644
--- a/xmloff/source/chart/ColorPropertySet.cxx
+++ b/xmloff/source/chart/ColorPropertySet.cxx
@@ -76,8 +76,8 @@ sal_Bool SAL_CALL lcl_ColorPropertySetInfo::hasPropertyByName( const OUString& N
 namespace xmloff::chart
 {
 
-ColorPropertySet::ColorPropertySet( sal_Int32 nColor ) :
-        m_nColor( ColorTransparency, nColor ),
+ColorPropertySet::ColorPropertySet( ::Color nColor ) :
+        m_nColor( nColor ),
         m_nDefaultColor( 0x0099ccff )  // blue 8
 {}
 
diff --git a/xmloff/source/chart/ColorPropertySet.hxx b/xmloff/source/chart/ColorPropertySet.hxx
index a69d326548bd..d5b42e39d58c 100644
--- a/xmloff/source/chart/ColorPropertySet.hxx
+++ b/xmloff/source/chart/ColorPropertySet.hxx
@@ -33,7 +33,7 @@ class ColorPropertySet : public ::cppu::WeakImplHelper<
         css::beans::XPropertyState >
 {
 public:
-    explicit ColorPropertySet( sal_Int32 nColor );
+    explicit ColorPropertySet( ::Color nColor );
     virtual ~ColorPropertySet() override;
 
 protected:
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 0ae039da9a3e..9c99ac16167c 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -3392,7 +3392,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
             {
                 // property set only containing the color
                 xPropSet.set( new ::xmloff::chart::ColorPropertySet(
-                                    xColorScheme->getColorByIndex( nElement )));
+                                    ::Color(ColorTransparency, xColorScheme->getColorByIndex( nElement ))));
             }
             SAL_WARN_IF( !xPropSet.is(), "xmloff.chart", "Pie Segments should have properties" );
             if( xPropSet.is())


More information about the Libreoffice-commits mailing list