summaryrefslogtreecommitdiff
path: root/sd/source/ui/view
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-01-30 13:46:42 +0200
committerMichael Stahl <mstahl@redhat.com>2014-02-04 22:50:39 +0000
commit186b4ebc99a2e80740fee51f9d0276886a003617 (patch)
treea86a4ff5fe3cd36add7053212ef37531540be253 /sd/source/ui/view
parent95a7e952552adb834f92d1477f83938e7c8d0204 (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 'sd/source/ui/view')
-rw-r--r--sd/source/ui/view/sdview2.cxx2
-rw-r--r--sd/source/ui/view/sdview3.cxx4
2 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index cc6229fc8f7f..d7317f4cc1eb 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -717,7 +717,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
{
XFillExchangeData aFillData( XFillAttrSetItem( &mrDoc.GetPool() ) );
- *xStm >> aFillData;
+ ReadXFillExchangeData( *xStm, aFillData );
const Color aColor( ( (XFillColorItem&) aFillData.GetXFillAttrSetItem()->GetItemSet().Get( XATTR_FILLCOLOR ) ).GetColorValue() );
static_cast< SdrHdlColor* >( pIAOHandle )->SetColor( aColor, sal_True );
nRet = nDropAction;
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index e3e4efac6ebc..3b755f1026bc 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1177,7 +1177,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
Point aInsertPos( rPos );
Graphic aGraphic;
- *xStm >> aGraphic;
+ ReadGraphic( *xStm, aGraphic );
if( pOwnData && pOwnData->GetWorkDocument() )
{
@@ -1293,7 +1293,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
{
XFillExchangeData aFillData( XFillAttrSetItem( &mrDoc.GetPool() ) );
- *xStm >> aFillData;
+ ReadXFillExchangeData( *xStm, aFillData );
if( IsUndoEnabled() )
{