diff options
| author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2015-10-12 22:13:37 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-10-14 08:09:40 +0000 |
| commit | 068c04fb06806a9345c0059545d19a416d7e60b7 (patch) | |
| tree | 0a0790e03929f9e862baf9347dbe76fc10661c1e /vcl/unx/gtk/gdi/salprn-gtk.cxx | |
| parent | vcl: Free memory by appropriate delete (diff) | |
| download | core-068c04fb06806a9345c0059545d19a416d7e60b7.tar.gz core-068c04fb06806a9345c0059545d19a416d7e60b7.zip | |
Bump gtk+ version to 2.18
2.18 is the version available in RHEL 6 released in 2010.
Change-Id: I4cd4fc89f6b51e6f58ca72b8182f80316b1f4f88
Reviewed-on: https://gerrit.libreoffice.org/19330
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/unx/gtk/gdi/salprn-gtk.cxx')
| -rw-r--r-- | vcl/unx/gtk/gdi/salprn-gtk.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index d05f71b87a63..cf20b2c430eb 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -318,15 +318,9 @@ lcl_setHelpText( const uno::Sequence<OUString>& i_rHelpTexts, const sal_Int32 i_nIndex) { -#if GTK_CHECK_VERSION(2,12,0) if (i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength()) gtk_widget_set_tooltip_text(io_pWidget, OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr()); -#else - (void)io_pWidget; - (void)i_rHelpTexts; - (void)i_nIndex; -#endif } static GtkWidget* @@ -429,12 +423,8 @@ GtkPrintDialog::impl_initDialog() | GTK_PRINT_CAPABILITY_COLLATE | GTK_PRINT_CAPABILITY_REVERSE | GTK_PRINT_CAPABILITY_GENERATE_PS -#if GTK_CHECK_VERSION(2,12,0) | GTK_PRINT_CAPABILITY_NUMBER_UP -#endif -#if GTK_CHECK_VERSION(2,14,0) | GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT -#endif )); } @@ -787,11 +777,9 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled ePrintPages = GTK_PRINT_PAGES_RANGES; break; case 2: -#if GTK_CHECK_VERSION(2,14,0) if (m_xWrapper->supportsPrintSelection()) ePrintPages = GTK_PRINT_PAGES_SELECTION; else -#endif SAL_INFO("vcl.gtk", "the application wants to print a selection, but the present gtk version does not support it"); break; default: @@ -999,7 +987,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe } catch (...) {} } -#if GTK_CHECK_VERSION(2,17,5) if (gtk_print_unix_dialog_get_has_selection(GTK_PRINT_UNIX_DIALOG(m_pDialog))) { uno::Any aSelection; @@ -1022,7 +1009,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe aFilterData[aFilterData.getLength()-1].Value <<= aSelection; } } -#endif uno::Sequence<beans::PropertyValue> aArgs(2); aArgs[0].Name = "FilterData"; aArgs[0].Value <<= aFilterData; |