From e6e8722c10e925c05c7eeea073a717f20c0ebdb2 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 29 Jan 2009 10:50:15 +0000 Subject: CWS-TOOLING: integrate CWS metropatch01_DEV300 --- sc/source/ui/view/viewfun5.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'sc/source/ui/view/viewfun5.cxx') diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 2c4890a5f861..f8b89a85e11c 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -193,12 +193,17 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, // try to get the replacement image from the clipboard Graphic aGraphic; ULONG nGrFormat = 0; +// (wg. Selection Manager bei Trustet Solaris) +#ifndef SOLARIS +/* if( aDataHelper.GetGraphic( SOT_FORMATSTR_ID_SVXB, aGraphic ) ) nGrFormat = SOT_FORMATSTR_ID_SVXB; else if( aDataHelper.GetGraphic( FORMAT_GDIMETAFILE, aGraphic ) ) nGrFormat = SOT_FORMAT_GDIMETAFILE; else if( aDataHelper.GetGraphic( FORMAT_BITMAP, aGraphic ) ) nGrFormat = SOT_FORMAT_BITMAP; +*/ +#endif // insert replacement image ( if there is one ) into the object helper if ( nGrFormat ) @@ -263,12 +268,16 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, // try to get the replacement image from the clipboard Graphic aGraphic; ULONG nGrFormat = 0; + +// (wg. Selection Manager bei Trustet Solaris) +#ifndef SOLARIS if( aDataHelper.GetGraphic( SOT_FORMATSTR_ID_SVXB, aGraphic ) ) nGrFormat = SOT_FORMATSTR_ID_SVXB; else if( aDataHelper.GetGraphic( FORMAT_GDIMETAFILE, aGraphic ) ) nGrFormat = SOT_FORMAT_GDIMETAFILE; else if( aDataHelper.GetGraphic( FORMAT_BITMAP, aGraphic ) ) nGrFormat = SOT_FORMAT_BITMAP; +#endif // insert replacement image ( if there is one ) into the object helper if ( nGrFormat ) -- cgit