[Libreoffice-commits] core.git: cui/source include/svx sc/source svx/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Oct 17 16:12:59 UTC 2019
cui/source/options/opthtml.cxx | 2 -
cui/source/options/opthtml.hxx | 2 -
include/svx/txencbox.hxx | 12 +++++------
sc/source/ui/dbgui/scuiasciiopt.cxx | 2 -
sc/source/ui/dbgui/scuiimoptdlg.cxx | 4 +--
sc/source/ui/inc/scuiasciiopt.hxx | 4 +--
sc/source/ui/inc/scuiimoptdlg.hxx | 8 +++----
svx/source/dialog/txencbox.cxx | 38 ++++++++++++++++++------------------
sw/source/ui/dialog/ascfldlg.cxx | 2 -
sw/source/uibase/inc/ascfldlg.hxx | 2 -
10 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit 73df133143daaff14c364468598bb250db6aecb1
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 17 12:43:52 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 17 18:11:09 2019 +0200
rename TextEncodingBox back to SvxTextEncodingBox
Change-Id: I466a56a3b3204f960b9c6ce2dac836879112f5ab
Reviewed-on: https://gerrit.libreoffice.org/80945
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index cfe4dc78473e..fca286ddbb7a 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -38,7 +38,7 @@ OfaHtmlTabPage::OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* p
, m_xStarBasicWarningCB(m_xBuilder->weld_check_button("starbasicwarning"))
, m_xPrintExtensionCB(m_xBuilder->weld_check_button("printextension"))
, m_xSaveGrfLocalCB(m_xBuilder->weld_check_button("savegrflocal"))
- , m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box("charset")))
+ , m_xCharSetLB(new SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
{
// replace placeholder with UI string from language list
OUString aText(m_xNumbersEnglishUSCB->get_label());
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 96131571fcd9..0468518f1638 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -41,7 +41,7 @@ class OfaHtmlTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xStarBasicWarningCB;
std::unique_ptr<weld::CheckButton> m_xPrintExtensionCB;
std::unique_ptr<weld::CheckButton> m_xSaveGrfLocalCB;
- std::unique_ptr<TextEncodingBox> m_xCharSetLB;
+ std::unique_ptr<SvxTextEncodingBox> m_xCharSetLB;
DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index e5a7b250f1d2..66e2d633ee8c 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -23,15 +23,15 @@
#include <rtl/textenc.h>
#include <svx/svxdllapi.h>
-class SVX_DLLPUBLIC TextEncodingBox
+class SVX_DLLPUBLIC SvxTextEncodingBox
{
private:
std::unique_ptr<weld::ComboBox> m_xControl;
public:
- TextEncodingBox(std::unique_ptr<weld::ComboBox> pControl);
+ SvxTextEncodingBox(std::unique_ptr<weld::ComboBox> pControl);
- ~TextEncodingBox();
+ ~SvxTextEncodingBox();
/** Fill with all known encodings but exclude those matching one or more
given flags as defined in rtl/tencinfo.h
@@ -96,15 +96,15 @@ public:
void hide() { m_xControl->hide(); }
};
-class SVX_DLLPUBLIC TextEncodingTreeView
+class SVX_DLLPUBLIC SvxTextEncodingTreeView
{
private:
std::unique_ptr<weld::TreeView> m_xControl;
public:
- TextEncodingTreeView(std::unique_ptr<weld::TreeView> pControl);
+ SvxTextEncodingTreeView(std::unique_ptr<weld::TreeView> pControl);
- ~TextEncodingTreeView();
+ ~SvxTextEncodingTreeView();
/** Fill with all known encodings but exclude those matching one or more
given flags as defined in rtl/tencinfo.h
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 96f69f03139c..24cc8f3d46eb 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -294,7 +294,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa
, meCall(eCall)
, mbDetectSpaceSep(eCall != SC_TEXTTOCOLUMNS)
, mxFtCharSet(m_xBuilder->weld_label("textcharset"))
- , mxLbCharSet(new TextEncodingBox(m_xBuilder->weld_combo_box("charset")))
+ , mxLbCharSet(new SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
, mxFtCustomLang(m_xBuilder->weld_label("textlanguage"))
, mxLbCustomLang(new LanguageBox(m_xBuilder->weld_combo_box("language")))
, mxFtRow(m_xBuilder->weld_label("textfromrow"))
diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index 03fce13e6fbc..2ddbd56c7afe 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -122,8 +122,8 @@ ScImportOptionsDlg::ScImportOptionsDlg(weld::Window* pParent, bool bAscii,
, m_xCbQuoteAll(m_xBuilder->weld_check_button("quoteall"))
, m_xCbFixed(m_xBuilder->weld_check_button("fixedwidth"))
, m_xBtnOk(m_xBuilder->weld_button("ok"))
- , m_xLbCharset(new TextEncodingBox(m_xBuilder->weld_combo_box("charsetdropdown")))
- , m_xTvCharset(new TextEncodingTreeView(m_xBuilder->weld_tree_view("charsetlist")))
+ , m_xLbCharset(new SvxTextEncodingBox(m_xBuilder->weld_combo_box("charsetdropdown")))
+ , m_xTvCharset(new SvxTextEncodingTreeView(m_xBuilder->weld_tree_view("charsetlist")))
{
if (bAscii)
{
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index f37e358f8437..0a4dcb98043b 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -35,7 +35,7 @@ class RadioButton;
class NumericField;
class ScCsvTableBox;
-class TextEncodingBox;
+class SvxTextEncodingBox;
class ScImportAsciiDlg : public weld::GenericDialogController
{
@@ -55,7 +55,7 @@ class ScImportAsciiDlg : public weld::GenericDialogController
bool mbDetectSpaceSep; /// Whether to detect a possible space separator.
std::unique_ptr<weld::Label> mxFtCharSet;
- std::unique_ptr<TextEncodingBox> mxLbCharSet;
+ std::unique_ptr<SvxTextEncodingBox> mxLbCharSet;
std::unique_ptr<weld::Label> mxFtCustomLang;
std::unique_ptr<LanguageBox> mxLbCustomLang;
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx
index b100410bf620..a3c55ccddfcd 100644
--- a/sc/source/ui/inc/scuiimoptdlg.hxx
+++ b/sc/source/ui/inc/scuiimoptdlg.hxx
@@ -24,8 +24,8 @@
class ScDelimiterTable;
class ScImportOptions;
-class TextEncodingBox;
-class TextEncodingTreeView;
+class SvxTextEncodingBox;
+class SvxTextEncodingTreeView;
class ScImportOptionsDlg : public weld::GenericDialogController
{
@@ -61,8 +61,8 @@ private:
std::unique_ptr<weld::CheckButton> m_xCbQuoteAll;
std::unique_ptr<weld::CheckButton> m_xCbFixed;
std::unique_ptr<weld::Button> m_xBtnOk;
- std::unique_ptr<TextEncodingBox> m_xLbCharset;
- std::unique_ptr<TextEncodingTreeView> m_xTvCharset;
+ std::unique_ptr<SvxTextEncodingBox> m_xLbCharset;
+ std::unique_ptr<SvxTextEncodingTreeView> m_xTvCharset;
private:
sal_uInt16 GetCodeFromCombo( const weld::ComboBox& rEd ) const;
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 017950da6425..290e56359db9 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -96,7 +96,7 @@ namespace
}
}
-void TextEncodingBox::FillFromDbTextEncodingMap(
+void SvxTextEncodingBox::FillFromDbTextEncodingMap(
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags )
{
m_xControl->freeze();
@@ -106,7 +106,7 @@ void TextEncodingBox::FillFromDbTextEncodingMap(
m_xControl->thaw();
}
-void TextEncodingTreeView::FillFromDbTextEncodingMap(
+void SvxTextEncodingTreeView::FillFromDbTextEncodingMap(
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags )
{
m_xControl->freeze();
@@ -116,23 +116,23 @@ void TextEncodingTreeView::FillFromDbTextEncodingMap(
m_xControl->thaw();
}
-TextEncodingBox::TextEncodingBox(std::unique_ptr<weld::ComboBox> pControl)
+SvxTextEncodingBox::SvxTextEncodingBox(std::unique_ptr<weld::ComboBox> pControl)
: m_xControl(std::move(pControl))
{
m_xControl->make_sorted();
}
-TextEncodingTreeView::TextEncodingTreeView(std::unique_ptr<weld::TreeView> pControl)
+SvxTextEncodingTreeView::SvxTextEncodingTreeView(std::unique_ptr<weld::TreeView> pControl)
: m_xControl(std::move(pControl))
{
m_xControl->make_sorted();
}
-TextEncodingBox::~TextEncodingBox()
+SvxTextEncodingBox::~SvxTextEncodingBox()
{
}
-TextEncodingTreeView::~TextEncodingTreeView()
+SvxTextEncodingTreeView::~SvxTextEncodingTreeView()
{
}
@@ -185,7 +185,7 @@ namespace
}
}
-void TextEncodingBox::FillFromTextEncodingTable(
+void SvxTextEncodingBox::FillFromTextEncodingTable(
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
@@ -199,7 +199,7 @@ void TextEncodingBox::FillFromTextEncodingTable(
m_xControl->thaw();
}
-void TextEncodingTreeView::FillFromTextEncodingTable(
+void SvxTextEncodingTreeView::FillFromTextEncodingTable(
bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
@@ -213,44 +213,44 @@ void TextEncodingTreeView::FillFromTextEncodingTable(
m_xControl->thaw();
}
-void TextEncodingBox::FillWithMimeAndSelectBest()
+void SvxTextEncodingBox::FillWithMimeAndSelectBest()
{
FillFromTextEncodingTable( false, 0xffffffff, RTL_TEXTENCODING_INFO_MIME );
rtl_TextEncoding nEnc = SvtSysLocale::GetBestMimeEncoding();
SelectTextEncoding( nEnc );
}
-void TextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
+void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
const OUString& rEntry )
{
m_xControl->append(OUString::number(nEnc), rEntry);
}
-void TextEncodingTreeView::InsertTextEncoding( const rtl_TextEncoding nEnc,
+void SvxTextEncodingTreeView::InsertTextEncoding( const rtl_TextEncoding nEnc,
const OUString& rEntry )
{
m_xControl->append(OUString::number(nEnc), rEntry);
}
-void TextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc )
+void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc )
{
const OUString& rEntry = SvxTextEncodingTable::GetTextString(nEnc);
if (!rEntry.isEmpty())
InsertTextEncoding( nEnc, rEntry );
else
- SAL_WARN( "svx.dialog", "TextEncodingBox::InsertTextEncoding: no resource string for text encoding: " << static_cast<sal_Int32>( nEnc ) );
+ SAL_WARN( "svx.dialog", "SvxTextEncodingBox::InsertTextEncoding: no resource string for text encoding: " << static_cast<sal_Int32>( nEnc ) );
}
-void TextEncodingTreeView::InsertTextEncoding( const rtl_TextEncoding nEnc )
+void SvxTextEncodingTreeView::InsertTextEncoding( const rtl_TextEncoding nEnc )
{
const OUString& rEntry = SvxTextEncodingTable::GetTextString(nEnc);
if (!rEntry.isEmpty())
InsertTextEncoding( nEnc, rEntry );
else
- SAL_WARN( "svx.dialog", "TextEncodingTreeView::InsertTextEncoding: no resource string for text encoding: " << static_cast<sal_Int32>( nEnc ) );
+ SAL_WARN( "svx.dialog", "SvxTextEncodingTreeView::InsertTextEncoding: no resource string for text encoding: " << static_cast<sal_Int32>( nEnc ) );
}
-rtl_TextEncoding TextEncodingBox::GetSelectTextEncoding() const
+rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
{
OUString sId(m_xControl->get_active_id());
if (!sId.isEmpty())
@@ -259,7 +259,7 @@ rtl_TextEncoding TextEncodingBox::GetSelectTextEncoding() const
return RTL_TEXTENCODING_DONTKNOW;
}
-rtl_TextEncoding TextEncodingTreeView::GetSelectTextEncoding() const
+rtl_TextEncoding SvxTextEncodingTreeView::GetSelectTextEncoding() const
{
OUString sId(m_xControl->get_selected_id());
if (!sId.isEmpty())
@@ -268,12 +268,12 @@ rtl_TextEncoding TextEncodingTreeView::GetSelectTextEncoding() const
return RTL_TEXTENCODING_DONTKNOW;
}
-void TextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc )
+void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc )
{
m_xControl->set_active_id(OUString::number(nEnc));
}
-void TextEncodingTreeView::SelectTextEncoding( const rtl_TextEncoding nEnc )
+void SvxTextEncodingTreeView::SelectTextEncoding( const rtl_TextEncoding nEnc )
{
m_xControl->select_id(OUString::number(nEnc));
}
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index a37be3c24dff..9aaeed93a29f 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -62,7 +62,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh,
SvStream* pStream )
: SfxDialogController(pParent, "modules/swriter/ui/asciifilterdialog.ui", "AsciiFilterDialog")
, m_bSaveLineStatus(true)
- , m_xCharSetLB(new TextEncodingBox(m_xBuilder->weld_combo_box("charset")))
+ , m_xCharSetLB(new SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset")))
, m_xFontFT(m_xBuilder->weld_label("fontft"))
, m_xFontLB(m_xBuilder->weld_combo_box("font"))
, m_xLanguageFT(m_xBuilder->weld_label("languageft"))
diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx
index 663972c6cc93..31b214af2747 100644
--- a/sw/source/uibase/inc/ascfldlg.hxx
+++ b/sw/source/uibase/inc/ascfldlg.hxx
@@ -33,7 +33,7 @@ class SwAsciiFilterDlg : public SfxDialogController
bool m_bSaveLineStatus;
OUString m_sExtraData;
- std::unique_ptr<TextEncodingBox> m_xCharSetLB;
+ std::unique_ptr<SvxTextEncodingBox> m_xCharSetLB;
std::unique_ptr<weld::Label> m_xFontFT;
std::unique_ptr<weld::ComboBox> m_xFontLB;
std::unique_ptr<weld::Label> m_xLanguageFT;
More information about the Libreoffice-commits
mailing list