diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-22 09:20:23 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-11-22 11:24:24 +0100 |
| commit | fd6150915253e382a7e9f674fe23a72a9a801761 (patch) | |
| tree | aa76c8e0cd09eaa2cafbf7897fe48eb42a0886ec /include | |
| parent | 9ffa900cb4d0381587162e3deb9d910965b69d58 (diff) | |
RTF filter: drop now redundant astyle.options
I (tried to) keep the RTF filter style consistent locally with astyle in
the past, but now that's redundant when we have an enforcing
clang-format mechanism in place. So drop the astyle config and switch to
clang-format in the RTF filter case.
To minimize backport pain, do this shortly before the libreoffice-6-0
branch-off.
Change-Id: I708dbeb0b5ad2afacc90029ee5abba9495f4601f
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/rtfutil.hxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/include/filter/msfilter/rtfutil.hxx b/include/filter/msfilter/rtfutil.hxx index 515db949895f..599161670521 100644 --- a/include/filter/msfilter/rtfutil.hxx +++ b/include/filter/msfilter/rtfutil.hxx @@ -20,14 +20,16 @@ // RTF values are often multiplied by 2^16 #define RTF_MULTIPLIER 65536 -namespace msfilter { -namespace rtfutil { - +namespace msfilter +{ +namespace rtfutil +{ /// Outputs a single character in hex form. MSFILTER_DLLPUBLIC OString OutHex(sal_uLong nHex, sal_uInt8 nLen); /// Handles correct unicode and legacy export of a single character. -MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc, bool* pSuccess, bool bUnicode = true); +MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int* pUCMode, rtl_TextEncoding eDestEnc, + bool* pSuccess, bool bUnicode = true); /** * Handles correct unicode and legacy export of a string. @@ -36,7 +38,8 @@ MSFILTER_DLLPUBLIC OString OutChar(sal_Unicode c, int *pUCMode, rtl_TextEncoding * @param eDestEnc the legacy encoding to use * @param bUnicode if unicode output is wanted as well, or just legacy */ -MSFILTER_DLLPUBLIC OString OutString(const OUString &rStr, rtl_TextEncoding eDestEnc, bool bUnicode = true); +MSFILTER_DLLPUBLIC OString OutString(const OUString& rStr, rtl_TextEncoding eDestEnc, + bool bUnicode = true); /** * Handles correct unicode and legacy export of a string, when a @@ -47,8 +50,8 @@ MSFILTER_DLLPUBLIC OString OutString(const OUString &rStr, rtl_TextEncoding eDes * @param rStr the text to export * @param eDestEnc the legacy encoding to use */ -MSFILTER_DLLPUBLIC OString OutStringUpr(const sal_Char *pToken, const OUString &rStr, rtl_TextEncoding eDestEnc); - +MSFILTER_DLLPUBLIC OString OutStringUpr(const sal_Char* pToken, const OUString& rStr, + rtl_TextEncoding eDestEnc); } } |