diff options
Diffstat (limited to 'vcl/unx/gtk')
32 files changed, 0 insertions, 263 deletions
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx index fb613daffc68..01f2365c365c 100644 --- a/vcl/unx/gtk/a11y/atkaction.cxx +++ b/vcl/unx/gtk/a11y/atkaction.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleAction.hpp> @@ -209,7 +208,6 @@ appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& } } - static G_CONST_RETURN gchar * action_wrapper_get_keybinding (AtkAction *action, gint i) diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx index c63ef828444b..c82b1e18ddb2 100644 --- a/vcl/unx/gtk/a11y/atkbridge.cxx +++ b/vcl/unx/gtk/a11y/atkbridge.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unx/gtk/atkbridge.hxx> #include <unx/gtk/gtkframe.hxx> diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx index 53797f3350a3..222f4b609e65 100644 --- a/vcl/unx/gtk/a11y/atkcomponent.cxx +++ b/vcl/unx/gtk/a11y/atkcomponent.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleComponent.hpp> diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx index d72988f09f89..2918da6496e6 100644 --- a/vcl/unx/gtk/a11y/atkeditabletext.cxx +++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include "atktextattributes.hxx" @@ -48,7 +47,6 @@ static accessibility::XAccessibleEditableText* return NULL; } - /*****************************************************************************/ extern "C" { diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx index 2b05c763a55b..01a55a72ac8f 100644 --- a/vcl/unx/gtk/a11y/atkfactory.cxx +++ b/vcl/unx/gtk/a11y/atkfactory.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unx/gtk/gtkframe.hxx> #include <vcl/window.hxx> #include "atkwrapper.hxx" diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index f1fac6be1889..c4c5a5383bed 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleHypertext.hpp> @@ -26,7 +25,6 @@ using namespace ::com::sun::star; - // ---------------------- AtkHyperlink ---------------------- typedef struct { @@ -212,7 +210,6 @@ static accessibility::XAccessibleHypertext* return NULL; } - static AtkHyperlink * hypertext_get_link( AtkHypertext *hypertext, gint link_index) diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx index d9f93edc4a9d..524a26895c59 100644 --- a/vcl/unx/gtk/a11y/atkimage.cxx +++ b/vcl/unx/gtk/a11y/atkimage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleImage.hpp> diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx index ebdac0053ed6..3349be84925f 100644 --- a/vcl/unx/gtk/a11y/atklistener.cxx +++ b/vcl/unx/gtk/a11y/atklistener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include <sys/timer.h> @@ -40,7 +39,6 @@ using namespace com::sun::star; - AtkListener::AtkListener( AtkObjectWrapper* pWrapper ) : mpWrapper( pWrapper ) { if( mpWrapper ) diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx index 1d0994131cef..016cb03447ec 100644 --- a/vcl/unx/gtk/a11y/atkselection.cxx +++ b/vcl/unx/gtk/a11y/atkselection.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleSelection.hpp> diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx index 7094a7caf4b9..12b598bf9fa3 100644 --- a/vcl/unx/gtk/a11y/atktable.cxx +++ b/vcl/unx/gtk/a11y/atktable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleTable.hpp> @@ -638,7 +637,6 @@ table_wrapper_set_column_description( AtkTable *, gint, const gchar * ) { // meaningless helper } - /*****************************************************************************/ static void @@ -646,7 +644,6 @@ table_wrapper_set_column_header( AtkTable *, gint, AtkObject * ) { // meaningless helper } - /*****************************************************************************/ static void diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx index c90a9447c78d..b3ee4f21c6f8 100644 --- a/vcl/unx/gtk/a11y/atktext.cxx +++ b/vcl/unx/gtk/a11y/atktext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include "atktextattributes.hxx" #include <algorithm> diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 54e8f8f0a542..0d7cdc0e7785 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atktextattributes.hxx" #include <com/sun/star/awt/FontSlant.hpp> @@ -50,7 +49,6 @@ typedef bool (* TextPropertyValueFunc) ( uno::Any& rAny, const gchar * value ) #define STRNCMP_PARAM( s ) s,sizeof( s )-1 - /*****************************************************************************/ static AtkTextAttribute atk_text_attribute_paragraph_style = ATK_TEXT_ATTR_INVALID; @@ -147,7 +145,6 @@ static const char * ExportedTextAttributes[TEXT_ATTRIBUTE_LAST] = "WritingMode" // TEXT_ATTRIBUTE_WRITING_MODE }; - /*****************************************************************************/ static gchar* @@ -180,7 +177,6 @@ double toPoint(sal_Int16 n) return (double) (n * 72) / 2540; } - /*****************************************************************************/ static bool @@ -380,7 +376,6 @@ String2Weight( uno::Any& rAny, const gchar * value ) return true; } - /*****************************************************************************/ static gchar* @@ -770,7 +765,6 @@ get_font_effect(const uno::Sequence< beans::PropertyValue >& rAttributeList, // @see http://www.w3.org/TR/REC-CSS2/text.html#lining-striking-props - enum { DECORATION_NONE = 0, @@ -779,7 +773,6 @@ enum DECORATION_LINE_THROUGH }; - static const gchar * decorations[] = { "none", "blink", "underline", "line-through" }; static gchar * @@ -818,7 +811,6 @@ get_text_decoration(const uno::Sequence< beans::PropertyValue >& rAttributeList, return g_strjoinv(" ", value_list); } - /*****************************************************************************/ // @see http://www.w3.org/TR/REC-CSS2/text.html#propdef-text-shadow @@ -1219,7 +1211,6 @@ attribute_set_new_from_property_values( return attribute_set; } - AtkAttributeSet* attribute_set_prepend_misspelled( AtkAttributeSet* attribute_set ) { if( ATK_TEXT_ATTR_INVALID == atk_text_attribute_misspelled ) diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index e9309aa40fc8..f662bbdc7bdd 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include <sys/timer.h> @@ -494,7 +493,6 @@ static void handle_toolbox_buttonchange(VclWindowEvent const *pEvent) } } - /*****************************************************************************/ static std::set< Window * > g_aWindowList; @@ -758,5 +756,4 @@ ooo_atk_util_get_type (void) return type; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx index 44416fa19982..7e1256e334c3 100644 --- a/vcl/unx/gtk/a11y/atkvalue.cxx +++ b/vcl/unx/gtk/a11y/atkvalue.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "atkwrapper.hxx" #include <com/sun/star/accessibility/XAccessibleValue.hpp> diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx index e60ef0bbe491..92b89509ffb6 100644 --- a/vcl/unx/gtk/a11y/atkwindow.cxx +++ b/vcl/unx/gtk/a11y/atkwindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <unx/gtk/gtkframe.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx index b01abcdc575e..a4125fa53e9f 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.cxx +++ b/vcl/unx/gtk/a11y/atkwrapper.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -121,7 +120,6 @@ static AtkRelationType mapRelationType( sal_Int16 nRelation ) return type; } - AtkStateType mapAtkState( sal_Int16 nState ) { AtkStateType type = ATK_STATE_INVALID; @@ -321,7 +319,6 @@ static AtkRole mapToAtkRole( sal_Int16 nRole ) return role; } - /*****************************************************************************/ extern "C" { @@ -558,7 +555,6 @@ wrapper_ref_state_set( AtkObject *atk_obj ) /*****************************************************************************/ - static void atk_object_wrapper_finalize (GObject *obj) { @@ -777,7 +773,6 @@ atk_object_wrapper_ref( const uno::Reference< accessibility::XAccessible > &rxAc return NULL; } - AtkObject * atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible, AtkObject* parent ) @@ -847,7 +842,6 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star } } - /*****************************************************************************/ void atk_object_wrapper_add_child(AtkObjectWrapper* wrapper, AtkObject *child, gint index) diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 02126cbc541f..5886674f1d1d 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -43,7 +43,6 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleValue; } } } } - struct _AtkObjectWrapper { AtkObject aParent; diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx index 5787caf45367..bef0510da4a4 100644 --- a/vcl/unx/gtk/app/gtkdata.cxx +++ b/vcl/unx/gtk/app/gtkdata.cxx @@ -48,7 +48,6 @@ using namespace vcl_sal; - /*************************************************************** * class GtkSalDisplay * ***************************************************************/ @@ -493,7 +492,6 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame ) return 1; } - /********************************************************************** * class GtkData * **********************************************************************/ diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 83e0d1f801a8..6389cf06febd 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stack> #include <string.h> #include <osl/module.h> @@ -293,7 +292,6 @@ SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) #endif } - GtkYieldMutex::GtkYieldMutex() { } diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 2365565ce614..1f3dfb65980c 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -50,10 +50,8 @@ #include "gtk/fpicker/SalGtkFilePicker.hxx" - // namespace directives - using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::ui::dialogs::TemplateDescription; @@ -312,10 +310,8 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), true); } - // XFilePickerNotifier - void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) throw( uno::RuntimeException, std::exception ) { @@ -334,10 +330,8 @@ void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<X m_xListener.clear(); } - // XEventListener - void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) { // no member access => no mutex needed @@ -348,10 +342,8 @@ void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) thr removeFilePickerListener( xFilePickerListener ); } - // FilePicker Event functions - void SalGtkFilePicker::impl_fileSelectionChanged( FilePickerEvent aEvent ) { OSL_TRACE( "file selection changed"); @@ -370,8 +362,6 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent ) if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } - - struct FilterEntry { protected: @@ -406,22 +396,17 @@ public: const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); } }; - - - FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) { } - bool FilterEntry::hasSubFilters() const { return( 0 < m_aSubFilters.getLength() ); } - sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) { _rSubFilterList = m_aSubFilters; @@ -504,7 +489,6 @@ dialog_remove_buttons( GtkDialog *pDialog ) g_list_free( pChildren ); } - namespace { struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > @@ -515,7 +499,6 @@ namespace { public: FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } - bool operator () ( const FilterEntry& _rEntry ) { bool bMatch; @@ -542,8 +525,6 @@ namespace { }; } - - bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { bool bRet = false; @@ -559,7 +540,6 @@ bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) return bRet; } - bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) { bool bRet = false; @@ -581,7 +561,6 @@ bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) return bRet; } - void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter ) { if( !m_pFilterList ) @@ -594,11 +573,6 @@ void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter } } - - - - - void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -616,10 +590,6 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUSt m_pFilterList->insert( m_pFilterList->end(), FilterEntry( aTitle, aFilter ) ); } - - - - void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -642,10 +612,6 @@ void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle ) // TODO m_pImpl->setCurrentFilter( aTitle ); } - - - - void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername) { OUString aFilterName(filtername, strlen(filtername), RTL_TEXTENCODING_UTF8); @@ -703,10 +669,8 @@ OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeExcept return m_aCurrentFilter; } - // XFilterGroupManager functions - void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { @@ -735,10 +699,8 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle } - // XFilePicker functions - void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -956,10 +918,8 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno return aSelectedFiles; } - // XExecutableDialog functions - void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1128,8 +1088,6 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException, std return retVal; } - - // cf. offapi/com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.idl GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) { @@ -1181,9 +1139,6 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) return pWidget; } - - - // XFilePickerControlAccess functions static void HackWidthToFirst(GtkComboBox *pWidget) @@ -1469,10 +1424,8 @@ OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) return OStringToOUString( aTxt, RTL_TEXTENCODING_UTF8 ); } - // XFilePreview functions - uno::Sequence<sal_Int16> SAL_CALL SalGtkFilePicker::getSupportedImageFormats() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1655,10 +1608,8 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException, return mbPreviewState; } - // XInitialization - void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) throw( uno::Exception, uno::RuntimeException, std::exception ) { @@ -1820,10 +1771,8 @@ void SalGtkFilePicker::preview_toggled_cb( GObject *cb, SalGtkFilePicker* pobjFP pobjFP->setShowState( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( cb ) ) ); } - // XCancellable - void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -1833,7 +1782,6 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException, std::exce // TODO m_pImpl->cancel(); } - // Misc void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 94634ca7dd7a..b4f4dbd09ac5 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -33,10 +33,8 @@ #include "gtk/fpicker/SalGtkPicker.hxx" - // Implementation class for the XFilePicker Interface - struct FilterEntry; struct ElementEntry_Impl; @@ -45,11 +43,8 @@ typedef ::std::list < ElementEntry_Impl > ElementList; typedef ::com::sun::star::beans::StringPair UnoFilterEntry; typedef ::com::sun::star::uno::Sequence< UnoFilterEntry > UnoFilterList; // can be transported more effectively - - // class declaration - typedef cppu::WeakComponentImplHelper5< ::com::sun::star::ui::dialogs::XFilePickerControlAccess, ::com::sun::star::ui::dialogs::XFilePreview, @@ -65,29 +60,23 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base // constructor SalGtkFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - // XFilePickerNotifier - virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker functions - virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -104,17 +93,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilePicker2 functions - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilterManager functions - virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -124,17 +109,13 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFilterGroupManager functions - virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilePickerControlAccess functions - virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -150,10 +131,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XFilePreview - virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -175,32 +154,24 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - // FilePicker Event functions - private: // prevent copy and assignment SalGtkFilePicker( const SalGtkFilePicker& ); diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx index b30334408c5c..a77d1c9512f2 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; - // constructor SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentContext >& xContext ) : @@ -65,10 +64,8 @@ SalGtkFolderPicker::SalGtkFolderPicker( const uno::Reference< uno::XComponentCon gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER( m_pDialog ), false ); } - // XEventListener - void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& ) throw( uno::RuntimeException ) { @@ -128,10 +125,8 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription { } - // XExecutableDialog functions - void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -177,10 +172,8 @@ sal_Int16 SAL_CALL SalGtkFolderPicker::execute() throw( uno::RuntimeException, s return retVal; } - // XCancellable - void SAL_CALL SalGtkFolderPicker::cancel() throw( uno::RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx index a7081c382be4..1acdd66c4abf 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx @@ -37,20 +37,16 @@ class SalGtkFolderPicker : // constructor SalGtkFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xServiceMgr ); - // XExecutableDialog functions - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XFolderPicker functions - virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -63,17 +59,13 @@ class SalGtkFolderPicker : virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XCancellable - virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx index 209343526218..50ad540887be 100644 --- a/vcl/unx/gtk/fpicker/eventnotification.hxx +++ b/vcl/unx/gtk/fpicker/eventnotification.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> - // encapsulate a filepicker event // notification, because there are // two types of filepicker notifications @@ -31,7 +30,6 @@ // this is an application of the // "command" pattern see GoF - class CEventNotification { public: diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx index f4e144a9b118..9727a9cf9654 100644 --- a/vcl/unx/gtk/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; - // translate control ids to resource ids static const struct diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index be7b35e53c5b..a2b332620088 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -61,7 +61,6 @@ GtkSalGraphics::~GtkSalGraphics() { } - /************************************* * Cached native widget objects *************************************/ @@ -172,7 +171,6 @@ static const GtkBorder aDefDefBorder = { 1, 1, 1, 1 }; #define BTN_CHILD_SPACING 1 #define MIN_SPIN_ARROW_WIDTH 6 - static void NWEnsureGTKRadio ( SalX11Screen nScreen ); static void NWEnsureGTKButton ( SalX11Screen nScreen ); static void NWEnsureGTKCheck ( SalX11Screen nScreen ); @@ -205,13 +203,11 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ); * */ - static Rectangle NWGetButtonArea( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ); - static Rectangle NWGetEditBoxPixmapRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); @@ -230,7 +226,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, GdkPixmap * pixmap, Cont static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); - static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption ); @@ -247,10 +242,8 @@ static Rectangle NWGetToolbarRect( SalX11Screen nScreen, static int getFrameWidth(GtkWidget* widget); - static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect ); - /********************************************************* * PixmapCache *********************************************************/ @@ -317,7 +310,6 @@ void NWPixmapCacheData::SetPixmap( GdkPixmap* pPixmap ) g_object_ref( m_pixmap ); } - NWPixmapCache::NWPixmapCache( SalX11Screen nScreen ) { m_idx = 0; @@ -373,7 +365,6 @@ void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangl pData[m_idx].SetPixmap( pPixmap ); } - void NWPixmapCacheList::AddCache( NWPixmapCache* pCache ) { mCaches.push_back( pCache ); @@ -395,7 +386,6 @@ void NWPixmapCacheList::ThemeChanged( ) } } - /********************************************************* * Make border manipulation easier *********************************************************/ @@ -407,7 +397,6 @@ inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pS aDst.bottom = pSrc->bottom; } - /********************************************************* * Initialize GTK and local stuff *********************************************************/ @@ -474,7 +463,6 @@ void GtkData::initNWF( void ) #endif } - /********************************************************* * Release GTK and local stuff *********************************************************/ @@ -502,7 +490,6 @@ void GtkData::deInitNWF( void ) } } - /********************************************************** * track clip region **********************************************************/ @@ -654,7 +641,6 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP return false; } - /* * HitTestNativeControl() * @@ -766,7 +752,6 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType nType, } } - /* * DrawNativeControl() * @@ -1622,8 +1607,6 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) return Rectangle( Point( x, y ), Size( w, h ) ); } - - bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1680,8 +1663,6 @@ bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, return true; } - - bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1727,7 +1708,6 @@ bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, return true; } - static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ) { // Size the arrow appropriately @@ -2068,8 +2048,6 @@ bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, return true; } - - static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPart, Rectangle aAreaRect ) { gint slider_width; @@ -2151,8 +2129,6 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa return( buttonRect ); } - - bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -2181,7 +2157,6 @@ bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, return true; } - /* Take interior/exterior focus into account and return * the bounding rectangle of the edit box including * any focus requirements. @@ -2215,7 +2190,6 @@ static Rectangle NWGetEditBoxPixmapRect(SalX11Screen nScreen, return( pixmapRect ); } - /* Paint a GTK Entry widget into the specified GdkPixmap. * All coordinates should be local to the Pixmap, NOT * screen/window coordinates. @@ -2288,10 +2262,6 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, } - - - - bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList&, @@ -2340,7 +2310,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, else pixmapRect = rControlRectangle; - pixmap = NWGetPixmapFromScreen( pixmapRect ); if ( !pixmap ) return false; @@ -2396,8 +2365,6 @@ bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, return true; } - - static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, ControlType, ControlPart nPart, @@ -2487,9 +2454,6 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, arrowRect.GetWidth(), arrowRect.GetHeight() ); } - - - bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -2568,8 +2532,6 @@ bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, return true; } - - static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, ControlType, ControlPart nPart, @@ -2626,10 +2588,6 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, return( aButtonRect ); } - - - - bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, const Rectangle& rControlRectangle, const clipList&, @@ -2781,8 +2739,6 @@ bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, return bSuccess; } - - bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3032,8 +2988,6 @@ bool GtkSalGraphics::NWPaintGTKToolbar( return true; } - - bool GtkSalGraphics::NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, @@ -3528,15 +3482,12 @@ bool GtkSalGraphics::NWPaintGTKSlider( eOri ); } - bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); g_object_unref( pixmap ); return bRet; } - - static int getFrameWidth(GtkWidget* widget) { return widget->style->xthickness; @@ -3605,8 +3556,6 @@ static Rectangle NWGetListBoxButtonRect( SalX11Screen nScreen, return( aPartRect ); } - - static Rectangle NWGetListBoxIndicatorRect( SalX11Screen nScreen, ControlType, ControlPart, @@ -4104,7 +4053,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) rSettings.SetStyleSettings( aStyleSet ); } - /************************************************************************ * Create a GdkPixmap filled with the contents of an area of an Xlib window ************************************************************************/ @@ -4138,9 +4086,6 @@ GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect ) return( pPixmap ); } - - - /************************************************************************ * Copy an alpha pixmap to screen using a gc with clipping ************************************************************************/ @@ -4170,7 +4115,6 @@ bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRe return true; } - /************************************************************************ * State conversion ************************************************************************/ @@ -4224,8 +4168,6 @@ static void NWSetWidgetState( GtkWidget* widget, ControlState nState, GtkStateTy * Widget ensure functions - make sure cached objects are valid ************************************************************************/ - - static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) { NWFWidgetData& rData = gWidgetData[nScreen]; @@ -4257,8 +4199,6 @@ static void NWAddWidgetToCacheWindow( GtkWidget* widget, SalX11Screen nScreen ) gWidgetDefaultFlags[ (long)widget ] = GTK_WIDGET_FLAGS( widget ); } - - static void NWEnsureGTKButton( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gBtnWidget ) @@ -4268,8 +4208,6 @@ static void NWEnsureGTKButton( SalX11Screen nScreen ) } } - - static void NWEnsureGTKRadio( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gRadioWidget || !gWidgetData[nScreen].gRadioWidgetSibling ) @@ -4281,8 +4219,6 @@ static void NWEnsureGTKRadio( SalX11Screen nScreen ) } } - - static void NWEnsureGTKCheck( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gCheckWidget ) @@ -4292,8 +4228,6 @@ static void NWEnsureGTKCheck( SalX11Screen nScreen ) } } - - static void NWEnsureGTKScrollbars( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gScrollHorizWidget ) @@ -4309,8 +4243,6 @@ static void NWEnsureGTKScrollbars( SalX11Screen nScreen ) } } - - static void NWEnsureGTKArrow( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gArrowWidget || !gWidgetData[nScreen].gDropdownWidget ) @@ -4324,8 +4256,6 @@ static void NWEnsureGTKArrow( SalX11Screen nScreen ) } } - - static void NWEnsureGTKEditBox( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gEditBoxWidget ) @@ -4335,8 +4265,6 @@ static void NWEnsureGTKEditBox( SalX11Screen nScreen ) } } - - static void NWEnsureGTKSpinButton( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gSpinButtonWidget ) @@ -4352,8 +4280,6 @@ static void NWEnsureGTKSpinButton( SalX11Screen nScreen ) } } - - static void NWEnsureGTKNotebook( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gNotebookWidget ) @@ -4363,8 +4289,6 @@ static void NWEnsureGTKNotebook( SalX11Screen nScreen ) } } - - static void NWEnsureGTKOptionMenu( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gOptionMenuWidget ) @@ -4374,8 +4298,6 @@ static void NWEnsureGTKOptionMenu( SalX11Screen nScreen ) } } - - static void NWEnsureGTKCombo( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gComboWidget ) @@ -4394,8 +4316,6 @@ static void NWEnsureGTKCombo( SalX11Screen nScreen ) } } - - static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen ) { if ( !gWidgetData[nScreen].gScrolledWindowWidget ) @@ -4408,8 +4328,6 @@ static void NWEnsureGTKScrolledWindow( SalX11Screen nScreen ) } } - - static void NWEnsureGTKToolbar( SalX11Screen nScreen ) { if( !gWidgetData[nScreen].gToolbarWidget ) @@ -4439,8 +4357,6 @@ static void NWEnsureGTKToolbar( SalX11Screen nScreen ) } } - - static void NWEnsureGTKMenubar( SalX11Screen nScreen ) { if( !gWidgetData[nScreen].gMenubarWidget ) diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index eb6609098960..0251ffd29841 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -114,7 +114,6 @@ private: boost::shared_ptr<GtkPrintWrapper> m_pWrapper; }; - struct GtkSalPrinter_Impl { OString m_sSpoolFile; @@ -126,14 +125,12 @@ struct GtkSalPrinter_Impl ~GtkSalPrinter_Impl(); }; - GtkSalPrinter_Impl::GtkSalPrinter_Impl() : m_pPrinter(0) , m_pSettings(0) { } - GtkSalPrinter_Impl::~GtkSalPrinter_Impl() { if (m_pPrinter) @@ -173,7 +170,6 @@ GtkSalPrinter::GtkSalPrinter(SalInfoPrinter* const i_pInfoPrinter) { } - bool GtkSalPrinter::impl_doJob( const OUString* const i_pFileName, @@ -207,7 +203,6 @@ GtkSalPrinter::impl_doJob( return bJobStarted; } - bool GtkSalPrinter::StartJob( const OUString* const i_pFileName, @@ -266,7 +261,6 @@ GtkSalPrinter::StartJob( return impl_doJob(&aFileName, i_rJobName, i_rAppName, io_pSetupData, nCopies, bCollate, io_rController); } - bool GtkSalPrinter::EndJob() { @@ -316,7 +310,6 @@ GtkSalPrinter::EndJob() return bRet; } - namespace { @@ -337,7 +330,6 @@ lcl_setHelpText( #endif } - static GtkWidget* lcl_makeFrame( GtkWidget* const i_pChild, @@ -415,7 +407,6 @@ GtkPrintDialog::GtkPrintDialog(vcl::PrinterController& io_rController) impl_readFromSettings(); } - void GtkPrintDialog::impl_initDialog() { @@ -448,7 +439,6 @@ GtkPrintDialog::impl_initDialog() )); } - void GtkPrintDialog::impl_initCustomTab() { @@ -761,7 +751,6 @@ GtkPrintDialog::impl_initCustomTab() } } - void GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled) { @@ -815,7 +804,6 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled } } - void GtkPrintDialog::impl_checkOptionalControlDependencies() { @@ -826,7 +814,6 @@ GtkPrintDialog::impl_checkOptionalControlDependencies() } } - beans::PropertyValue* GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const { @@ -844,7 +831,6 @@ GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const return pVal; } - void GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget) { @@ -858,7 +844,6 @@ GtkPrintDialog::impl_UIOption_CheckHdl(GtkWidget* const i_pWidget) } } - void GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget) { @@ -877,7 +862,6 @@ GtkPrintDialog::impl_UIOption_RadioHdl(GtkWidget* const i_pWidget) } } - void GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget) { @@ -891,7 +875,6 @@ GtkPrintDialog::impl_UIOption_SelectHdl(GtkWidget* const i_pWidget) } } - bool GtkPrintDialog::run() { @@ -951,7 +934,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe aFilterData[1].Name = "FirstPageOnLeft"; aFilterData[1].Value <<= sal_False; - const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES); if (pStr && !strcmp(pStr, "ranges")) { @@ -1052,7 +1034,6 @@ void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSe } #endif - void GtkPrintDialog::updateControllerPrintRange() { @@ -1104,13 +1085,11 @@ GtkPrintDialog::updateControllerPrintRange() g_object_unref(G_OBJECT(pSettings)); } - GtkPrintDialog::~GtkPrintDialog() { gtk_widget_destroy(m_pDialog); } - void GtkPrintDialog::impl_readFromSettings() { @@ -1147,7 +1126,6 @@ GtkPrintDialog::impl_readFromSettings() g_object_unref(G_OBJECT(pSettings)); } - void GtkPrintDialog::impl_storeToSettings() const @@ -1170,7 +1148,6 @@ const pItem->Commit(); } - sal_uLong GtkSalInfoPrinter::GetCapabilities( const ImplJobSetup* const i_pSetupData, diff --git a/vcl/unx/gtk/window/gloactiongroup.cxx b/vcl/unx/gtk/window/gloactiongroup.cxx index 00ce9338d32b..e6c10b709391 100644 --- a/vcl/unx/gtk/window/gloactiongroup.cxx +++ b/vcl/unx/gtk/window/gloactiongroup.cxx @@ -15,7 +15,6 @@ #include <unx/gtk/gtkinst.hxx> #include <unx/gtk/gtkframe.hxx> - /* * GLOAction */ @@ -158,7 +157,6 @@ g_lo_action_group_query_action (GActionGroup *group, if (action == NULL) return FALSE; - if (enabled) { GtkSalFrame* pFrame = lo_group->priv->frame; diff --git a/vcl/unx/gtk/window/glomenu.cxx b/vcl/unx/gtk/window/glomenu.cxx index e012aa0d8247..76c617bead13 100644 --- a/vcl/unx/gtk/window/glomenu.cxx +++ b/vcl/unx/gtk/window/glomenu.cxx @@ -40,7 +40,6 @@ struct item GHashTable* links; // Item links. }; - static void g_lo_menu_struct_item_init (struct item *menu_item) { @@ -511,7 +510,6 @@ g_lo_menu_new_submenu_in_item_in_section (GLOMenu *menu, } } - void g_lo_menu_set_submenu_to_item_in_section (GLOMenu *menu, gint section, diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index f585c73c904d..a8fe4aba09dd 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef AIX #define _LINUX_SOURCE_COMPAT #include <sys/timer.h> diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 8d3a5134dc42..f22b54eea818 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1669,7 +1669,6 @@ void GtkSalFrame::SetIcon( sal_uInt16 nIcon ) ImpBitmap *pIconImpBitmap = aIcon.ImplGetBitmapImpBitmap(); ImpBitmap *pIconImpMask = aIcon.ImplGetMaskImpBitmap(); - if( pIconImpBitmap && pIconImpMask ) { SalBitmap *pIconBitmap = @@ -3524,7 +3523,6 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) } #endif // GTK_CHECK_VERSION(3,0,0) - gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame ) { GtkSalFrame* pThis = (GtkSalFrame*)frame; @@ -3947,10 +3945,8 @@ void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame ) } } - // GtkSalFrame::IMHandler - GtkSalFrame::IMHandler::IMHandler( GtkSalFrame* pFrame ) : m_pFrame(pFrame), m_nPrevKeyPresses( 0 ), diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index d63fdd31c16a..203b9b42794d 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -379,7 +379,6 @@ void GtkSalMenu::UpdateFull() ImplUpdate( TRUE ); } - /* * GtkSalMenu */ @@ -712,7 +711,6 @@ void GtkSalMenu::Activate() ActivateAllSubmenus(static_cast<MenuBar*>(mpVCLMenu)); } - void GtkSalMenu::Deactivate( const gchar* aMenuCommand ) { if ( !mbMenuBar ) @@ -765,7 +763,6 @@ void GtkSalMenu::ShowItem( unsigned nPos, bool bShow ) ( ( GtkSalMenuItem* ) maItems[ nPos ] )->mbVisible = bShow; } - void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const OUString& ) { } @@ -782,8 +779,6 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* ) { } - - /* * GtkSalMenuItem */ |