diff options
| author | matteocam <matteo.campanelli@gmail.com> | 2014-05-28 16:20:14 -0400 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2014-06-30 22:54:38 +0200 |
| commit | be34ea6f62a357eaaab01ce14e2882528015e1d1 (patch) | |
| tree | 8e206c3cbb44889b1e8aa0c8fbd0a8c4abf18be8 /include | |
| parent | fcbfcc75ed6157f4eb4124c7cfeda4346ddc6b45 (diff) | |
Cleaned up code from operations in vcl
Change-Id: Ica5194f0cf6e30ec099974ae8b794fb2bc5e654a
(cherry picked from commit 4445f361aa2730b61fdd339dcdd7014b266e5c42)
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/eeitem.hxx | 18 | ||||
| -rw-r--r-- | include/vcl/font.hxx | 8 |
2 files changed, 12 insertions, 14 deletions
diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx index 8dcf5c553bd7..b42b326b0b1e 100644 --- a/include/editeng/eeitem.hxx +++ b/include/editeng/eeitem.hxx @@ -80,18 +80,18 @@ #define EE_CHAR_OVERLINE (EE_ITEMS_START+47) #define EE_CHAR_CASEMAP (EE_ITEMS_START+48) #define EE_CHAR_GRABBAG (EE_ITEMS_START+49) -#define EE_CHAR_BKGCOLOR (EE_ITEMS_START+50) +//#define EE_CHAR_BKGCOLOR (EE_ITEMS_START+50) -#define EE_CHAR_END (EE_ITEMS_START+50) +#define EE_CHAR_END (EE_ITEMS_START+49) -#define EE_FEATURE_START (EE_ITEMS_START+51) -#define EE_FEATURE_TAB (EE_ITEMS_START+51) -#define EE_FEATURE_LINEBR (EE_ITEMS_START+52) -#define EE_FEATURE_NOTCONV (EE_ITEMS_START+53) -#define EE_FEATURE_FIELD (EE_ITEMS_START+54) -#define EE_FEATURE_END (EE_ITEMS_START+54) +#define EE_FEATURE_START (EE_ITEMS_START+50) +#define EE_FEATURE_TAB (EE_ITEMS_START+50) +#define EE_FEATURE_LINEBR (EE_ITEMS_START+51) +#define EE_FEATURE_NOTCONV (EE_ITEMS_START+52) +#define EE_FEATURE_FIELD (EE_ITEMS_START+53) +#define EE_FEATURE_END (EE_ITEMS_START+53) -#define EE_ITEMS_END (EE_ITEMS_START+54) +#define EE_ITEMS_END (EE_ITEMS_START+53) #define EDITITEMCOUNT ( EE_ITEMS_END - EE_ITEMS_START + 1 ) diff --git a/include/vcl/font.hxx b/include/vcl/font.hxx index 1a728f34bba9..b4a36146cfdf 100644 --- a/include/vcl/font.hxx +++ b/include/vcl/font.hxx @@ -60,12 +60,10 @@ public: void SetAlign( FontAlign ); FontAlign GetAlign() const; - // XXX: now font has background iff it is (single-y) underlined - // also forces non transparency - bool HasBackgroundColor() const { + // FIXME(matteocam) // XXX: is this the right spot for changes? + void SetBackgroundColor(const Color &); + const Color& GetBackgroundColor() const; - return GetUnderline() == UNDERLINE_SINGLE; - } void SetName( const OUString& rFamilyName ); const OUString& GetName() const; |