summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-21 15:53:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-01-21 16:01:07 +0000
commit523ad9696c9135a29393a0c4d147ab206b6de4f5 (patch)
treefe30ff35cc11890a2345d75495c455f792a4bf56 /vcl
parent7713dfc9b50b88cf2548d49e65b099a6a81e9d65 (diff)
Fix bogus mass-conversion equalsAsciiL -> startsWith
3af99e4d59d89c343965a928681a30f36b1007d2 "convert equalsAsciiL calls to startsWith calls" should rather have converted to oprator ==. (cherry picked from commit a3f32769fc4bb23c64168b412dd10ec769a3854d) Conflicts: sc/source/ui/unoobj/nameuno.cxx sc/source/ui/unoobj/styleuno.cxx sfx2/source/appl/sfxhelp.cxx stoc/source/security/permissions.cxx sw/source/core/unocore/unocrsrhelper.cxx (None of those bogus startsWith calls seem problematic enough to warrant backporting also to libreoffice-4-2-0.) Change-Id: Id4a8836c5d6d570e54661c40be7214632e202b21 Reviewed-on: https://gerrit.libreoffice.org/7578 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx18
1 files changed, 9 insertions, 9 deletions
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 7d2790cf6c8c..0fa24b86a6c0 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -557,7 +557,7 @@ GtkPrintDialog::impl_initCustomTab()
if ( aPropertyName == "PrintContent" )
bGtkInternal = true;
- if (aCtrlType.startsWith("Group") || !pCurParent)
+ if (aCtrlType == "Group" || !pCurParent)
{
pCurTabPage = gtk_vbox_new(FALSE, 12);
gtk_container_set_border_width(GTK_CONTAINER(pCurTabPage), 6);
@@ -566,7 +566,7 @@ GtkPrintDialog::impl_initCustomTab()
pCurParent = pCurTabPage;
aCustomTabs.push_back(std::make_pair(pCurTabPage, aText));
}
- else if (aCtrlType.startsWith("Subgroup") && (pCurParent /*|| bOnJobPageValue*/))
+ else if (aCtrlType == "Subgroup" && (pCurParent /*|| bOnJobPageValue*/))
{
bIgnoreSubgroup = bIgnore;
if (bIgnore)
@@ -600,7 +600,7 @@ GtkPrintDialog::impl_initCustomTab()
GtkWidget* pWidget = NULL;
beans::PropertyValue* pVal = NULL;
- if (aCtrlType.startsWith("Bool") && pCurParent)
+ if (aCtrlType == "Bool" && pCurParent)
{
pWidget = gtk_check_button_new_with_mnemonic(
OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr());
@@ -616,7 +616,7 @@ GtkPrintDialog::impl_initCustomTab()
m_rController.isUIOptionEnabled(aPropertyName) && pVal != NULL);
g_signal_connect(pWidget, "toggled", G_CALLBACK(GtkPrintDialog::UIOption_CheckHdl), this);
}
- else if (aCtrlType.startsWith("Radio") && pCurParent)
+ else if (aCtrlType == "Radio" && pCurParent)
{
GtkWidget* const pVbox = gtk_vbox_new(FALSE, 12);
gtk_container_set_border_width(GTK_CONTAINER(pVbox), 0);
@@ -653,9 +653,9 @@ GtkPrintDialog::impl_initCustomTab()
else
pWidget = pVbox;
}
- else if ((aCtrlType.startsWith("List") ||
- aCtrlType.startsWith("Range") ||
- aCtrlType.startsWith("Edit")
+ else if ((aCtrlType == "List" ||
+ aCtrlType == "Range" ||
+ aCtrlType == "Edit"
) && pCurParent)
{
GtkWidget* const pHbox = gtk_hbox_new(FALSE, 12);
@@ -678,7 +678,7 @@ GtkPrintDialog::impl_initCustomTab()
gtk_combo_box_set_active(GTK_COMBO_BOX(pWidget), nSelectVal);
g_signal_connect(pWidget, "changed", G_CALLBACK(GtkPrintDialog::UIOption_SelectHdl), this);
}
- else if (aCtrlType.startsWith("Edit") && pCurParent)
+ else if (aCtrlType == "Edit" && pCurParent)
{
pWidget = gtk_entry_new();
@@ -689,7 +689,7 @@ GtkPrintDialog::impl_initCustomTab()
gtk_entry_set_text(GTK_ENTRY(pWidget),
OUStringToOString(aCurVal, RTL_TEXTENCODING_UTF8).getStr());
}
- else if (aCtrlType.startsWith("Range") && pCurParent)
+ else if (aCtrlType == "Range" && pCurParent)
{
pWidget = gtk_spin_button_new_with_range(nMinValue, nMaxValue, 1.0);