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

New commits:
commit effd6814a70cb7e6267af7c2e90e690b962e3e90
Author:     Mike Kaganski <[email protected]>
AuthorDate: Sun Nov 9 22:48:17 2025 +0500
Commit:     Mike Kaganski <[email protected]>
CommitDate: Sun Nov 9 20:05:24 2025 +0100

    An omission from commit 84c1c49d8699f4106168a524ce774f42ef843b1f
    
    ... "Fix Unicode-dependent format names", 2025-11-09.
    
    Change-Id: I87f47be21b0afe9e788d3243f07e85358ec88e1b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193662
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <[email protected]>

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index cc0783303b14..a62b208b3952 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -137,7 +137,7 @@ const DataFlavor* FormatArray_Impl()
         /* 86 LINK_SOURCE*/               { 
u"application/x-openoffice-link-source-xml;windows_formatname=\"Star Link 
Source (XML)\""_ustr, u"Star Link Source (XML)"_ustr, 
cppu::UnoType<Sequence<sal_Int8>>::get() },
         /* 87 EMBEDDED_OBJ*/              { 
u"application/x-openoffice-embedded-obj-xml;windows_formatname=\"Star Embedded 
Object (XML)\""_ustr, u"Star Embedded Object (XML)"_ustr, 
cppu::UnoType<Sequence<sal_Int8>>::get() },
         /* 88 FILECONTENT*/               { 
u"application/x-openoffice-filecontent;windows_formatname=\"FileContents\""_ustr,
 u"FileContents"_ustr, cppu::UnoType<Sequence<sal_Int8>>::get() },
-        /* 89 FILEGRPDESCRIPTOR*/         { 
u"application/x-openoffice-filegrpdescriptor;windows_formatname=\"FileGroupDescriptorW\""_ustr,
 u"FileGroupDescriptor"_ustr, cppu::UnoType<Sequence<sal_Int8>>::get() },
+        /* 89 FILEGRPDESCRIPTOR*/         { 
u"application/x-openoffice-filegrpdescriptor;windows_formatname=\"FileGroupDescriptorW\""_ustr,
 u"FileGroupDescriptorW"_ustr, cppu::UnoType<Sequence<sal_Int8>>::get() },
         /* 90 FILENAME*/                  { 
u"application/x-openoffice-filename;windows_formatname=\"FileNameW\""_ustr, 
u"FileNameW"_ustr, cppu::UnoType<OUString>::get() },
         /* 91 SD_OLE*/                    { 
u"application/x-openoffice-sd-ole;windows_formatname=\"SD-OLE\""_ustr, 
u"SD-OLE"_ustr, cppu::UnoType<Sequence<sal_Int8>>::get() },
         /* 92 EMBEDDED_OBJ_OLE*/          { 
u"application/x-openoffice-embedded-obj-ole;windows_formatname=\"Embedded 
Object\""_ustr, u"Embedded Object"_ustr, 
cppu::UnoType<Sequence<sal_Int8>>::get() },
@@ -152,7 +152,7 @@ const DataFlavor* FormatArray_Impl()
         /*101 NETSCAPE_IMAGE*/            { 
u"application/x-openoffice-netscape-image;windows_formatname=\"Netscape Image 
Format\""_ustr, u"Netscape Image Format"_ustr, 
cppu::UnoType<Sequence<sal_Int8>>::get() },
         /*102 SBA_FORMEXCHANGE*/          { 
u"application/x-openoffice-sba-formexchange;windows_formatname=\"SBA_FORMEXCHANGE\""_ustr,
 u"SBA_FORMEXCHANGE"_ustr, cppu::UnoType<Sequence<sal_Int8>>::get() },
         /*103 SBA_REPORTEXCHANGE*/        { 
u"application/x-openoffice-sba-reportexchange;windows_formatname=\"SBA_REPORTEXCHANGE\""_ustr,
 u"SBA_REPORTEXCHANGE"_ustr, cppu::UnoType<Sequence<sal_Int8>>::get() },
-        /*104 UNIFORMRESOURCELOCATOR*/    { 
u"application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocatorW\""_ustr,
 u"UniformResourceLocator"_ustr, cppu::UnoType<OUString>::get() },
+        /*104 UNIFORMRESOURCELOCATOR*/    { 
u"application/x-openoffice-uniformresourcelocator;windows_formatname=\"UniformResourceLocatorW\""_ustr,
 u"UniformResourceLocatorW"_ustr, cppu::UnoType<OUString>::get() },
         /*105 STARCHARTDOCUMENT_50*/      { 
u"application/x-openoffice-starchartdocument-50;windows_formatname=\"StarChartDocument
 5.0\""_ustr, u"StarChartDocument 5.0"_ustr, 
cppu::UnoType<Sequence<sal_Int8>>::get() },
         /*106 GRAPHOBJ*/                  { 
u"application/x-openoffice-graphobj;windows_formatname=\"Graphic 
Object\""_ustr, u"Graphic Object"_ustr, 
cppu::UnoType<Sequence<sal_Int8>>::get() },
         /*107 STARWRITER_60*/             { MIMETYPE_VND_SUN_XML_WRITER, 
u"Writer 6.0"_ustr, cppu::UnoType<Sequence<sal_Int8>>::get() },

Reply via email to