diff options
author | Noel Grandin <noel@peralex.com> | 2014-01-30 13:46:42 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-02-04 22:50:39 +0000 |
commit | 186b4ebc99a2e80740fee51f9d0276886a003617 (patch) | |
tree | a86a4ff5fe3cd36add7053212ef37531540be253 /include/filter | |
parent | 95a7e952552adb834f92d1477f83938e7c8d0204 (diff) |
convert specialised SvStream::operator>> methods to ReadXXX methods
as preparation for converting the SvStream::operator>> methods on
primitive types
Change-Id: I62f134bced15c687d6e0d46924f56e8d1c3d95b9
Reviewed-on: https://gerrit.libreoffice.org/7798
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'include/filter')
-rw-r--r-- | include/filter/msfilter/dffpropset.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/dffrecordheader.hxx | 2 | ||||
-rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 4 | ||||
-rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 26 |
4 files changed, 17 insertions, 17 deletions
diff --git a/include/filter/msfilter/dffpropset.hxx b/include/filter/msfilter/dffpropset.hxx index 92976810350e..6237e8d84485 100644 --- a/include/filter/msfilter/dffpropset.hxx +++ b/include/filter/msfilter/dffpropset.hxx @@ -61,7 +61,7 @@ class MSFILTER_DLLPUBLIC DffPropSet sal_Bool SeekToContent( sal_uInt32 nRecType, SvStream& rSt ) const; void InitializePropSet( sal_uInt16 nPropSetType ) const; - friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet ); + friend SvStream& ReadDffPropSet( SvStream& rIn, DffPropSet& rPropSet ); friend SvStream& operator|=( SvStream& rIn, DffPropSet& rPropSet ); }; diff --git a/include/filter/msfilter/dffrecordheader.hxx b/include/filter/msfilter/dffrecordheader.hxx index 9453a0dd5f90..a36521785f8a 100644 --- a/include/filter/msfilter/dffrecordheader.hxx +++ b/include/filter/msfilter/dffrecordheader.hxx @@ -56,7 +56,7 @@ public: return nFilePos == rIn.Seek(nFilePos); } - MSFILTER_DLLPUBLIC friend SvStream& operator>>(SvStream& rIn, DffRecordHeader& rRec); + MSFILTER_DLLPUBLIC friend SvStream& ReadDffRecordHeader(SvStream& rIn, DffRecordHeader& rRec); }; #endif diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 37157e539eb6..c2bf0391c26b 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -179,7 +179,7 @@ struct SvxMSDffConnectorRule SvxMSDffConnectorRule() : nSpFlagsA( 0 ), nSpFlagsB( 0 ), pAObj( NULL ), pBObj( NULL ), pCObj( NULL ) {}; - friend SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); + friend SvStream& ReadSvxMSDffConnectorRule( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); }; typedef ::std::vector< SvxMSDffConnectorRule* > SvxMSDffConnectorRuleList; @@ -191,7 +191,7 @@ struct MSFILTER_DLLPUBLIC SvxMSDffSolverContainer SvxMSDffSolverContainer(); ~SvxMSDffSolverContainer(); - MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rAtom ); + MSFILTER_DLLPUBLIC friend SvStream& ReadSvxMSDffSolverContainer( SvStream& rIn, SvxMSDffSolverContainer& rAtom ); }; struct FIDCL diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index eee319253955..f76123abcb68 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -73,7 +73,7 @@ public: nMajorVersion ( 0 ), nMinorVersion ( 0 ) {} - MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom ); + MSFILTER_DLLPUBLIC friend SvStream& ReadPptCurrentUserAtom( SvStream& rIn, PptCurrentUserAtom& rAtom ); }; struct MSFILTER_DLLPUBLIC PowerPointImportParam @@ -121,7 +121,7 @@ struct MSFILTER_DLLPUBLIC PptInteractiveInfoAtom public: - MSFILTER_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom ); + MSFILTER_DLLPUBLIC friend SvStream& ReadPptInteractiveInfoAtom( SvStream& rIn, PptInteractiveInfoAtom& rAtom ); }; enum PptPageKind { PPT_MASTERPAGE, PPT_SLIDEPAGE, PPT_NOTEPAGE }; @@ -188,7 +188,7 @@ public: Size GetSlidesPageSize() const { return GetPageSize( aSlidesPageSize ); } Size GetNotesPageSize() const { return GetPageSize( aNotesPageSize ); } - friend SvStream& operator>>( SvStream& rIn, PptDocumentAtom& rAtom ); + friend SvStream& ReadPptDocumentAtom( SvStream& rIn, PptDocumentAtom& rAtom ); }; struct PptSlideLayoutAtom @@ -201,7 +201,7 @@ public: void Clear(); // SlideLayoutAtom is read without header! - friend SvStream& operator>>( SvStream& rIn, PptSlideLayoutAtom& rAtom ); + friend SvStream& ReadPptSlideLayoutAtom( SvStream& rIn, PptSlideLayoutAtom& rAtom ); }; struct PptSlideAtom @@ -215,7 +215,7 @@ public: PptSlideAtom() { Clear(); } void Clear(); - friend SvStream& operator>>(SvStream& rIn, PptSlideAtom& rAtom); + friend SvStream& ReadPptSlideAtom(SvStream& rIn, PptSlideAtom& rAtom); }; struct PptSlidePersistAtom @@ -230,7 +230,7 @@ public: PptSlidePersistAtom() { Clear(); } void Clear(); - friend SvStream& operator>>(SvStream& rIn, PptSlidePersistAtom& rAtom); + friend SvStream& ReadPptSlidePersistAtom(SvStream& rIn, PptSlidePersistAtom& rAtom); }; struct PptNotesAtom @@ -242,7 +242,7 @@ public: PptNotesAtom() { Clear(); } void Clear(); - friend SvStream& operator>>(SvStream& rIn, PptNotesAtom& rAtom); + friend SvStream& ReadPptNotesAtom(SvStream& rIn, PptNotesAtom& rAtom); }; struct PptColorSchemeAtom @@ -254,7 +254,7 @@ public: void Clear(); Color GetColor( sal_uInt16 nNum ) const; - friend SvStream& operator>>(SvStream& rIn, PptColorSchemeAtom& rAtom); + friend SvStream& ReadPptColorSchemeAtom(SvStream& rIn, PptColorSchemeAtom& rAtom); }; struct PptFontEntityAtom @@ -270,7 +270,7 @@ struct PptFontEntityAtom FontPitch ePitch; sal_Bool bAvailable; - friend SvStream& operator>>(SvStream& rIn, PptFontEntityAtom& rAtom); + friend SvStream& ReadPptFontEntityAtom(SvStream& rIn, PptFontEntityAtom& rAtom); }; class PptFontCollection; @@ -288,7 +288,7 @@ struct PptUserEditAtom public: PptUserEditAtom() : nOffsetPersistDirectory( 0 ) {} - friend SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom ); + friend SvStream& ReadPptUserEditAtom( SvStream& rIn, PptUserEditAtom& rAtom ); }; struct PptOEPlaceholderAtom @@ -301,7 +301,7 @@ public: PptOEPlaceholderAtom() { Clear(); } void Clear(); - friend SvStream& operator>>( SvStream& rIn, PptOEPlaceholderAtom& rAtom ); + friend SvStream& ReadPptOEPlaceholderAtom( SvStream& rIn, PptOEPlaceholderAtom& rAtom ); }; struct ProcessData; @@ -382,7 +382,7 @@ struct PptExOleObjAtom public: - friend SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom ); + friend SvStream& ReadPptExOleObjAtom( SvStream& rIn, PptExOleObjAtom& rAtom ); }; typedef ::std::vector< PPTOleEntry* > PPTOleEntryList; @@ -691,7 +691,7 @@ struct PPTExtParaLevel sal_Bool mbSet; PPTExtParaLevel(); - friend SvStream& operator>>( SvStream& rIn, PPTExtParaLevel& rL ); + friend SvStream& ReadPPTExtParaLevel( SvStream& rIn, PPTExtParaLevel& rL ); }; struct PPTExtParaSheet |