From 815370a8415b4629ebd84ad707ca4327bf1d314b Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 27 Aug 2018 13:46:25 +0200 Subject: [PATCH] mshtml: Rename get_style_attr to get_style_property. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/mshtml/htmlstyle.c | 72 ++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index b867ef2b9db..f00b38c21d0 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -617,7 +617,7 @@ HRESULT get_nsstyle_attr_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, return S_OK; } -static inline HRESULT get_style_attr(HTMLStyle *This, styleid_t sid, BSTR *p) +static inline HRESULT get_style_property(HTMLStyle *This, styleid_t sid, BSTR *p) { return get_nsstyle_attr(This->nsstyle, sid, p, 0); } @@ -866,7 +866,7 @@ static HRESULT WINAPI HTMLStyle_get_fontFamily(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_FONT_FAMILY, p); + return get_style_property(This, STYLEID_FONT_FAMILY, p); } static HRESULT WINAPI HTMLStyle_put_fontStyle(IHTMLStyle *iface, BSTR v) @@ -893,7 +893,7 @@ static HRESULT WINAPI HTMLStyle_get_fontStyle(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_FONT_STYLE, p); + return get_style_property(This, STYLEID_FONT_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_fontVariant(IHTMLStyle *iface, BSTR v) @@ -920,7 +920,7 @@ static HRESULT WINAPI HTMLStyle_get_fontVariant(IHTMLStyle *iface, BSTR *p) if(!p) return E_INVALIDARG; - return get_style_attr(This, STYLEID_FONT_VARIANT, p); + return get_style_property(This, STYLEID_FONT_VARIANT, p); } static HRESULT WINAPI HTMLStyle_put_fontWeight(IHTMLStyle *iface, BSTR v) @@ -957,7 +957,7 @@ static HRESULT WINAPI HTMLStyle_get_fontWeight(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_FONT_WEIGHT, p); + return get_style_property(This, STYLEID_FONT_WEIGHT, p); } static HRESULT WINAPI HTMLStyle_put_fontSize(IHTMLStyle *iface, VARIANT v) @@ -1025,7 +1025,7 @@ static HRESULT WINAPI HTMLStyle_get_background(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BACKGROUND, p); + return get_style_property(This, STYLEID_BACKGROUND, p); } static HRESULT WINAPI HTMLStyle_put_backgroundColor(IHTMLStyle *iface, VARIANT v) @@ -1061,7 +1061,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundImage(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BACKGROUND_IMAGE, p); + return get_style_property(This, STYLEID_BACKGROUND_IMAGE, p); } static HRESULT WINAPI HTMLStyle_put_backgroundRepeat(IHTMLStyle *iface, BSTR v) @@ -1090,7 +1090,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundRepeat(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BACKGROUND_REPEAT, p); + return get_style_property(This, STYLEID_BACKGROUND_REPEAT, p); } static HRESULT WINAPI HTMLStyle_put_backgroundAttachment(IHTMLStyle *iface, BSTR v) @@ -1108,7 +1108,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundAttachment(IHTMLStyle *iface, BSTR TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BACKGROUND_ATTACHMENT, p); + return get_style_property(This, STYLEID_BACKGROUND_ATTACHMENT, p); } static HRESULT WINAPI HTMLStyle_put_backgroundPosition(IHTMLStyle *iface, BSTR v) @@ -1126,7 +1126,7 @@ static HRESULT WINAPI HTMLStyle_get_backgroundPosition(IHTMLStyle *iface, BSTR * TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BACKGROUND_POSITION, p); + return get_style_property(This, STYLEID_BACKGROUND_POSITION, p); } static HRESULT WINAPI HTMLStyle_put_backgroundPositionX(IHTMLStyle *iface, VARIANT v) @@ -1368,7 +1368,7 @@ static HRESULT WINAPI HTMLStyle_get_textDecoration(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_TEXT_DECORATION, p); + return get_style_property(This, STYLEID_TEXT_DECORATION, p); } static HRESULT WINAPI HTMLStyle_put_textDecorationNone(IHTMLStyle *iface, VARIANT_BOOL v) @@ -1494,7 +1494,7 @@ static HRESULT WINAPI HTMLStyle_get_textTransform(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_TEXT_TRANSFORM, p); + return get_style_property(This, STYLEID_TEXT_TRANSFORM, p); } static HRESULT WINAPI HTMLStyle_put_textAlign(IHTMLStyle *iface, BSTR v) @@ -1512,7 +1512,7 @@ static HRESULT WINAPI HTMLStyle_get_textAlign(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_TEXT_ALIGN, p); + return get_style_property(This, STYLEID_TEXT_ALIGN, p); } static HRESULT WINAPI HTMLStyle_put_textIndent(IHTMLStyle *iface, VARIANT v) @@ -1627,7 +1627,7 @@ static HRESULT WINAPI HTMLStyle_get_margin(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_MARGIN, p); + return get_style_property(This, STYLEID_MARGIN, p); } static HRESULT WINAPI HTMLStyle_get_marginLeft(IHTMLStyle *iface, VARIANT *p) @@ -1724,7 +1724,7 @@ static HRESULT WINAPI HTMLStyle_get_padding(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_PADDING, p); + return get_style_property(This, STYLEID_PADDING, p); } static HRESULT WINAPI HTMLStyle_put_border(IHTMLStyle *iface, BSTR v) @@ -1742,7 +1742,7 @@ static HRESULT WINAPI HTMLStyle_get_border(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER, p); + return get_style_property(This, STYLEID_BORDER, p); } static HRESULT WINAPI HTMLStyle_put_borderTop(IHTMLStyle *iface, BSTR v) @@ -1756,7 +1756,7 @@ static HRESULT WINAPI HTMLStyle_get_borderTop(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_TOP, p); + return get_style_property(This, STYLEID_BORDER_TOP, p); } static HRESULT WINAPI HTMLStyle_put_borderRight(IHTMLStyle *iface, BSTR v) @@ -1770,7 +1770,7 @@ static HRESULT WINAPI HTMLStyle_get_borderRight(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_RIGHT, p); + return get_style_property(This, STYLEID_BORDER_RIGHT, p); } static HRESULT WINAPI HTMLStyle_put_borderBottom(IHTMLStyle *iface, BSTR v) @@ -1784,7 +1784,7 @@ static HRESULT WINAPI HTMLStyle_get_borderBottom(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_BOTTOM, p); + return get_style_property(This, STYLEID_BORDER_BOTTOM, p); } static HRESULT WINAPI HTMLStyle_put_borderLeft(IHTMLStyle *iface, BSTR v) @@ -1802,7 +1802,7 @@ static HRESULT WINAPI HTMLStyle_get_borderLeft(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_LEFT, p); + return get_style_property(This, STYLEID_BORDER_LEFT, p); } static HRESULT WINAPI HTMLStyle_put_borderColor(IHTMLStyle *iface, BSTR v) @@ -1820,7 +1820,7 @@ static HRESULT WINAPI HTMLStyle_get_borderColor(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_COLOR, p); + return get_style_property(This, STYLEID_BORDER_COLOR, p); } static HRESULT WINAPI HTMLStyle_put_borderTopColor(IHTMLStyle *iface, VARIANT v) @@ -1906,7 +1906,7 @@ static HRESULT WINAPI HTMLStyle_get_borderWidth(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_WIDTH, p); + return get_style_property(This, STYLEID_BORDER_WIDTH, p); } static HRESULT WINAPI HTMLStyle_put_borderTopWidth(IHTMLStyle *iface, VARIANT v) @@ -2025,7 +2025,7 @@ static HRESULT WINAPI HTMLStyle_get_borderStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_STYLE, p); + return get_style_property(This, STYLEID_BORDER_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderTopStyle(IHTMLStyle *iface, BSTR v) @@ -2043,7 +2043,7 @@ static HRESULT WINAPI HTMLStyle_get_borderTopStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_TOP_STYLE, p); + return get_style_property(This, STYLEID_BORDER_TOP_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderRightStyle(IHTMLStyle *iface, BSTR v) @@ -2061,7 +2061,7 @@ static HRESULT WINAPI HTMLStyle_get_borderRightStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_RIGHT_STYLE, p); + return get_style_property(This, STYLEID_BORDER_RIGHT_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderBottomStyle(IHTMLStyle *iface, BSTR v) @@ -2079,7 +2079,7 @@ static HRESULT WINAPI HTMLStyle_get_borderBottomStyle(IHTMLStyle *iface, BSTR *p { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_BOTTOM_STYLE, p); + return get_style_property(This, STYLEID_BORDER_BOTTOM_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_borderLeftStyle(IHTMLStyle *iface, BSTR v) @@ -2097,7 +2097,7 @@ static HRESULT WINAPI HTMLStyle_get_borderLeftStyle(IHTMLStyle *iface, BSTR *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_BORDER_LEFT_STYLE, p); + return get_style_property(This, STYLEID_BORDER_LEFT_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_width(IHTMLStyle *iface, VARIANT v) @@ -2151,7 +2151,7 @@ static HRESULT WINAPI HTMLStyle_get_styleFloat(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_FLOAT, p); + return get_style_property(This, STYLEID_FLOAT, p); } static HRESULT WINAPI HTMLStyle_put_clear(IHTMLStyle *iface, BSTR v) @@ -2169,7 +2169,7 @@ static HRESULT WINAPI HTMLStyle_get_clear(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_CLEAR, p); + return get_style_property(This, STYLEID_CLEAR, p); } static HRESULT WINAPI HTMLStyle_put_display(IHTMLStyle *iface, BSTR v) @@ -2187,7 +2187,7 @@ static HRESULT WINAPI HTMLStyle_get_display(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_DISPLAY, p); + return get_style_property(This, STYLEID_DISPLAY, p); } static HRESULT WINAPI HTMLStyle_put_visibility(IHTMLStyle *iface, BSTR v) @@ -2205,7 +2205,7 @@ static HRESULT WINAPI HTMLStyle_get_visibility(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_VISIBILITY, p); + return get_style_property(This, STYLEID_VISIBILITY, p); } static HRESULT WINAPI HTMLStyle_put_listStyleType(IHTMLStyle *iface, BSTR v) @@ -2223,7 +2223,7 @@ static HRESULT WINAPI HTMLStyle_get_listStyleType(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_LISTSTYLETYPE, p); + return get_style_property(This, STYLEID_LISTSTYLETYPE, p); } static HRESULT WINAPI HTMLStyle_put_listStylePosition(IHTMLStyle *iface, BSTR v) @@ -2241,7 +2241,7 @@ static HRESULT WINAPI HTMLStyle_get_listStylePosition(IHTMLStyle *iface, BSTR *p TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_LISTSTYLEPOSITION, p); + return get_style_property(This, STYLEID_LISTSTYLEPOSITION, p); } static HRESULT WINAPI HTMLStyle_put_listStyleImage(IHTMLStyle *iface, BSTR v) @@ -2273,7 +2273,7 @@ static HRESULT WINAPI HTMLStyle_get_listStyle(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_LIST_STYLE, p); + return get_style_property(This, STYLEID_LIST_STYLE, p); } static HRESULT WINAPI HTMLStyle_put_whiteSpace(IHTMLStyle *iface, BSTR v) @@ -2385,7 +2385,7 @@ static HRESULT WINAPI HTMLStyle_get_overflow(IHTMLStyle *iface, BSTR *p) if(!p) return E_INVALIDARG; - return get_style_attr(This, STYLEID_OVERFLOW, p); + return get_style_property(This, STYLEID_OVERFLOW, p); } static HRESULT WINAPI HTMLStyle_put_pageBreakBefore(IHTMLStyle *iface, BSTR v) @@ -2645,7 +2645,7 @@ static HRESULT WINAPI HTMLStyle_get_cursor(IHTMLStyle *iface, BSTR *p) TRACE("(%p)->(%p)\n", This, p); - return get_style_attr(This, STYLEID_CURSOR, p); + return get_style_property(This, STYLEID_CURSOR, p); } static HRESULT WINAPI HTMLStyle_put_clip(IHTMLStyle *iface, BSTR v) -- 2.11.4.GIT