diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-05-05 20:08:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-05 20:08:34 +0100 |
| commit | c4dacea24f8ca83e6c178e2846aeb40b3a100dcb (patch) | |
| tree | bfe640defe71bc0ce30aff66728363110647575c /svx | |
| parent | d2724d4e07c9bfc58f1c9a008d538d6459c392fb (diff) | |
´Color´ : ambiguous symbol
Change-Id: I5a33d518a62c35c9ac03600f02a37ac987e6e066
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/fillctrl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index fa8c6755cbfe..d730a44c84a6 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -616,7 +616,7 @@ IMPL_LINK(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox *, pToolBox) mpLbFillAttr->Hide(); mpToolBoxColor->Show(); const OUString aTmpStr; - const Color aColor = mpColorItem->GetColorValue(); + const ::Color aColor = mpColorItem->GetColorValue(); const XFillColorItem aXFillColorItem( aTmpStr, aColor ); // #i122676# change FillStyle and Color in one call |