summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-14 15:07:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-17 15:11:47 +0200
commit76c7cabc42a239dbaf9e72122d36fb213e5a3555 (patch)
tree94eac2ae99855b7410168ad4f7be9ea9a8a02d60 /filter
parent60a23d5d5f0963cd9bea7711ff4336418e3d6392 (diff)
rename to weld::ComboBox are they are not text only now
Change-Id: Ice26d1fd2ad97a6959c6916fef428777efea9c2d Reviewed-on: https://gerrit.libreoffice.org/60500 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/pdf/impdialog.cxx6
-rw-r--r--filter/source/pdf/impdialog.hxx6
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.cxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagebasic.hxx2
-rw-r--r--filter/source/xsltdialog/xmlfiltertabpagexslt.cxx6
5 files changed, 11 insertions, 11 deletions
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index bbedad6c6f80..b4ff929d34d6 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -462,12 +462,12 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemS
, mxQualityFrame(m_xBuilder->weld_widget("qualityframe"))
, mxNfQuality(m_xBuilder->weld_metric_spin_button("quality", FUNIT_PERCENT))
, mxCbReduceImageResolution(m_xBuilder->weld_check_button("reduceresolution"))
- , mxCoReduceImageResolution(m_xBuilder->weld_combo_box_text("resolution"))
+ , mxCoReduceImageResolution(m_xBuilder->weld_combo_box("resolution"))
, mxCbPDFA1b(m_xBuilder->weld_check_button("pdfa"))
, mxCbTaggedPDF(m_xBuilder->weld_check_button("tagged"))
, mxCbExportFormFields(m_xBuilder->weld_check_button("forms"))
, mxFormsFrame(m_xBuilder->weld_widget("formsframe"))
- , mxLbFormsFormat(m_xBuilder->weld_combo_box_text("format"))
+ , mxLbFormsFormat(m_xBuilder->weld_combo_box("format"))
, mxCbAllowDuplicateFieldNames(m_xBuilder->weld_check_button("allowdups"))
, mxCbExportBookmarks(m_xBuilder->weld_check_button("bookmarks"))
, mxCbExportHiddenSlides(m_xBuilder->weld_check_button("hiddenpages"))
@@ -1458,7 +1458,7 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(TabPageParent pParent, const SfxItemS
, mxEdSignLocation(m_xBuilder->weld_entry("location"))
, mxEdSignContactInfo(m_xBuilder->weld_entry("contact"))
, mxEdSignReason(m_xBuilder->weld_entry("reason"))
- , mxLBSignTSA(m_xBuilder->weld_combo_box_text("tsa"))
+ , mxLBSignTSA(m_xBuilder->weld_combo_box("tsa"))
{
mxPbSignCertSelect->set_sensitive(true);
mxPbSignCertSelect->connect_clicked(LINK(this, ImpPDFTabSigningPage, ClickmaPbSignCertSelect));
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index b2b0073a0775..32ce705a0ca7 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -189,12 +189,12 @@ class ImpPDFTabGeneralPage : public SfxTabPage
std::unique_ptr<weld::Widget> mxQualityFrame;
std::unique_ptr<weld::MetricSpinButton> mxNfQuality;
std::unique_ptr<weld::CheckButton> mxCbReduceImageResolution;
- std::unique_ptr<weld::ComboBoxText> mxCoReduceImageResolution;
+ std::unique_ptr<weld::ComboBox> mxCoReduceImageResolution;
std::unique_ptr<weld::CheckButton> mxCbPDFA1b;
std::unique_ptr<weld::CheckButton> mxCbTaggedPDF;
std::unique_ptr<weld::CheckButton> mxCbExportFormFields;
std::unique_ptr<weld::Widget> mxFormsFrame;
- std::unique_ptr<weld::ComboBoxText> mxLbFormsFormat;
+ std::unique_ptr<weld::ComboBox> mxLbFormsFormat;
std::unique_ptr<weld::CheckButton> mxCbAllowDuplicateFieldNames;
std::unique_ptr<weld::CheckButton> mxCbExportBookmarks;
std::unique_ptr<weld::CheckButton> mxCbExportHiddenSlides;
@@ -394,7 +394,7 @@ class ImpPDFTabSigningPage : public SfxTabPage
std::unique_ptr<weld::Entry> mxEdSignLocation;
std::unique_ptr<weld::Entry> mxEdSignContactInfo;
std::unique_ptr<weld::Entry> mxEdSignReason;
- std::unique_ptr<weld::ComboBoxText> mxLBSignTSA;
+ std::unique_ptr<weld::ComboBox> mxLBSignTSA;
DECL_LINK(ClickmaPbSignCertSelect, weld::Button&, void);
DECL_LINK(ClickmaPbSignCertClear, weld::Button&, void);
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
index 69bb87882fa6..7b6e519c813f 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx
@@ -27,7 +27,7 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic(weld::Widget* pPage)
: m_xBuilder(Application::CreateBuilder(pPage, "filter/ui/xmlfiltertabpagegeneral.ui"))
, m_xContainer(m_xBuilder->weld_widget("XmlFilterTabPageGeneral"))
, m_xEDFilterName(m_xBuilder->weld_entry("filtername"))
- , m_xCBApplication(m_xBuilder->weld_combo_box_text("application"))
+ , m_xCBApplication(m_xBuilder->weld_combo_box("application"))
, m_xEDInterfaceName(m_xBuilder->weld_entry("interfacename"))
, m_xEDExtension(m_xBuilder->weld_entry("extension"))
, m_xEDDescription(m_xBuilder->weld_text_view("description"))
diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
index 22e2787ac554..e3b96e51550c 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx
@@ -35,7 +35,7 @@ public:
std::unique_ptr<weld::Builder> m_xBuilder;
std::unique_ptr<weld::Widget> m_xContainer;
std::unique_ptr<weld::Entry> m_xEDFilterName;
- std::unique_ptr<weld::ComboBoxText> m_xCBApplication;
+ std::unique_ptr<weld::ComboBox> m_xCBApplication;
std::unique_ptr<weld::Entry> m_xEDInterfaceName;
std::unique_ptr<weld::Entry> m_xEDExtension;
std::unique_ptr<weld::TextView> m_xEDDescription;
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 6c5a12db9b3e..51081a5d5063 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -36,11 +36,11 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT(weld::Widget* pPage, weld::Dialog* pD
, m_xBuilder(Application::CreateBuilder(pPage, "filter/ui/xmlfiltertabpagetransformation.ui"))
, m_xContainer(m_xBuilder->weld_widget("XmlFilterTabPageTransformation"))
, m_xEDDocType(m_xBuilder->weld_entry("doc"))
- , m_xEDExportXSLT(new URLBox(m_xBuilder->weld_combo_box_text("xsltexport")))
+ , m_xEDExportXSLT(new URLBox(m_xBuilder->weld_combo_box("xsltexport")))
, m_xPBExprotXSLT(m_xBuilder->weld_button("browseexport"))
- , m_xEDImportXSLT(new URLBox(m_xBuilder->weld_combo_box_text("xsltimport")))
+ , m_xEDImportXSLT(new URLBox(m_xBuilder->weld_combo_box("xsltimport")))
, m_xPBImportXSLT(m_xBuilder->weld_button("browseimport"))
- , m_xEDImportTemplate(new URLBox(m_xBuilder->weld_combo_box_text("tempimport")))
+ , m_xEDImportTemplate(new URLBox(m_xBuilder->weld_combo_box("tempimport")))
, m_xPBImportTemplate(m_xBuilder->weld_button("browsetemp"))
, m_xCBNeedsXSLT2(m_xBuilder->weld_check_button("filtercb"))
{