diff options
| author | David Tardon <dtardon@redhat.com> | 2013-06-19 12:38:43 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-06-19 12:44:29 +0200 |
| commit | fa2363344cbf85af17a80c4757b226ab43391af6 (patch) | |
| tree | 536df0af4b33620eb14d7c859961207341884678 /writerfilter | |
| parent | b5f3f55ce59b400f885c41413a3087e3406a424d (diff) | |
fix rtf import on big endian
Change-Id: Ia9f589752176849f7f6700483e933767e509edf3
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtffly.hxx | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx index ab68cfcbf839..d07a8aca3a58 100644 --- a/writerfilter/source/rtftok/rtffly.hxx +++ b/writerfilter/source/rtftok/rtffly.hxx @@ -17,18 +17,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 @@ -71,19 +71,11 @@ namespace writerfilter { sal_uInt16 GetValue() const { - return Value.nVal; + return nVal; } private: - union - { - struct - { - sal_uInt16 nOrient : 4; - sal_uInt16 nRelOrient : 4; - } Flags; - sal_uInt16 nVal; - } Value; + sal_uInt16 nVal; }; /// Stores the horizontal orientation properties of an RTF fly frame. @@ -91,18 +83,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 @@ -151,20 +148,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 : 4; - } Flags; - sal_uInt16 nVal; - } Value; + sal_uInt16 nVal; }; } // namespace rtftok } // namespace writerfilter |