dbaccess/source/core/api/table.cxx | 54 ++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 27 deletions(-)
New commits:
commit b158fd26951e42a9b31ca2bb4aa0bdd36f26a3ab
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Wed May 28 23:06:44 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType(&T)
See
http://nabble.documentfoundation.org/Questions-about-getCppuType-td4106361i20.html
Change-Id: I05d0b026e1ef2088472a42ee20e0823df1588428
diff --git a/dbaccess/source/core/api/table.cxx
b/dbaccess/source/core/api/table.cxx
index b4e8274..07c4077 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -169,51 +169,51 @@ void ODBTable::construct()
OTable_Base::construct();
registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER,
PropertyAttribute::BOUND,
- &m_sFilter, ::getCppuType(&m_sFilter));
+ &m_sFilter, cppu::UnoType<OUString>::get());
registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER,
PropertyAttribute::BOUND,
- &m_sOrder, ::getCppuType(&m_sOrder));
+ &m_sOrder, cppu::UnoType<OUString>::get());
registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER,
PropertyAttribute::BOUND,
- &m_bApplyFilter, ::getBooleanCppuType());
+ &m_bApplyFilter, cppu::UnoType<bool>::get());
registerProperty(PROPERTY_FONT, PROPERTY_ID_FONT, PropertyAttribute::BOUND,
- &m_aFont, ::getCppuType(&m_aFont));
+ &m_aFont,
cppu::UnoType<com::sun::star::awt::FontDescriptor>::get());
registerMayBeVoidProperty(PROPERTY_ROW_HEIGHT, PROPERTY_ID_ROW_HEIGHT,
PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
- &m_aRowHeight, ::cppu::UnoType<sal_Int32>::get());
+ &m_aRowHeight, cppu::UnoType<sal_Int32>::get());
registerMayBeVoidProperty(PROPERTY_TEXTCOLOR, PROPERTY_ID_TEXTCOLOR,
PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
- &m_aTextColor, ::cppu::UnoType<sal_Int32>::get());
+ &m_aTextColor, cppu::UnoType<sal_Int32>::get());
registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES,
PropertyAttribute::BOUND | PropertyAttribute::READONLY,
- &m_nPrivileges, ::cppu::UnoType<sal_Int32>::get());
+ &m_nPrivileges, cppu::UnoType<sal_Int32>::get());
registerMayBeVoidProperty(PROPERTY_TEXTLINECOLOR,
PROPERTY_ID_TEXTLINECOLOR, PropertyAttribute::BOUND |
PropertyAttribute::MAYBEVOID,
- &m_aTextLineColor, ::cppu::UnoType<sal_Int32>::get());
+ &m_aTextLineColor, cppu::UnoType<sal_Int32>::get());
registerProperty(PROPERTY_TEXTEMPHASIS, PROPERTY_ID_TEXTEMPHASIS,
PropertyAttribute::BOUND,
- &m_nFontEmphasis, ::getCppuType(&m_nFontEmphasis));
+ &m_nFontEmphasis, cppu::UnoType<sal_Int16>::get());
registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF,
PropertyAttribute::BOUND,
- &m_nFontRelief, ::getCppuType(&m_nFontRelief));
-
- registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME,
PropertyAttribute::BOUND,&m_aFont.Name,
::getCppuType(&m_aFont.Name));
- registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT,
PropertyAttribute::BOUND,&m_aFont.Height,
::getCppuType(&m_aFont.Height));
- registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH,
PropertyAttribute::BOUND,&m_aFont.Width,
::getCppuType(&m_aFont.Width));
- registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME,
PropertyAttribute::BOUND,&m_aFont.StyleName,
::getCppuType(&m_aFont.StyleName));
- registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY,
PropertyAttribute::BOUND,&m_aFont.Family,
::getCppuType(&m_aFont.Family));
- registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET,
PropertyAttribute::BOUND,&m_aFont.CharSet,
::getCppuType(&m_aFont.CharSet));
- registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH,
PropertyAttribute::BOUND,&m_aFont.Pitch,
::getCppuType(&m_aFont.Pitch));
- registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH,
PropertyAttribute::BOUND,&m_aFont.CharacterWidth,
::getCppuType(&m_aFont.CharacterWidth));
- registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT,
PropertyAttribute::BOUND,&m_aFont.Weight,
::getCppuType(&m_aFont.Weight));
- registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT,
PropertyAttribute::BOUND,&m_aFont.Slant,
::getCppuType(&m_aFont.Slant));
- registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE,
PropertyAttribute::BOUND,&m_aFont.Underline,
::getCppuType(&m_aFont.Underline));
- registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT,
PropertyAttribute::BOUND,&m_aFont.Strikeout,
::getCppuType(&m_aFont.Strikeout));
- registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION,
PropertyAttribute::BOUND,&m_aFont.Orientation,
::getCppuType(&m_aFont.Orientation));
- registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING,
PropertyAttribute::BOUND,&m_aFont.Kerning,
::getCppuType(&m_aFont.Kerning));
- registerProperty(PROPERTY_FONTWORDLINEMODE,
PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode,
::getCppuType(&m_aFont.WordLineMode));
- registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE,
PropertyAttribute::BOUND,&m_aFont.Type,
::getCppuType(&m_aFont.Type));
+ &m_nFontRelief, cppu::UnoType<sal_Int16>::get());
+
+ registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME,
PropertyAttribute::BOUND,&m_aFont.Name, cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT,
PropertyAttribute::BOUND,&m_aFont.Height, cppu::UnoType<sal_Int16>::get());
+ registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH,
PropertyAttribute::BOUND,&m_aFont.Width, cppu::UnoType<sal_Int16>::get());
+ registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME,
PropertyAttribute::BOUND,&m_aFont.StyleName, cppu::UnoType<OUString>::get());
+ registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY,
PropertyAttribute::BOUND,&m_aFont.Family, cppu::UnoType<sal_Int16>::get());
+ registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET,
PropertyAttribute::BOUND,&m_aFont.CharSet, cppu::UnoType<sal_Int16>::get());
+ registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH,
PropertyAttribute::BOUND,&m_aFont.Pitch, cppu::UnoType<sal_Int16>::get());
+ registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH,
PropertyAttribute::BOUND,&m_aFont.CharacterWidth, cppu::UnoType<float>::get());
+ registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT,
PropertyAttribute::BOUND,&m_aFont.Weight, cppu::UnoType<float>::get());
+ registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT,
PropertyAttribute::BOUND,&m_aFont.Slant,
cppu::UnoType<css::awt::FontSlant>::get());
+ registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE,
PropertyAttribute::BOUND,&m_aFont.Underline, cppu::UnoType<sal_Int16>::get());
+ registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT,
PropertyAttribute::BOUND,&m_aFont.Strikeout, cppu::UnoType<sal_Int16>::get());
+ registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION,
PropertyAttribute::BOUND,&m_aFont.Orientation, cppu::UnoType<float>::get());
+ registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING,
PropertyAttribute::BOUND,&m_aFont.Kerning, cppu::UnoType<sal_Bool>::get());
+ registerProperty(PROPERTY_FONTWORDLINEMODE,
PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode,
cppu::UnoType<sal_Bool>::get());
+ registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE,
PropertyAttribute::BOUND,&m_aFont.Type, cppu::UnoType<sal_Int16>::get());
refreshColumns();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
