diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 10:50:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2009-01-29 10:50:15 +0000 |
| commit | e6e8722c10e925c05c7eeea073a717f20c0ebdb2 (patch) | |
| tree | fce4404b20fe88a4f5e3c268a71c38923b143a07 /sc/source/ui/view/viewfun5.cxx | |
| parent | 660fc34c7c7bd5a3a485a8db2a34d7b216ed5ecd (diff) | |
CWS-TOOLING: integrate CWS metropatch01_DEV300
Diffstat (limited to 'sc/source/ui/view/viewfun5.cxx')
| -rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
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 ) |