diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 08:42:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-07 08:35:04 +0100 |
commit | a498b12dc1723b072a165f8c528c377024fd4c98 (patch) | |
tree | c52b7d01cd95176d345b4ad0bf417edc4c499d26 /extensions/source/propctrlr/formcomponenthandler.cxx | |
parent | 073b4eadd2a9a00b915c664df90b15d5b2d709c0 (diff) |
use more Color in editeng..forms
Change-Id: If6c862e7bb61cd78c3379afde11b528a74162900
Reviewed-on: https://gerrit.libreoffice.org/50860
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source/propctrlr/formcomponenthandler.cxx')
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 40fce9868229..a24eb5cf1868 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2847,9 +2847,8 @@ namespace pcr bool FormComponentPropertyHandler::impl_dialogColorChooser_throw( sal_Int32 _nColorPropertyId, Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const { - sal_Int32 nColor = 0; - OSL_VERIFY( impl_getPropertyValue_throw( impl_getPropertyNameFromId_nothrow( _nColorPropertyId ) ) >>= nColor ); - ::Color aColor( nColor ); + ::Color aColor; + OSL_VERIFY( impl_getPropertyValue_throw( impl_getPropertyNameFromId_nothrow( _nColorPropertyId ) ) >>= aColor ); SvColorDialog aColorDlg( impl_getDefaultDialogParent_nothrow() ); aColorDlg.SetColor( aColor ); @@ -2857,9 +2856,7 @@ namespace pcr if ( !aColorDlg.Execute() ) return false; - aColor = aColorDlg.GetColor(); - nColor = aColor.GetColor(); - _out_rNewValue <<= nColor; + _out_rNewValue <<= aColorDlg.GetColor(); return true; } |