writerfilter/source/rtftok/rtffly.hxx | 42 ++++++++++++---------------------- 1 file changed, 15 insertions(+), 27 deletions(-)
New commits: commit b1927a686c74287bb0d0356818700e019714b59d Author: David Tardon <[email protected]> Date: Wed Jun 19 12:38:43 2013 +0200 fix rtf import on big endian (cherry picked from commit fa2363344cbf85af17a80c4757b226ab43391af6) Signed-off-by: David Tardon <[email protected]> Conflicts: writerfilter/source/rtftok/rtffly.hxx Change-Id: Ia9f589752176849f7f6700483e933767e509edf3 Reviewed-on: https://gerrit.libreoffice.org/4356 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx index 8922524..6f99130 100644 --- a/writerfilter/source/rtftok/rtffly.hxx +++ b/writerfilter/source/rtftok/rtffly.hxx @@ -35,18 +35,18 @@ namespace writerfilter { { public: RTFVertOrient(sal_uInt16 nValue) + : nVal(nValue) { - Value.nVal = nValue; } sal_uInt16 GetOrient() const { - return Value.Flags.nOrient; + return OSL_LONIBBLE(OSL_LOBYTE(nVal)); } sal_uInt16 GetRelation() const { - return Value.Flags.nRelOrient; + return OSL_HINIBBLE(OSL_LOBYTE(nVal)); } sal_Int32 GetAlign() const @@ -89,19 +89,11 @@ namespace writerfilter { sal_uInt16 GetValue() const { - return Value.nVal; + return nVal; } private: - union - { - struct - { - sal_uInt16 nOrient : 4; - sal_uInt16 nRelOrient : 1; - } Flags; - sal_uInt16 nVal; - } Value; + sal_uInt16 nVal; }; /// Stores the horizontal orientation properties of an RTF fly frame. @@ -109,18 +101,23 @@ namespace writerfilter { { public: RTFHoriOrient(sal_uInt16 nValue) + : nVal(nValue) { - Value.nVal = nValue; } sal_uInt16 GetOrient() const { - return Value.Flags.nOrient; + return OSL_LONIBBLE(OSL_LOBYTE(nVal)); } sal_uInt16 GetRelation() const { - return Value.Flags.nRelOrient; + return OSL_LONIBBLE(OSL_HIBYTE(nVal)); + } + + sal_uInt16 GetRelAnchor() const + { + return OSL_HINIBBLE(OSL_LOBYTE(nVal)); } sal_Int32 GetAlign() const @@ -169,20 +166,11 @@ namespace writerfilter { sal_uInt16 GetValue() const { - return Value.nVal; + return nVal; } private: - union - { - struct - { - sal_uInt16 nOrient : 4; - sal_uInt16 nRelAnchor : 4; - sal_uInt16 nRelOrient : 1; - } Flags; - sal_uInt16 nVal; - } Value; + sal_uInt16 nVal; }; } // namespace rtftok } // namespace writerfilter
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
