diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-05 11:43:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-05 11:44:17 +0200 |
| commit | 7ebed1d63e2ad5728fa81b65fa98f09b0406965d (patch) | |
| tree | 90f5bd9222fcf402fd7018731249355564d0611c /sw/source/uibase/inc | |
| parent | 36c8dd27b19ce5088b65096af5f464ec5720efaa (diff) | |
fix windows build
Error is "ambiguous call to overloaded function"
Rename methods to something more specific to avoid this.
Change-Id: Iac275e38cf7fb06be55cd859041acc641c13db35
Diffstat (limited to 'sw/source/uibase/inc')
| -rw-r--r-- | sw/source/uibase/inc/edtwin.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index a0365836c4e7..1fb8f2de9378 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -71,8 +71,8 @@ friend void PageNumNotify( SwViewShell* pVwSh, static long m_nDDStartPosX, m_nDDStartPosY; - static Color m_aTextColor; // text color; for the watering can - static Color m_aTextBackColor; // text background; for the watering can + static Color m_aWaterCanTextColor; // text color; for the watering can + static Color m_aWaterCanTextBackColor; // text background; for the watering can /* * timer and handler for scrolling on when the mousepointer @@ -253,14 +253,14 @@ public: sal_uInt16 GetDropAction() const { return m_nDropAction; } SotClipboardFormatId GetDropFormat() const { return m_nDropFormat; } - static Color GetTextColor() { return m_aTextColor; } + static Color GetWaterCanTextColor() { return m_aWaterCanTextColor; } - static void SetTextColor(const Color& rCol ) { m_aTextColor = rCol; } + static void SetWaterCanTextColor(const Color& rCol ) { m_aWaterCanTextColor = rCol; } - static Color GetTextBackColor() - { return m_aTextBackColor; } - static void SetTextBackColor(const Color& rCol ) - { m_aTextBackColor = rCol; } + static Color GetWaterCanTextBackColor() + { return m_aWaterCanTextBackColor; } + static void SetWaterCanTextBackColor(const Color& rCol ) + { m_aWaterCanTextBackColor = rCol; } void LockKeyInput(bool bSet){m_bLockInput = bSet;} const SwView &GetView() const { return m_rView; } |