l10ntools/source/gsicheck.cxx | 2 +- unusedcode.easy | 2 -- vcl/unx/gtk/gdi/gtkprintwrapper.cxx | 26 -------------------------- vcl/unx/gtk/inc/gtkprintwrapper.hxx | 6 ------ 4 files changed, 1 insertion(+), 35 deletions(-)
New commits: commit 00b070ff1478bbae773193e921c77466d8b895f7 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 11 17:07:00 2012 +0100 l10ntools: use correct string literal for ssize_t diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index 11c9d83..76b7928 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -75,7 +75,7 @@ void PrintMessage( rtl::OString const & aType, rtl::OString const & aMsg, rtl::O rtl::OString const & aContext, sal_Bool bPrintContext, std::size_t nLine, rtl::OString aUniqueId = rtl::OString() ) /*****************************************************************************/ { - fprintf( stdout, "%s %s, Line %lu", aType.getStr(), aPrefix.getStr(), nLine ); + fprintf( stdout, "%s %s, Line %zu", aType.getStr(), aPrefix.getStr(), nLine ); if ( !aUniqueId.isEmpty() ) fprintf( stdout, ", UniqueID %s", aUniqueId.getStr() ); fprintf( stdout, ": %s", aMsg.getStr() ); commit 839cf2fa8cd7ea30ad5be7124cd1b26779145406 Author: Thomas Arnhold <tho...@arnhold.org> Date: Sat Feb 11 16:20:45 2012 +0100 unusedcode.easy: clean GtkPrintWrapper diff --git a/unusedcode.easy b/unusedcode.easy index 0b128a6..ff05025 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1495,5 +1495,3 @@ vcl::PDFExtOutDevData::SetOutlineItemDest(int, int) vcl::PDFExtOutDevData::SetOutlineItemParent(int, int) vcl::PDFExtOutDevData::SetOutlineItemText(int, rtl::OUString const&) vcl::PDFWriter::DrawPixel(Polygon const&, Color const*) -vcl::unx::GtkPrintWrapper::print_operation_set_has_selection(_GtkPrintOperation*, int) const -vcl::unx::GtkPrintWrapper::print_operation_set_support_selection(_GtkPrintOperation*, int) const diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx index 6ecfd1d..904b47b 100644 --- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx +++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx @@ -58,8 +58,6 @@ GtkPrintWrapper::GtkPrintWrapper() , m_print_unix_dialog_set_manual_capabilities(0) , m_print_unix_dialog_get_settings(0) , m_print_unix_dialog_set_settings(0) - , m_print_operation_set_support_selection(0) - , m_print_operation_set_has_selection(0) , m_print_unix_dialog_set_support_selection(0) , m_print_unix_dialog_set_has_selection(0) { @@ -105,8 +103,6 @@ void GtkPrintWrapper::impl_load() m_print_unix_dialog_set_manual_capabilities = reinterpret_cast<print_unix_dialog_set_manual_capabilities_t>(m_aModule.getFunctionSymbol("gtk_print_unix_dialog_set_manual_capabilities")); m_print_unix_dialog_get_settings = reinterpret_cast<print_unix_dialog_get_settings_t>(m_aModule.getFunctionSymbol("gtk_print_unix_dialog_get_settings")); m_print_unix_dialog_set_settings = reinterpret_cast<print_unix_dialog_set_settings_t>(m_aModule.getFunctionSymbol("gtk_print_unix_dialog_set_settings")); - m_print_operation_set_support_selection = reinterpret_cast<print_operation_set_support_selection_t>(m_aModule.getFunctionSymbol("gtk_print_operation_set_support_selection")); - m_print_operation_set_has_selection = reinterpret_cast<print_operation_set_has_selection_t>(m_aModule.getFunctionSymbol("gtk_print_operation_set_has_selection")); m_print_unix_dialog_set_support_selection = reinterpret_cast<print_unix_dialog_set_support_selection_t>(m_aModule.getFunctionSymbol("gtk_print_unix_dialog_set_support_selection")); m_print_unix_dialog_set_has_selection = reinterpret_cast<print_unix_dialog_set_has_selection_t>(m_aModule.getFunctionSymbol("gtk_print_unix_dialog_set_has_selection")); } @@ -145,8 +141,6 @@ bool GtkPrintWrapper::supportsPrintSelection() const #if !GTK_CHECK_VERSION(3,0,0) return supportsPrinting() - && m_print_operation_set_support_selection - && m_print_operation_set_has_selection && m_print_unix_dialog_set_support_selection && m_print_unix_dialog_set_has_selection ; @@ -325,26 +319,6 @@ void GtkPrintWrapper::print_unix_dialog_set_settings(GtkPrintUnixDialog* dialog, #endif } -void GtkPrintWrapper::print_operation_set_support_selection(GtkPrintOperation* op, gboolean support_selection) const -{ -#if !GTK_CHECK_VERSION(3,0,0) - assert(m_print_operation_set_support_selection); - (*m_print_operation_set_support_selection)(op, support_selection); -#else - gtk_print_operation_set_support_selection(op, support_selection); -#endif -} - -void GtkPrintWrapper::print_operation_set_has_selection(GtkPrintOperation* op, gboolean has_selection) const -{ -#if !GTK_CHECK_VERSION(3,0,0) - assert(m_print_operation_set_has_selection); - (*m_print_operation_set_has_selection)(op, has_selection); -#else - gtk_print_operation_set_has_selection(op, has_selection); -#endif -} - void GtkPrintWrapper::print_unix_dialog_set_support_selection(GtkPrintUnixDialog* dialog, gboolean support_selection) const { #if !GTK_CHECK_VERSION(3,0,0) diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx index a3cd333..ab97512 100644 --- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx +++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx @@ -81,8 +81,6 @@ public: void print_unix_dialog_set_settings(GtkPrintUnixDialog* dialog, GtkPrintSettings* settings) const; // print selection support, since 2.17.4 - void print_operation_set_support_selection(GtkPrintOperation* op, gboolean support_selection) const; - void print_operation_set_has_selection(GtkPrintOperation* op, gboolean has_selection) const; void print_unix_dialog_set_support_selection(GtkPrintUnixDialog* dialog, gboolean support_selection) const; void print_unix_dialog_set_has_selection(GtkPrintUnixDialog* dialog, gboolean has_selection) const; @@ -108,8 +106,6 @@ private: typedef void (* print_unix_dialog_set_manual_capabilities_t)(GtkPrintUnixDialog*, GtkPrintCapabilities); typedef GtkPrintSettings* (* print_unix_dialog_get_settings_t)(GtkPrintUnixDialog*); typedef void (* print_unix_dialog_set_settings_t)(GtkPrintUnixDialog*, GtkPrintSettings*); - typedef void (* print_operation_set_support_selection_t)(GtkPrintOperation*, gboolean); - typedef void (* print_operation_set_has_selection_t)(GtkPrintOperation*, gboolean); typedef void (* print_unix_dialog_set_support_selection_t)(GtkPrintUnixDialog*, gboolean); typedef void (* print_unix_dialog_set_has_selection_t)(GtkPrintUnixDialog*, gboolean); @@ -136,8 +132,6 @@ private: print_unix_dialog_set_settings_t m_print_unix_dialog_set_settings; // print selection support, since 2.17.4 - print_operation_set_support_selection_t m_print_operation_set_support_selection; - print_operation_set_has_selection_t m_print_operation_set_has_selection; print_unix_dialog_set_support_selection_t m_print_unix_dialog_set_support_selection; print_unix_dialog_set_has_selection_t m_print_unix_dialog_set_has_selection; #endif _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits