[Libreoffice-commits] core.git: sot/source

Noel Grandin noel at peralex.com
Thu Aug 6 04:57:08 PDT 2015


 sot/source/base/exchange.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f7d65b04126b614bbb0b1bc0e7b6309900d4dc8d
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Aug 6 13:46:36 2015 +0200

    tdf#93018 - Copying forms not working anymore
    
    Bug introduced by commit fb14be5f8f74f83ba89e15f891ddf1f753dcc62f
    "create new 'enum class' SotClipboardFormatId to unify types"
    
    Change-Id: I3febb927f658ac27d2b864869775db3b71940a5c

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 599525d..78a7d13 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -254,16 +254,14 @@ SotClipboardFormatId SotExchange::RegisterFormatName( const OUString& rName )
             return static_cast<SotClipboardFormatId>(i + static_cast<int>(SotClipboardFormatId::USER_END) + 1);
     }
 
-    // nMax ist der neue Platz
     DataFlavor* pNewFlavor = new DataFlavor;
-
     pNewFlavor->MimeType = rName;
     pNewFlavor->HumanPresentableName = rName;
     pNewFlavor->DataType = cppu::UnoType<OUString>::get();
 
     rL.push_back( pNewFlavor );
 
-    return static_cast<SotClipboardFormatId>(static_cast<int>(nMax) + static_cast<int>(SotClipboardFormatId::USER_END) + 1);
+    return static_cast<SotClipboardFormatId>(static_cast<int>(rL.size()-1) + static_cast<int>(SotClipboardFormatId::USER_END) + 1);
 }
 
 SotClipboardFormatId SotExchange::RegisterFormatMimeType( const OUString& rMimeType )


More information about the Libreoffice-commits mailing list