ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Related tdf#150928: replace character set by encoding (sc/part 1)

Browse Source 
Change-Id: Ic4c289021a924b932d44c443a808f84b35f3f600
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/209069
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Julien Nabet
2026-08-11 12:09:57 +02:00
parent 4dbac17a14
commit e375f54fe7
5 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc/inc/strings.hrc
+1 -1
View File
@@ -78,7 +78,7 @@
#define SCSTR_VALID_RANGE NC_("SCSTR_VALID_RANGE", "~Source")
#define SCSTR_VALID_LIST NC_("SCSTR_VALID_LIST", "~Entries")
// for dialogues:
#define SCSTR_CHARSET_USER NC_("SCSTR_CHARSET_USER", "System")
#define SCSTR_ENCODING_USER NC_("SCSTR_ENCODING_USER", "System")
#define SCSTR_COLUMN_USER NC_("SCSTR_COLUMN_USER", "Standard;Text;Date (DMY);Date (MDY);Date (YMD);US English;Skip")
#define SCSTR_FIELDSEP_TAB NC_("SCSTR_FIELDSEP_TAB", "Tab")
#define SCSTR_FIELDSEP_SPACE NC_("SCSTR_FIELDSEP_SPACE", "space")
sc/source/ui/dbgui/scuiasciiopt.cxx
+42 -42
View File
@@ -260,12 +260,12 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view aD
, mnStreamInitPos(mnStreamPos)
, mnRowPosCount(0)
, mcTextSep(ScAsciiOptions::cDefaultTextSep)
, meDetectedCharSet(RTL_TEXTENCODING_DONTKNOW)
, mbCharSetDetect(true)
, meDetectedEncoding(RTL_TEXTENCODING_DONTKNOW)
, mbEncodingDetect(true)
, meCall(eCall)
, mxFtCharSet(m_xBuilder->weld_label(u"textcharset"_ustr))
, mxLbCharSet(new SvxTextEncodingBox(m_xBuilder->weld_combo_box(u"charset"_ustr)))
, mxFtDetectedCharSet(m_xBuilder->weld_label(u"textdetectedcharset"_ustr))
, mxFtEncoding(m_xBuilder->weld_label(u"textencoding"_ustr))
, mxLbEncoding(new SvxTextEncodingBox(m_xBuilder->weld_combo_box(u"encoding"_ustr)))
, mxFtDetectedEncoding(m_xBuilder->weld_label(u"textdetectedencoding"_ustr))
, mxFtCustomLang(m_xBuilder->weld_label(u"textlanguage"_ustr))
, mxLbCustomLang(new SvxLanguageBox(m_xBuilder->weld_combo_box(u"language"_ustr)))
, mxFtRow(m_xBuilder->weld_label(u"textfromrow"_ustr))
@@ -376,14 +376,14 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view aD
// Detect character set only once and then use it for "Detect" option.
mpDatStream->DetectEncoding();
meDetectedCharSet = mpDatStream->GetStreamEncoding();
if (meDetectedCharSet == RTL_TEXTENCODING_DONTKNOW)
meDetectedEncoding = mpDatStream->GetStreamEncoding();
if (meDetectedEncoding == RTL_TEXTENCODING_DONTKNOW)
{
meDetectedCharSet = osl_getThreadTextEncoding();
meDetectedEncoding = osl_getThreadTextEncoding();
// Prefer UTF-8, as UTF-16 would have already been detected from the stream.
// This gives a better chance that the file is going to be opened correctly.
if ( meDetectedCharSet == RTL_TEXTENCODING_UNICODE && mpDatStream )
meDetectedCharSet = RTL_TEXTENCODING_UTF8;
if ( meDetectedEncoding == RTL_TEXTENCODING_UNICODE && mpDatStream )
meDetectedEncoding = RTL_TEXTENCODING_UTF8;
}
if (bIsTSV)
@@ -419,12 +419,12 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view aD
// *** text encoding ListBox ***
// all encodings allowed, including Unicode, but subsets are excluded
mxLbCharSet->FillFromTextEncodingTable( true );
mxLbEncoding->FillFromTextEncodingTable( true );
// Insert one "SYSTEM" entry for compatibility in AsciiOptions and system
// independent document linkage.
mxLbCharSet->InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, ScResId( SCSTR_CHARSET_USER ) );
mxLbEncoding->InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, ScResId( SCSTR_ENCODING_USER ) );
// Insert one for detecting charset.
mxLbCharSet->InsertTextEncoding( RTL_TEXTENCODING_USER_DETECTED, "- " + ScResId( SCSTR_AUTOMATIC ) + " -" );
mxLbEncoding->InsertTextEncoding( RTL_TEXTENCODING_USER_DETECTED, "- " + ScResId( SCSTR_AUTOMATIC ) + " -" );
// Clipboard is always Unicode, and TextToColumns doesn't use encoding.
if (meCall != SC_IMPORTFILE)
@@ -432,10 +432,10 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view aD
else if (eEncoding == RTL_TEXTENCODING_DONTKNOW)
eEncoding = RTL_TEXTENCODING_USER_DETECTED;
mxLbCharSet->SelectTextEncoding(eEncoding);
mxLbEncoding->SelectTextEncoding(eEncoding);
SetSelectedCharSet();
mxLbCharSet->connect_changed( LINK( this, ScImportAsciiDlg, CharSetHdl ) );
SetSelectedEncoding();
mxLbEncoding->connect_changed( LINK( this, ScImportAsciiDlg, EncodingHdl ) );
mxLbCustomLang->SetLanguageList(
SvxLanguageListFlags::ALL | SvxLanguageListFlags::ONLY_KNOWN, false, false);
@@ -480,8 +480,8 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, std::u16string_view aD
{
m_xBuilder->weld_frame(u"frame1"_ustr)->hide(); // the whole "Import" section
mxFtCharSet->set_sensitive(false);
mxLbCharSet->set_sensitive(false);
mxFtEncoding->set_sensitive(false);
mxLbEncoding->set_sensitive(false);
mxFtCustomLang->set_sensitive(false);
mxLbCustomLang->set_active_id(LANGUAGE_SYSTEM);
mxLbCustomLang->set_sensitive(false);
@@ -587,8 +587,8 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText, sal_Unicode& r
void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt )
{
rOpt.SetCharSet( meCharSet );
rOpt.SetCharSetSystem( mbCharSetSystem );
rOpt.SetCharSet( meEncoding );
rOpt.SetCharSetSystem( mbEncodingSystem );
rOpt.SetLanguage(mxLbCustomLang->get_active_id());
rOpt.SetFixedLen( mxRbFixed->get_active() );
rOpt.SetStartRow( mxNfRow->get_value() );
@@ -626,7 +626,7 @@ void ScImportAsciiDlg::SaveParameters()
mxCkbQuotedAsText->get_active(), mxCkbDetectNumber->get_active(), mxCkbDetectScientificNumber->get_active(),
mxRbFixed->get_active() ? FIXED : (mxRbDetectSep->get_active() ? DETECT_SEPARATOR : SEPARATOR),
mxNfRow->get_value(),
mxLbCharSet->GetSelectTextEncoding(),
mxLbEncoding->GetSelectTextEncoding(),
static_cast<sal_uInt16>(mxLbCustomLang->get_active_id()),
mxCkbSkipEmptyCells->get_active(), mxCkbRemoveSpace->get_active(),
mxCkbEvaluateFormulas->get_active());
@@ -676,26 +676,26 @@ void ScImportAsciiDlg::SetSeparators( sal_Unicode cSep )
}
}
void ScImportAsciiDlg::SetSelectedCharSet()
void ScImportAsciiDlg::SetSelectedEncoding()
{
rtl_TextEncoding eOldCharSet = meCharSet;
meCharSet = mxLbCharSet->GetSelectTextEncoding();
mbCharSetDetect = (meCharSet == RTL_TEXTENCODING_USER_DETECTED);
mbCharSetSystem = (meCharSet == RTL_TEXTENCODING_DONTKNOW);
if (mbCharSetDetect)
rtl_TextEncoding eOldEncoding = meEncoding;
meEncoding = mxLbEncoding->GetSelectTextEncoding();
mbEncodingDetect = (meEncoding == RTL_TEXTENCODING_USER_DETECTED);
mbEncodingSystem = (meEncoding == RTL_TEXTENCODING_DONTKNOW);
if (mbEncodingDetect)
{
meCharSet = meDetectedCharSet;
mxFtDetectedCharSet->set_label(SvxTextEncodingTable::GetTextString(meCharSet));
meEncoding = meDetectedEncoding;
mxFtDetectedEncoding->set_label(SvxTextEncodingTable::GetTextString(meEncoding));
}
else if( mbCharSetSystem )
else if( mbEncodingSystem )
{
meCharSet = osl_getThreadTextEncoding();
mxFtDetectedCharSet->set_label(SvxTextEncodingTable::GetTextString(meCharSet));
meEncoding = osl_getThreadTextEncoding();
mxFtDetectedEncoding->set_label(SvxTextEncodingTable::GetTextString(meEncoding));
}
else
mxFtDetectedCharSet->set_label(SvxTextEncodingTable::GetTextString(meCharSet));
mxFtDetectedEncoding->set_label(SvxTextEncodingTable::GetTextString(meEncoding));
if (eOldCharSet != meCharSet)
if (eOldEncoding != meEncoding)
DetectCsvSeparators();
RbSepFix();
@@ -768,7 +768,7 @@ void ScImportAsciiDlg::SetupSeparatorCtrls()
void ScImportAsciiDlg::DetectCsvSeparators()
{
mpDatStream->Seek(mnStreamInitPos);
SfxObjectShell::DetectCsvSeparators(*mpDatStream, meCharSet, maDetectedFieldSeps, mcTextSep);
SfxObjectShell::DetectCsvSeparators(*mpDatStream, meEncoding, maDetectedFieldSeps, mcTextSep);
mpDatStream->Seek(mnStreamPos);
}
@@ -776,7 +776,7 @@ void ScImportAsciiDlg::UpdateVertical()
{
mnRowPosCount = 0;
if (mpDatStream)
mpDatStream->SetStreamEncoding(meCharSet);
mpDatStream->SetStreamEncoding(meEncoding);
}
void ScImportAsciiDlg::RbSepFix()
@@ -870,15 +870,15 @@ void ScImportAsciiDlg::SeparatorHdl(const weld::Widget* pCtrl)
mxTableBox->GetGrid().Execute( CSVCMD_NEWCELLTEXTS );
}
IMPL_LINK_NOARG(ScImportAsciiDlg, CharSetHdl, weld::ComboBox&, void)
IMPL_LINK_NOARG(ScImportAsciiDlg, EncodingHdl, weld::ComboBox&, void)
{
if (mxLbCharSet->get_active() != -1)
if (mxLbEncoding->get_active() != -1)
{
weld::WaitObject aWaitObj(m_xDialog.get());
rtl_TextEncoding eOldCharSet = meCharSet;
SetSelectedCharSet();
// switching char-set invalidates 8bit -> String conversions
if (eOldCharSet != meCharSet)
rtl_TextEncoding eOldEncoding = meEncoding;
SetSelectedEncoding();
// switching encoding invalidates 8bit -> String conversions
if (eOldEncoding != meEncoding)
UpdateVertical();
mxTableBox->GetGrid().Execute( CSVCMD_NEWCELLTEXTS );
sc/source/ui/inc/scuiasciiopt.hxx
+10 -10
View File
@@ -49,15 +49,15 @@ class ScImportAsciiDlg : public weld::GenericDialogController
OUString maDetectedFieldSeps; // detected field seps
sal_Unicode mcTextSep;
rtl_TextEncoding meCharSet; /// Selected char set.
rtl_TextEncoding meDetectedCharSet; /// This is computed only once at initialization, so store it.
bool mbCharSetSystem; /// Is System char set selected?
bool mbCharSetDetect; /// Should we autodetect character set ?
rtl_TextEncoding meEncoding; /// Selected encoding.
rtl_TextEncoding meDetectedEncoding; /// This is computed only once at initialization, so store it.
bool mbEncodingSystem; /// Is System encoding selected?
bool mbEncodingDetect; /// Should we autodetect encoding?
ScImportAsciiCall meCall; /// How the dialog is called (see asciiopt.hxx)
std::unique_ptr<weld::Label> mxFtCharSet;
std::unique_ptr<SvxTextEncodingBox> mxLbCharSet;
std::unique_ptr<weld::Label> mxFtDetectedCharSet;
std::unique_ptr<weld::Label> mxFtEncoding;
std::unique_ptr<SvxTextEncodingBox> mxLbEncoding;
std::unique_ptr<weld::Label> mxFtDetectedEncoding;
std::unique_ptr<weld::Label> mxFtCustomLang;
std::unique_ptr<SvxLanguageBox> mxLbCustomLang;
@@ -102,8 +102,8 @@ public:
void SaveParameters();
private:
/** Sets the selected char set data to meCharSet and mbCharSetSystem. */
void SetSelectedCharSet();
/** Sets the selected char set data to meEncoding and mbEncodingSystem. */
void SetSelectedEncoding();
/** Set separators in ui from maFieldSeparators or an optionally defined
separator. */
void SetSeparators( sal_Unicode cSep );
@@ -120,7 +120,7 @@ private:
inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos
void RbSepFix();
DECL_LINK( CharSetHdl, weld::ComboBox&, void );
DECL_LINK( EncodingHdl, weld::ComboBox&, void );
DECL_LINK( FirstRowHdl, weld::SpinButton&, void );
DECL_LINK( RbSepFixHdl, weld::Toggleable&, void );
DECL_LINK(SeparatorEditHdl, weld::TextWidget&, void);
sc/uiconfig/scalc/ui/textimportcsv.ui
+8 -8
View File
@@ -113,12 +113,12 @@
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="textcharset">
<object class="GtkLabel" id="textencoding">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes" context="textimportcsv|textcharset">Ch_aracter set:</property>
<property name="label" translatable="yes" context="textimportcsv|textencoding">E_ncoding:</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">charset</property>
<property name="mnemonic-widget">encoding</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -155,12 +155,12 @@
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="charset">
<object class="GtkComboBoxText" id="encoding">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child internal-child="accessible">
<object class="AtkObject" id="charset-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|charset">Specifies the character set to be used in the imported file.</property>
<object class="AtkObject" id="encoding-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="textimportcsv|extended_tip|encoding">Specifies the encoding to be used in the imported file.</property>
</object>
</child>
</object>
@@ -170,11 +170,11 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="textdetectedcharset">
<object class="GtkLabel" id="textdetectedencoding">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="no" context="textimportcsv|textcharset"></property>
<property name="label" translatable="no" context="textimportcsv|textencoding"></property>
</object>
<packing>
<property name="left-attach">1</property>
solenv/sanitizers/ui/modules/scalc.suppr
+1 -1
View File
@@ -156,7 +156,7 @@ sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_FORMAT'] orp
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_FIELD'] orphan-label
sc/uiconfig/scalc/ui/protectsheetdlg.ui://GtkLabel[@id='useautofilter'] orphan-label
sc/uiconfig/scalc/ui/protectsheetdlg.ui://GtkLabel[@id='usepivot'] orphan-label
sc/uiconfig/scalc/ui/textimportcsv.ui://GtkLabel[@id='textdetectedcharset'] orphan-label
sc/uiconfig/scalc/ui/textimportcsv.ui://GtkLabel[@id='textdetectedencoding'] orphan-label
sc/uiconfig/scalc/ui/notebookbar.ui://GtkMenuItem[@id='Menu-Extension-PackageManagerDialog'] button-no-label
sc/uiconfig/scalc/ui/notebookbar.ui://GtkMenuItem[@id='MenuData-DataSort'] button-no-label
sc/uiconfig/scalc/ui/notebookbar.ui://GtkMenuItem[@id='MenuData-SortAscending'] button-no-label