summaryrefslogtreecommitdiff
path: root/editeng/source
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source')
-rw-r--r--editeng/source/editeng/editeng.cxx2
-rw-r--r--editeng/source/editeng/eeobj.cxx18
-rw-r--r--editeng/source/editeng/impedit.cxx4
-rw-r--r--editeng/source/editeng/impedit2.cxx6
4 files changed, 15 insertions, 15 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 1889439a7654..2093382f414a 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -2702,7 +2702,7 @@ bool EditEngine::HasValidData( const ::com::sun::star::uno::Reference< ::com::su
{
// Every application that copies rtf or any other text format also copies plain text into the clipboard....
datatransfer::DataFlavor aFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
bValidData = rTransferable->isDataFlavorSupported( aFlavor );
}
diff --git a/editeng/source/editeng/eeobj.cxx b/editeng/source/editeng/eeobj.cxx
index 2bf54c5e74bd..40839aa17b09 100644
--- a/editeng/source/editeng/eeobj.cxx
+++ b/editeng/source/editeng/eeobj.cxx
@@ -52,18 +52,18 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
{
uno::Any aAny;
- sal_uLong nT = SotExchange::GetFormat( rFlavor );
- if ( nT == SOT_FORMAT_STRING )
+ SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
+ if ( nT == SotClipboardFormatId::STRING )
{
aAny <<= GetString();
}
- else if ( ( nT == SOT_FORMATSTR_ID_EDITENGINE ) || ( nT == SOT_FORMAT_RTF ) )
+ else if ( ( nT == SotClipboardFormatId::EDITENGINE ) || ( nT == SotClipboardFormatId::RTF ) )
{
// No RTF on demand any more:
// 1) Was not working, because I had to flush() the clipboard immediately anyway
// 2) Don't have the old pool defaults and the StyleSheetPool here.
- SvMemoryStream* pStream = ( nT == SOT_FORMATSTR_ID_EDITENGINE ) ? &GetStream() : &GetRTFStream();
+ SvMemoryStream* pStream = ( nT == SotClipboardFormatId::EDITENGINE ) ? &GetStream() : &GetRTFStream();
pStream->Seek( STREAM_SEEK_TO_END );
sal_Size nLen = pStream->Tell();
pStream->Seek(0);
@@ -84,9 +84,9 @@ uno::Any EditDataObject::getTransferData( const datatransfer::DataFlavor& rFlavo
uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors( ) throw(uno::RuntimeException, std::exception)
{
uno::Sequence< datatransfer::DataFlavor > aDataFlavors(3);
- SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_EDITENGINE, aDataFlavors.getArray()[0] );
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aDataFlavors.getArray()[1] );
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_RTF, aDataFlavors.getArray()[2] );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::EDITENGINE, aDataFlavors.getArray()[0] );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aDataFlavors.getArray()[1] );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RTF, aDataFlavors.getArray()[2] );
return aDataFlavors;
}
@@ -95,8 +95,8 @@ sal_Bool EditDataObject::isDataFlavorSupported( const datatransfer::DataFlavor&
{
bool bSupported = false;
- sal_uLong nT = SotExchange::GetFormat( rFlavor );
- if ( ( nT == SOT_FORMAT_STRING ) || ( nT == SOT_FORMAT_RTF ) || ( nT == SOT_FORMATSTR_ID_EDITENGINE ) )
+ SotClipboardFormatId nT = SotExchange::GetFormat( rFlavor );
+ if ( ( nT == SotClipboardFormatId::STRING ) || ( nT == SotClipboardFormatId::RTF ) || ( nT == SotClipboardFormatId::EDITENGINE ) )
bSupported = true;
return bSupported;
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index ed456a19cccd..f0af59472a0a 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1377,7 +1377,7 @@ void ImpEditView::Paste( ::com::sun::star::uno::Reference< ::com::sun::star::dat
if ( DoSingleLinePaste() )
{
datatransfer::DataFlavor aFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
if ( xDataObj->isDataFlavorSupported( aFlavor ) )
{
try
@@ -1860,7 +1860,7 @@ void ImpEditView::dragEnter( const ::com::sun::star::datatransfer::dnd::DropTarg
// Check for supported format...
// Only check for text, will also be there if bin or rtf
datatransfer::DataFlavor aTextFlavor;
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aTextFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aTextFlavor );
const ::com::sun::star::datatransfer::DataFlavor* pFlavors = rDTDEE.SupportedDataFlavors.getConstArray();
int nFlavors = rDTDEE.SupportedDataFlavors.getLength();
for ( int n = 0; n < nFlavors; n++ )
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index 74f89cce5b37..fb3003ed71a0 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3471,7 +3471,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
if ( bUseSpecial )
{
// BIN
- SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_EDITENGINE, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::EDITENGINE, aFlavor );
if ( rxDataObj->isDataFlavorSupported( aFlavor ) )
{
try
@@ -3493,7 +3493,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
if ( !bDone )
{
// RTF
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_RTF, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RTF, aFlavor );
if ( rxDataObj->isDataFlavorSupported( aFlavor ) )
{
try
@@ -3520,7 +3520,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< datatransfer::XTransfer
}
if ( !bDone )
{
- SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aFlavor );
+ SotExchange::GetFormatDataFlavor( SotClipboardFormatId::STRING, aFlavor );
if ( rxDataObj->isDataFlavorSupported( aFlavor ) )
{
try
generated by cgit (git 2.34.1) at 2025-02-02 07:05:20 +0000