Kaydet (Commit) 1568e51f authored tarafından Eike Rathke's avatar Eike Rathke

SotClipboardFormatId::STRING_TSVC "Unformatted text [TSV-Calc]", tdf#113571

In preparation to solve tdf#113571 *AND* keeping tdf#32213 fixed
we need two separate unformatted text formats to distinguish
between in-Calc on-cell paste and external or in-cell paste.

Change-Id: Ic81a0c17d0643af2f5f4be50e67b690fd8846388
üst 6dd8b701
...@@ -173,8 +173,9 @@ enum class SotClipboardFormatId : sal_uLong ...@@ -173,8 +173,9 @@ enum class SotClipboardFormatId : sal_uLong
MATHML = 143, MATHML = 143,
JPEG = 144, JPEG = 144,
RICHTEXT = 145, RICHTEXT = 145,
STRING_TSVC = 146,
// the point at which we start allocating "runtime" format IDs // the point at which we start allocating "runtime" format IDs
USER_END = RICHTEXT USER_END = STRING_TSVC
}; };
/** Make it easier to iterate over format IDs */ /** Make it easier to iterate over format IDs */
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#define STR_REPEAT NC_("STR_REPEAT", "~Repeat: ") #define STR_REPEAT NC_("STR_REPEAT", "~Repeat: ")
#define STR_FORMAT_STRING NC_("STR_FORMAT_STRING", "Unformatted text") #define STR_FORMAT_STRING NC_("STR_FORMAT_STRING", "Unformatted text")
#define STR_FORMAT_ID_STRING_TSVC NC_("STR_FORMAT_ID_STRING_TSVC", "Unformatted text [TSV-Calc]")
#define STR_FORMAT_BITMAP NC_("STR_FORMAT_BITMAP", "Bitmap") #define STR_FORMAT_BITMAP NC_("STR_FORMAT_BITMAP", "Bitmap")
#define STR_FORMAT_GDIMETAFILE NC_("STR_FORMAT_GDIMETAFILE", "GDI metafile") #define STR_FORMAT_GDIMETAFILE NC_("STR_FORMAT_GDIMETAFILE", "GDI metafile")
#define STR_FORMAT_RTF NC_("STR_FORMAT_RTF", "Formatted text [RTF]") #define STR_FORMAT_RTF NC_("STR_FORMAT_RTF", "Formatted text [RTF]")
......
...@@ -203,7 +203,8 @@ namespace ...@@ -203,7 +203,8 @@ namespace
/*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*142 SotClipboardFormatId::STARWRITERGLOB_8_TEMPLATE*/ { MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_TEMPLATE_ASCII, "Writer/Global 8 Template", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/*143 SotClipboardFormatId::MATHML*/ { "application/mathml+xml", "MathML", &::cppu::UnoType<const Sequence< sal_Int8 >>::get() }, /*143 SotClipboardFormatId::MATHML*/ { "application/mathml+xml", "MathML", &::cppu::UnoType<const Sequence< sal_Int8 >>::get() },
/*144 SotClipboardFormatId::JPEG*/ { "image/jpeg", "JPEG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() }, /*144 SotClipboardFormatId::JPEG*/ { "image/jpeg", "JPEG Bitmap", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/*145 SotClipboardFormatId::RICHTEXT*/ { "text/richtext", "Richtext Format", &cppu::UnoType<Sequence<sal_Int8>>::get() } /*145 SotClipboardFormatId::RICHTEXT*/ { "text/richtext", "Richtext Format", &cppu::UnoType<Sequence<sal_Int8>>::get() },
/*146 SotClipboardFormatId::STRING_TSVC*/ { "application/x-libreoffice-tsvc", "Text TSV-Calc", &cppu::UnoType<OUString>::get() }
}; };
return &aInstance[0]; return &aInstance[0];
} }
......
...@@ -263,6 +263,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId ) ...@@ -263,6 +263,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId )
{ SotClipboardFormatId::FILEGRPDESCRIPTOR, STR_FORMAT_ID_FILEGRPDESCRIPTOR }, { SotClipboardFormatId::FILEGRPDESCRIPTOR, STR_FORMAT_ID_FILEGRPDESCRIPTOR },
{ SotClipboardFormatId::HTML_NO_COMMENT, STR_FORMAT_ID_HTML_NO_COMMENT }, { SotClipboardFormatId::HTML_NO_COMMENT, STR_FORMAT_ID_HTML_NO_COMMENT },
{ SotClipboardFormatId::RICHTEXT, STR_FORMAT_ID_RICHTEXT }, { SotClipboardFormatId::RICHTEXT, STR_FORMAT_ID_RICHTEXT },
{ SotClipboardFormatId::STRING_TSVC, STR_FORMAT_ID_STRING_TSVC },
}; };
const char* pResId = nullptr; const char* pResId = nullptr;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment