diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-08 11:39:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-08 11:40:16 +0200 |
| commit | fcaad6576dde81fa9f500138e7c8c0ae2afcac6d (patch) | |
| tree | 8deb2c40dd93099054c16e191a371081ffa39a92 | |
| parent | 79b2059fa8e3c69088532f0ce521a285af5455cf (diff) | |
fix shadow error
introduced by my commit 216fdcbdb4c17f349ffd68abd1f372bea3287fad
"convert RECALCMODE_ constants to scoped enum"
Change-Id: Ie7db053741205faeac70e3d21757774567f43ce0
| -rw-r--r-- | include/vbahelper/vbafontbase.hxx | 46 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbafontbase.cxx | 1 |
2 files changed, 24 insertions, 23 deletions
diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index 9601f6fbba30..8c759ea5e9ea 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.hxx @@ -25,29 +25,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <vbahelper/vbahelperinterface.hxx> -// use local constants there is no need to expose these constants -// externally. Looking at the Format->Character dialog it seem that -// these may infact be even be calculated. Leave hardcoded for now -// #FIXEME #TBD investigate the code for dialog mentioned above - -// The font baseline is not specified. -const short NORMAL = 0; - -// specifies a superscripted. -const short SUPERSCRIPT = 33; - -// specifies a subscripted. -const short SUBSCRIPT = -33; - -// specifies a hight of superscripted font - const sal_Int8 SUPERSCRIPTHEIGHT = 58; - -// specifies a hight of subscripted font -const sal_Int8 SUBSCRIPTHEIGHT = 58; - -// specifies a hight of normal font -const short NORMALHEIGHT = 100; - typedef InheritedHelperInterfaceImpl1< ov::XFontBase > VbaFontBase_BASE; class VBAHELPER_DLLPUBLIC VbaFontBase : public VbaFontBase_BASE @@ -58,6 +35,29 @@ protected: bool mbFormControl; public: + // use local constants there is no need to expose these constants + // externally. Looking at the Format->Character dialog it seem that + // these may in fact even be calculated. Leave hardcoded for now + // #FIXEME #TBD investigate the code for dialog mentioned above + + // The font baseline is not specified. + static const short NORMAL = 0; + + // specifies a superscripted. + static const short SUPERSCRIPT = 33; + + // specifies a subscripted. + static const short SUBSCRIPT = -33; + + // specifies a hight of superscripted font + static const sal_Int8 SUPERSCRIPTHEIGHT = 58; + + // specifies a hight of subscripted font + static const sal_Int8 SUBSCRIPTHEIGHT = 58; + + // specifies a hight of normal font + static const short NORMALHEIGHT = 100; + VbaFontBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, diff --git a/vbahelper/source/vbahelper/vbafontbase.cxx b/vbahelper/source/vbahelper/vbafontbase.cxx index 8b6384d37e42..94ae3be9586e 100644 --- a/vbahelper/source/vbahelper/vbafontbase.cxx +++ b/vbahelper/source/vbahelper/vbafontbase.cxx @@ -27,6 +27,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; + // form controls use other property name as the remaining OOo API #define VBAFONTBASE_PROPNAME( ascii_normal, ascii_control ) \ mbFormControl ? OUString( ascii_control ) : OUString( ascii_normal ) |