diff options
Diffstat (limited to 'cui/source/dialogs/pastedlg.cxx')
-rw-r--r-- | cui/source/dialogs/pastedlg.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 2fe952b9197a..be2a7b4cfdbb 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -106,8 +106,8 @@ IMPL_LINK_INLINE_END( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox ) void SvPasteObjectDialog::SetDefault() { - bLink = FALSE; - nAspect = (USHORT)::com::sun::star::embed::Aspects::MSOLE_CONTENT; + bLink = sal_False; + nAspect = (sal_uInt16)::com::sun::star::embed::Aspects::MSOLE_CONTENT; } SvPasteObjectDialog::~SvPasteObjectDialog() @@ -134,7 +134,7 @@ void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String& rForm delete pStr; } -ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, +sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, const DataFlavorExVector* pFormats, const TransferableObjectDescriptor* ) { @@ -148,10 +148,10 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, //Dialogbox erzeugen und fuellen String aSourceName, aTypeName; - ULONG nSelFormat = 0; + sal_uLong nSelFormat = 0; SvGlobalName aEmptyNm; - ObjectLB().SetUpdateMode( FALSE ); + ObjectLB().SetUpdateMode( sal_False ); DataFlavorExVector::iterator aIter( ((DataFlavorExVector&)*pFormats).begin() ), aEnd( ((DataFlavorExVector&)*pFormats).end() ); @@ -168,7 +168,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, if( !pName && ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) ) { - BOOL IsClipboardObject_Impl( SotDataObject * ); + sal_Bool IsClipboardObject_Impl( SotDataObject * ); if( IsClipboardObject_Impl( pDataObj ) ) { IDataObject * pDO = NULL; @@ -188,7 +188,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, LPOBJECTDESCRIPTOR pOD=(LPOBJECTDESCRIPTOR)GlobalLock(stm.hGlobal); if( pOD->dwFullUserTypeName ) { - OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwFullUserTypeName); + OLECHAR * pN = (OLECHAR *)(((sal_uInt8 *)pOD) + pOD->dwFullUserTypeName); aName.Append( pN ); pName = &aName; // set format to ole object @@ -196,7 +196,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, } if( pOD->dwSrcOfCopy ) { - OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwSrcOfCopy); + OLECHAR * pN = (OLECHAR *)(((sal_uInt8 *)pOD) + pOD->dwSrcOfCopy); aSourceName.Append( *pN++ ); } else @@ -270,7 +270,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, } } - ObjectLB().SetUpdateMode( TRUE ); + ObjectLB().SetUpdateMode( sal_True ); SelectObject(); if( aSourceName.Len() ) @@ -291,9 +291,9 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper, bLink = PasteLink().IsChecked(); if( AsIconBox().IsChecked() ) - nAspect = (USHORT)com::sun::star::embed::Aspects::MSOLE_ICON; + nAspect = (sal_uInt16)com::sun::star::embed::Aspects::MSOLE_ICON; - nSelFormat = (ULONG)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() ); + nSelFormat = (sal_uLong)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() ); } return nSelFormat; |