diff options
Diffstat (limited to 'sw/source/filter/inc')
-rw-r--r-- | sw/source/filter/inc/fltini.hxx | 16 | ||||
-rw-r--r-- | sw/source/filter/inc/rtf.hxx | 9 |
2 files changed, 15 insertions, 10 deletions
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx index 54ff7cf07679..eb48d253d24a 100644 --- a/sw/source/filter/inc/fltini.hxx +++ b/sw/source/filter/inc/fltini.hxx @@ -29,24 +29,26 @@ class SwNodeIndex; // the special readers -class HTMLReader: public Reader +class HTMLReader : public Reader { // we don't want to have the streams/storages open virtual bool SetStrmStgPtr() override; - virtual ErrCode Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; + virtual ErrCode Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) override; virtual OUString GetTemplateName(SwDoc& rDoc) const override; /// Parse FilterOptions passed to the importer. void SetupFilterOptions(); OUString m_aNamespace; + public: HTMLReader(); }; class XMLReader : public Reader { - virtual ErrCode Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &) override; + virtual ErrCode Read(SwDoc&, const OUString& rBaseURL, SwPaM&, const OUString&) override; + public: virtual SwReaderType GetReaderType() override; @@ -54,17 +56,17 @@ public: // read the sections of the document, which is equal to the medium. // returns the count of it - virtual size_t GetSectionList( SfxMedium& rMedium, - std::vector<OUString>& rStrings) const override; + virtual size_t GetSectionList(SfxMedium& rMedium, + std::vector<OUString>& rStrings) const override; }; // the special writers -void GetWW8Writer( const OUString&, const OUString&, WriterRef& ); +void GetWW8Writer(const OUString&, const OUString&, WriterRef&); // Get size of fly (if 'automatic' in WW) and check if not too small SW_DLLPUBLIC void CalculateFlySize(SfxItemSet& rFlySet, const SwNodeIndex& rAnchor, - SwTwips nPageWidth); + SwTwips nPageWidth); #endif diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx index d1e4d3fa9e3a..f0bff55c5923 100644 --- a/sw/source/filter/inc/rtf.hxx +++ b/sw/source/filter/inc/rtf.hxx @@ -24,21 +24,24 @@ class RTFSurround { union { - struct { + struct + { sal_uInt8 nGoldCut : 1; // should ideally be bool sal_uInt8 nOrder : 4; sal_uInt8 nJunk : 3; } Flags; sal_uInt8 nVal; } Value; + public: - RTFSurround( bool bGoldCut, sal_uInt8 nOrder ) { + RTFSurround(bool bGoldCut, sal_uInt8 nOrder) + { Value.Flags.nGoldCut = sal_uInt8(bGoldCut); Value.Flags.nOrder = nOrder; Value.Flags.nJunk = 0; } - sal_uInt16 GetValue() const { return Value.nVal; } + sal_uInt16 GetValue() const { return Value.nVal; } }; #endif // INCLUDED_SW_SOURCE_FILTER_INC_RTF_HXX |