diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-25 18:43:30 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-25 18:43:30 +0200 |
commit | 79c4d547b4d0f9e2f2a77bd4472255d9229cea58 (patch) | |
tree | 2c4e0a52def9790885cec10fd72d6474525c1010 | |
parent | 16228ad68288d1e1dd45956298933cb37aaaf514 (diff) |
There is no css::uno::Sequence<sal_uInt8> in UNO
Change-Id: I1d2207a5a8832155e29c334cbfe5dc5d794b80da
-rw-r--r-- | include/sfx2/docinf.hxx | 8 | ||||
-rw-r--r-- | sc/source/filter/excel/expop2.cxx | 2 | ||||
-rw-r--r-- | sd/source/filter/eppt/eppt.cxx | 14 | ||||
-rw-r--r-- | sfx2/source/doc/docinf.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/doc/oleprops.cxx | 16 | ||||
-rw-r--r-- | sfx2/source/doc/oleprops.hxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 2 |
7 files changed, 31 insertions, 31 deletions
diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx index 1c75d1d9bc3c..19a1075d2dd0 100644 --- a/include/sfx2/docinf.hxx +++ b/include/sfx2/docinf.hxx @@ -57,12 +57,12 @@ sal_uInt32 SFX2_DLLPUBLIC LoadOlePropertySet( bool SFX2_DLLPUBLIC SaveOlePropertySet( const css::uno::Reference< css::document::XDocumentProperties>& i_xDocProps, SotStorage* i_pStorage, - const css::uno::Sequence<sal_uInt8> * i_pThumb = nullptr, - const css::uno::Sequence<sal_uInt8> * i_pGuid = nullptr, - const css::uno::Sequence<sal_uInt8> * i_pHyperlinks = nullptr); + const css::uno::Sequence<sal_Int8> * i_pThumb = nullptr, + const css::uno::Sequence<sal_Int8> * i_pGuid = nullptr, + const css::uno::Sequence<sal_Int8> * i_pHyperlinks = nullptr); -css::uno::Sequence<sal_uInt8> SFX2_DLLPUBLIC convertMetaFile( +css::uno::Sequence<sal_Int8> SFX2_DLLPUBLIC convertMetaFile( GDIMetaFile* i_pThumb); } // namespace sfx2 diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index 8cff635d0867..736759645333 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -124,7 +124,7 @@ FltError ExportBiff5::Write() { std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile(); - uno::Sequence<sal_uInt8> metaFile( + uno::Sequence<sal_Int8> metaFile( sfx2::convertMetaFile(xMetaFile.get())); sfx2::SaveOlePropertySet(xDocProps, xRootStrg, &metaFile); } diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 5605ba33d7c5..0e7e34058525 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -506,7 +506,7 @@ bool PPTWriter::ImplCreateDocumentSummaryInformation() if (xDocProps.is()) { // no idea what this is... - static const sal_uInt8 aGuid[ 0x52 ] = + static const sal_Int8 aGuid[ 0x52 ] = { 0x4e, 0x00, 0x00, 0x00, '{',0,'D',0,'B',0,'1',0,'A',0,'C',0,'9',0,'6',0,'4',0,'-',0, @@ -514,25 +514,25 @@ bool PPTWriter::ImplCreateDocumentSummaryInformation() 'A',0,'1',0,'E',0,'F',0,'-',0,'0',0,'0',0,'6',0,'0',0,'9',0, '7',0,'D',0,'A',0,'5',0,'6',0,'8',0,'9',0,'}',0 }; - uno::Sequence<sal_uInt8> aGuidSeq(aGuid, 0x52); + uno::Sequence<sal_Int8> aGuidSeq(aGuid, 0x52); SvMemoryStream aHyperBlob; ImplCreateHyperBlob( aHyperBlob ); - uno::Sequence<sal_uInt8> aHyperSeq(aHyperBlob.Tell()); - const sal_uInt8* pBlob( - static_cast<const sal_uInt8*>(aHyperBlob.GetData())); + uno::Sequence<sal_Int8> aHyperSeq(aHyperBlob.Tell()); + const sal_Int8* pBlob( + static_cast<const sal_Int8*>(aHyperBlob.GetData())); for (sal_Int32 j = 0; j < aHyperSeq.getLength(); ++j) { aHyperSeq[j] = pBlob[j]; } if ( mnCnvrtFlags & 0x8000 ) { - uno::Sequence<sal_uInt8> aThumbSeq; + uno::Sequence<sal_Int8> aThumbSeq; if ( GetPageByIndex( 0, NORMAL ) && ImplGetPropertyValue( mXPagePropSet, "PreviewBitmap" ) ) { aThumbSeq = - *static_cast<const uno::Sequence<sal_uInt8>*>(mAny.getValue()); + *static_cast<const uno::Sequence<sal_Int8>*>(mAny.getValue()); } sfx2::SaveOlePropertySet( xDocProps, mrStg, &aThumbSeq, &aGuidSeq, &aHyperSeq); diff --git a/sfx2/source/doc/docinf.cxx b/sfx2/source/doc/docinf.cxx index e27d276aca1a..27d986f3e83a 100644 --- a/sfx2/source/doc/docinf.cxx +++ b/sfx2/source/doc/docinf.cxx @@ -197,9 +197,9 @@ sal_uInt32 LoadOlePropertySet( bool SaveOlePropertySet( const uno::Reference< document::XDocumentProperties>& i_xDocProps, SotStorage* i_pStorage, - const uno::Sequence<sal_uInt8> * i_pThumb, - const uno::Sequence<sal_uInt8> * i_pGuid, - const uno::Sequence<sal_uInt8> * i_pHyperlinks) + const uno::Sequence<sal_Int8> * i_pThumb, + const uno::Sequence<sal_Int8> * i_pGuid, + const uno::Sequence<sal_Int8> * i_pHyperlinks) { // *** global properties into stream "005SummaryInformation" *** @@ -305,7 +305,7 @@ bool SaveOlePropertySet( return (nGlobError == ERRCODE_NONE) && (nDocError == ERRCODE_NONE); } -uno::Sequence<sal_uInt8> convertMetaFile(GDIMetaFile* i_pThumb) +uno::Sequence<sal_Int8> convertMetaFile(GDIMetaFile* i_pThumb) { if (i_pThumb) { BitmapEx aBitmap; @@ -314,16 +314,16 @@ uno::Sequence<sal_uInt8> convertMetaFile(GDIMetaFile* i_pThumb) { WriteDIB(aBitmap.GetBitmap(), aStream, false, false); aStream.Seek(STREAM_SEEK_TO_END); - uno::Sequence<sal_uInt8> aSeq(aStream.Tell()); - const sal_uInt8* pBlob( - static_cast<const sal_uInt8*>(aStream.GetData())); + uno::Sequence<sal_Int8> aSeq(aStream.Tell()); + const sal_Int8* pBlob( + static_cast<const sal_Int8*>(aStream.GetData())); for (sal_Int32 j = 0; j < aSeq.getLength(); ++j) { aSeq[j] = pBlob[j]; } return aSeq; } } - return uno::Sequence<sal_uInt8>(); + return uno::Sequence<sal_Int8>(); } } // namespace sfx2 diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 734f193002fa..d9f3f3dbacf7 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -186,7 +186,7 @@ class SfxOleThumbnailProperty : public SfxOlePropertyBase { public: explicit SfxOleThumbnailProperty( sal_Int32 nPropId, - const uno::Sequence<sal_uInt8> & i_rData); + const uno::Sequence<sal_Int8> & i_rData); inline bool IsValid() const { return mData.getLength() > 0; } @@ -195,7 +195,7 @@ private: virtual void ImplSave( SvStream& rStrm ) override; private: - uno::Sequence<sal_uInt8> mData; + uno::Sequence<sal_Int8> mData; }; @@ -208,7 +208,7 @@ class SfxOleBlobProperty : public SfxOlePropertyBase { public: explicit SfxOleBlobProperty( sal_Int32 nPropId, - const uno::Sequence<sal_uInt8> & i_rData); + const uno::Sequence<sal_Int8> & i_rData); inline bool IsValid() const { return mData.getLength() > 0; } private: @@ -216,7 +216,7 @@ private: virtual void ImplSave( SvStream& rStrm ) override; private: - uno::Sequence<sal_uInt8> mData; + uno::Sequence<sal_Int8> mData; }; @@ -591,7 +591,7 @@ void SfxOleDateProperty::ImplSave( SvStream& rStrm ) SfxOleThumbnailProperty::SfxOleThumbnailProperty( - sal_Int32 nPropId, const uno::Sequence<sal_uInt8> & i_rData) : + sal_Int32 nPropId, const uno::Sequence<sal_Int8> & i_rData) : SfxOlePropertyBase( nPropId, PROPTYPE_CLIPFMT ), mData(i_rData) { @@ -640,7 +640,7 @@ void SfxOleThumbnailProperty::ImplSave( SvStream& rStrm ) SfxOleBlobProperty::SfxOleBlobProperty( sal_Int32 nPropId, - const uno::Sequence<sal_uInt8> & i_rData) : + const uno::Sequence<sal_Int8> & i_rData) : SfxOlePropertyBase( nPropId, PROPTYPE_BLOB ), mData(i_rData) { @@ -847,7 +847,7 @@ void SfxOleSection::SetDateValue( sal_Int32 nPropId, const util::Date& rValue ) } void SfxOleSection::SetThumbnailValue( sal_Int32 nPropId, - const uno::Sequence<sal_uInt8> & i_rData) + const uno::Sequence<sal_Int8> & i_rData) { SfxOleThumbnailProperty* pThumbnail = new SfxOleThumbnailProperty( nPropId, i_rData ); SfxOlePropertyRef xProp( pThumbnail ); // take ownership @@ -856,7 +856,7 @@ void SfxOleSection::SetThumbnailValue( sal_Int32 nPropId, } void SfxOleSection::SetBlobValue( sal_Int32 nPropId, - const uno::Sequence<sal_uInt8> & i_rData) + const uno::Sequence<sal_Int8> & i_rData) { SfxOleBlobProperty* pBlob( new SfxOleBlobProperty( nPropId, i_rData ) ); SfxOlePropertyRef xProp( pBlob ); diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index bba734276c19..8ae7236c0798 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -308,10 +308,10 @@ public: void SetDateValue( sal_Int32 nPropId, const css::util::Date& rValue ); /** Inserts a thumbnail property from the passed meta file. */ void SetThumbnailValue( sal_Int32 nPropId, - const css::uno::Sequence<sal_uInt8> & i_rData); + const css::uno::Sequence<sal_Int8> & i_rData); /** Inserts a BLOB property with the passed data. */ void SetBlobValue( sal_Int32 nPropId, - const css::uno::Sequence<sal_uInt8> & i_rData); + const css::uno::Sequence<sal_Int8> & i_rData); /** Returns the value of the property with the passed ID in a UNO any. */ css::uno::Any GetAnyValue( sal_Int32 nPropId ) const; diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 99cde1474c1a..2275a3a84de0 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -3417,7 +3417,7 @@ void WW8Export::PrepareStorage() { std::shared_ptr<GDIMetaFile> xMetaFile = pDocShell->GetPreviewMetaFile(); - uno::Sequence<sal_uInt8> metaFile( + uno::Sequence<sal_Int8> metaFile( sfx2::convertMetaFile(xMetaFile.get())); sfx2::SaveOlePropertySet(xDocProps, &GetWriter().GetStorage(), &metaFile); } |