This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push: new 4347e14 Fixed mixed style (space/tabs) in indentation 4347e14 is described below commit 4347e1409c7139e78067c080895cf1d9ad59f038 Author: mseidel <msei...@apache.org> AuthorDate: Fri Sep 3 22:12:59 2021 +0200 Fixed mixed style (space/tabs) in indentation --- main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 1268 ++++++++++---------- 1 file changed, 634 insertions(+), 634 deletions(-) diff --git a/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx b/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx index 9de1201..91f14d2 100644 --- a/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx +++ b/main/fpicker/source/unx/gnome/SalGtkFilePicker.cxx @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,16 +7,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ @@ -73,14 +73,14 @@ using namespace ::com::sun::star::uno; namespace { - // controlling event notifications + // controlling event notifications const bool STARTUP_SUSPENDED = true; const bool STARTUP_ALIVE = false; - + uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames() { uno::Sequence<rtl::OUString> aRet(3); - aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" ); + aRet[0] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.FilePicker" ); aRet[1] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.SystemFilePicker" ); aRet[2] = rtl::OUString::createFromAscii( "com.sun.star.ui.dialogs.GtkFilePicker" ); return aRet; @@ -93,61 +93,61 @@ namespace static void expandexpanders(GtkContainer *pWidget) { - GdkThreadLock aLock; + GdkThreadLock aLock; - GList *pChildren = gtk_container_get_children(pWidget); - for( GList *p = pChildren; p; p = p->next ) - { - if GTK_IS_CONTAINER(GTK_WIDGET(p->data)) - expandexpanders(GTK_CONTAINER(GTK_WIDGET(p->data))); - if GTK_IS_EXPANDER(GTK_WIDGET(p->data)) - gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), sal_True); - } - g_list_free(pChildren); + GList *pChildren = gtk_container_get_children(pWidget); + for( GList *p = pChildren; p; p = p->next ) + { + if GTK_IS_CONTAINER(GTK_WIDGET(p->data)) + expandexpanders(GTK_CONTAINER(GTK_WIDGET(p->data))); + if GTK_IS_EXPANDER(GTK_WIDGET(p->data)) + gtk_expander_set_expanded(GTK_EXPANDER(GTK_WIDGET(p->data)), sal_True); + } + g_list_free(pChildren); } void SalGtkFilePicker::dialog_mapped_cb(GtkWidget *, SalGtkFilePicker *pobjFP) { - pobjFP->InitialMapping(); + pobjFP->InitialMapping(); } void SalGtkFilePicker::InitialMapping() { - GdkThreadLock aLock; + GdkThreadLock aLock; - if (!mbPreviewState ) - { - gtk_widget_hide( m_pPreview ); - gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), false); - } - gtk_widget_set_size_request (m_pPreview, -1, -1); + if (!mbPreviewState ) + { + gtk_widget_hide( m_pPreview ); + gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), false); + } + gtk_widget_set_size_request (m_pPreview, -1, -1); } -SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr ) : +SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr ) : SalGtkPicker(xServiceMgr), cppu::WeakComponentImplHelper10< XFilterManager, - XFilterGroupManager, - XFilePickerControlAccess, + XFilterGroupManager, + XFilePickerControlAccess, XFilePickerNotifier, - XFilePreview, - XFilePicker2, + XFilePreview, + XFilePicker2, lang::XInitialization, util::XCancellable, - lang::XEventListener, + lang::XEventListener, lang::XServiceInfo>( m_rbHelperMtx ), m_xServiceMgr( xServiceMgr ), - m_pFilterList( NULL ), - m_pVBox ( NULL ), - mnHID_FolderChange( 0 ), - mnHID_SelectionChange( 0 ), - bVersionWidthUnset( false ), - mbPreviewState( sal_False ), - mHID_Preview( 0 ), + m_pFilterList( NULL ), + m_pVBox ( NULL ), + mnHID_FolderChange( 0 ), + mnHID_SelectionChange( 0 ), + bVersionWidthUnset( false ), + mbPreviewState( sal_False ), + mHID_Preview( 0 ), m_pPreview( NULL ), - m_pPseudoFilter( NULL ), + m_pPseudoFilter( NULL ), m_PreviewImageWidth( 256 ), - m_PreviewImageHeight( 256 ) + m_PreviewImageHeight( 256 ) { int i; @@ -158,28 +158,28 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact } for( i = 0; i < BUTTON_LAST; i++ ) - { + { m_pButtons[i] = NULL; mbButtonVisibility[i] = false; - } + } for( i = 0; i < LIST_LAST; i++ ) - { - m_pHBoxs[i] = NULL; - m_pAligns[i] = NULL; + { + m_pHBoxs[i] = NULL; + m_pAligns[i] = NULL; m_pLists[i] = NULL; m_pListLabels[i] = NULL; mbListVisibility[i] = false; - } + } CResourceProvider aResProvider; OUString aFilePickerTitle = aResProvider.getResString( FILE_PICKER_TITLE_OPEN ); - GdkThreadLock aLock; + GdkThreadLock aLock; - m_pDialog = gtk_file_chooser_dialog_new( - OUStringToOString( aFilePickerTitle, RTL_TEXTENCODING_UTF8 ).getStr(), - NULL, + m_pDialog = gtk_file_chooser_dialog_new( + OUStringToOString( aFilePickerTitle, RTL_TEXTENCODING_UTF8 ).getStr(), + NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, @@ -192,16 +192,16 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact m_pVBox = gtk_vbox_new( sal_False, 0 ); - // We don't want clickable items to have a huge hit-area - GtkWidget *pHBox = gtk_hbox_new( sal_False, 0 ); - GtkWidget *pThinVBox = gtk_vbox_new( sal_False, 0 ); + // We don't want clickable items to have a huge hit-area + GtkWidget *pHBox = gtk_hbox_new( sal_False, 0 ); + GtkWidget *pThinVBox = gtk_vbox_new( sal_False, 0 ); - gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, sal_False, sal_False, 0); - gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, sal_False, sal_False, 0); - gtk_widget_show( pHBox ); - gtk_widget_show( pThinVBox ); + gtk_box_pack_end (GTK_BOX( m_pVBox ), pHBox, sal_False, sal_False, 0); + gtk_box_pack_start (GTK_BOX( pHBox ), pThinVBox, sal_False, sal_False, 0); + gtk_widget_show( pHBox ); + gtk_widget_show( pThinVBox ); - OUString aLabel; + OUString aLabel; for( i = 0; i < TOGGLE_LAST; i++ ) { @@ -213,7 +213,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact setLabel( CHECKBOX_##elem, aLabel ); \ break - switch( i ) { + switch( i ) { LABEL_TOGGLE( AUTOEXTENSION ); LABEL_TOGGLE( PASSWORD ); @@ -232,9 +232,9 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact for( i = 0; i < LIST_LAST; i++ ) { - m_pHBoxs[i] = gtk_hbox_new( sal_False, 0 ); + m_pHBoxs[i] = gtk_hbox_new( sal_False, 0 ); - m_pAligns[i] = gtk_alignment_new(0, 0, 0, 1); + m_pAligns[i] = gtk_alignment_new(0, 0, 0, 1); m_pLists[i] = gtk_combo_box_new_text(); @@ -246,75 +246,75 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact setLabel( LISTBOX_##elem##_LABEL, aLabel ); \ break - switch( i ) - { - LABEL_LIST( VERSION ); - LABEL_LIST( TEMPLATE ); - LABEL_LIST( IMAGE_TEMPLATE ); + switch( i ) + { + LABEL_LIST( VERSION ); + LABEL_LIST( TEMPLATE ); + LABEL_LIST( IMAGE_TEMPLATE ); default: OSL_TRACE("Handle unknown control %d\n", i); break; } - gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] ); - gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], sal_False, sal_False, 0 ); + gtk_container_add( GTK_CONTAINER( m_pAligns[i]), m_pLists[i] ); + gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pAligns[i], sal_False, sal_False, 0 ); + + gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], sal_False, sal_False, 0 ); - gtk_box_pack_end( GTK_BOX( m_pHBoxs[i] ), m_pListLabels[i], sal_False, sal_False, 0 ); + gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], sal_False, sal_False, 0 ); + } + + aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE ); + m_pFilterExpander = gtk_expander_new_with_mnemonic( + OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr()); + + gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, sal_False, sal_True, 0 ); - gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pHBoxs[i], sal_False, sal_False, 0 ); + GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), + GTK_SHADOW_IN); + gtk_container_add (GTK_CONTAINER (m_pFilterExpander), scrolled_window); + gtk_widget_show (scrolled_window); + + ByteString sExpand(getenv("SAL_EXPANDFPICKER")); + sal_Int32 nExpand = sExpand.ToInt32(); + switch (nExpand) + { + default: + case 0: + break; + case 1: + gtk_expander_set_expanded( GTK_EXPANDER(m_pFilterExpander), sal_True); + break; + case 2: + expandexpanders(GTK_CONTAINER(m_pDialog)); + gtk_expander_set_expanded( GTK_EXPANDER(m_pFilterExpander), sal_True); + break; } - aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE ); - m_pFilterExpander = gtk_expander_new_with_mnemonic( - OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr()); - - gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pFilterExpander, sal_False, sal_True, 0 ); - - GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), - GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (m_pFilterExpander), scrolled_window); - gtk_widget_show (scrolled_window); - - ByteString sExpand(getenv("SAL_EXPANDFPICKER")); - sal_Int32 nExpand = sExpand.ToInt32(); - switch (nExpand) - { - default: - case 0: - break; - case 1: - gtk_expander_set_expanded( GTK_EXPANDER(m_pFilterExpander), sal_True); - break; - case 2: - expandexpanders(GTK_CONTAINER(m_pDialog)); - gtk_expander_set_expanded( GTK_EXPANDER(m_pFilterExpander), sal_True); - break; - } - - m_pFilterStore = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING, G_TYPE_STRING); - m_pFilterView = gtk_tree_view_new_with_model (GTK_TREE_MODEL(m_pFilterStore)); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(m_pFilterView), false); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(m_pFilterView), true); - - GtkTreeViewColumn *column; - GtkCellRenderer *cell; - - for (i = 0; i < 2; ++i) - { - column = gtk_tree_view_column_new (); - cell = gtk_cell_renderer_text_new (); - gtk_tree_view_column_set_expand (column, sal_True); - gtk_tree_view_column_pack_start (column, cell, sal_False); - gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column); - } - - gtk_container_add (GTK_CONTAINER (scrolled_window), m_pFilterView); - gtk_widget_show (m_pFilterView); + m_pFilterStore = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, + G_TYPE_STRING, G_TYPE_STRING); + m_pFilterView = gtk_tree_view_new_with_model (GTK_TREE_MODEL(m_pFilterStore)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(m_pFilterView), false); + gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(m_pFilterView), true); + + GtkTreeViewColumn *column; + GtkCellRenderer *cell; + + for (i = 0; i < 2; ++i) + { + column = gtk_tree_view_column_new (); + cell = gtk_cell_renderer_text_new (); + gtk_tree_view_column_set_expand (column, sal_True); + gtk_tree_view_column_pack_start (column, cell, sal_False); + gtk_tree_view_column_set_attributes (column, cell, "text", i, (char *)NULL); + gtk_tree_view_append_column (GTK_TREE_VIEW(m_pFilterView), column); + } + + gtk_container_add (GTK_CONTAINER (scrolled_window), m_pFilterView); + gtk_widget_show (m_pFilterView); gtk_file_chooser_set_extra_widget( GTK_FILE_CHOOSER( m_pDialog ), m_pVBox ); @@ -323,28 +323,28 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact g_signal_connect( G_OBJECT( m_pToggles[PREVIEW] ), "toggled", G_CALLBACK( preview_toggled_cb ), this ); - g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW(m_pFilterView)), "changed", - G_CALLBACK ( type_changed_cb ), this); + g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW(m_pFilterView)), "changed", + G_CALLBACK ( type_changed_cb ), this); g_signal_connect( G_OBJECT( m_pDialog ), "notify::filter", G_CALLBACK( filter_changed_cb ), this); g_signal_connect( G_OBJECT( m_pFilterExpander ), "activate", G_CALLBACK( expander_changed_cb ), this); - g_signal_connect (G_OBJECT( m_pDialog ), "map", - G_CALLBACK (dialog_mapped_cb), this); + g_signal_connect (G_OBJECT( m_pDialog ), "map", + G_CALLBACK (dialog_mapped_cb), this); - gtk_widget_show( m_pVBox ); + gtk_widget_show( m_pVBox ); - PangoLayout *layout = gtk_widget_create_pango_layout (m_pFilterView, NULL); - guint ypad; - PangoRectangle row_height; - pango_layout_set_markup (layout, "All Files", -1); - pango_layout_get_pixel_extents (layout, NULL, &row_height); - g_object_get (cell, "ypad", &ypad, (char *)NULL); - guint height = (row_height.height + 2*ypad) * 5; - gtk_widget_set_size_request (m_pFilterView, -1, height); - gtk_widget_set_size_request (m_pPreview, 1, height); + PangoLayout *layout = gtk_widget_create_pango_layout (m_pFilterView, NULL); + guint ypad; + PangoRectangle row_height; + pango_layout_set_markup (layout, "All Files", -1); + pango_layout_get_pixel_extents (layout, NULL, &row_height); + g_object_get (cell, "ypad", &ypad, (char *)NULL); + guint height = (row_height.height + 2*ypad) * 5; + gtk_widget_set_size_request (m_pFilterView, -1, height); + gtk_widget_set_size_request (m_pPreview, 1, height); - gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), true); + gtk_file_chooser_set_preview_widget_active( GTK_FILE_CHOOSER( m_pDialog ), true); } //------------------------------------------------------------------------------------ @@ -354,13 +354,13 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference<lang::XMultiServiceFact void SAL_CALL SalGtkFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) throw( uno::RuntimeException ) { - m_xListener = xListener; + m_xListener = xListener; } void SAL_CALL SalGtkFilePicker::removeFilePickerListener( const uno::Reference<XFilePickerListener>& ) throw( uno::RuntimeException ) { - m_xListener.clear(); + m_xListener.clear(); } // ------------------------------------------------- @@ -379,22 +379,22 @@ void SAL_CALL SalGtkFilePicker::disposing( const lang::EventObject& aEvent ) thr // FilePicker Event functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::fileSelectionChanged( FilePickerEvent aEvent ) +void SAL_CALL SalGtkFilePicker::fileSelectionChanged( FilePickerEvent aEvent ) { OSL_TRACE( "file selection changed"); - if (m_xListener.is()) m_xListener->fileSelectionChanged( aEvent ); + if (m_xListener.is()) m_xListener->fileSelectionChanged( aEvent ); } -void SAL_CALL SalGtkFilePicker::directoryChanged( FilePickerEvent aEvent ) +void SAL_CALL SalGtkFilePicker::directoryChanged( FilePickerEvent aEvent ) { OSL_TRACE("directory changed"); - if (m_xListener.is()) m_xListener->directoryChanged( aEvent ); + if (m_xListener.is()) m_xListener->directoryChanged( aEvent ); } -void SAL_CALL SalGtkFilePicker::controlStateChanged( FilePickerEvent aEvent ) -{ +void SAL_CALL SalGtkFilePicker::controlStateChanged( FilePickerEvent aEvent ) +{ OSL_TRACE("control state changed"); - if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); + if (m_xListener.is()) m_xListener->controlStateChanged( aEvent ); } //----------------------------------------------------------------------------------------- @@ -405,7 +405,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::helpRequested( FilePickerEvent aEvent ) { rtl::OUString aHelpText; - ::cppu::OInterfaceContainerHelper* pICHelper = + ::cppu::OInterfaceContainerHelper* pICHelper = rBHelper.getContainer( getCppuType( ( uno::Reference<XFilePickerListener> * )0 ) ); if( pICHelper ) @@ -417,27 +417,27 @@ rtl::OUString SAL_CALL SalGtkFilePicker::helpRequested( FilePickerEvent aEvent ) try { /* - if there are multiple listeners responding - to this notification the next response - overwrittes the one before if it is not empty - */ + if there are multiple listeners responding + to this notification the next response + overwrites the one before if it is not empty + */ rtl::OUString aTempString; uno::Reference<XFilePickerListener> xFPListener( iter.next(), uno::UNO_QUERY ); if( xFPListener.is() ) - { + { aTempString = xFPListener->helpRequested( aEvent ); if( aTempString.getLength() ) aHelpText = aTempString; - } + } - } + } catch( uno::RuntimeException& ) { OSL_ENSURE( false, "RuntimeException during event dispatching" ); } - } + } } return aHelpText; @@ -508,7 +508,7 @@ isFilterString( const rtl::OUString &rFilterString, const char *pMatch ) rtl::OUString aToken; bool bIsFilter = true; - rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch)); + rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch)); do { @@ -532,7 +532,7 @@ shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false ) int nBracketEnd = -1; const sal_Unicode* pStr = rFilterName.getStr(); OUString aRealName = rFilterName; - + for( i = aRealName.getLength() - 1; i > 0; i-- ) { if( pStr[i] == ')' ) @@ -541,14 +541,14 @@ shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false ) { nBracketLen = nBracketEnd - i; if( nBracketEnd <= 0 ) - continue; + continue; if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); - else if (bAllowNoStar) - { - if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), ".") ) - aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); - } + aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + else if (bAllowNoStar) + { + if( isFilterString( rFilterName.copy( i + 1, nBracketLen - 1 ), ".") ) + aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() ); + } } } @@ -558,17 +558,17 @@ shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false ) static void dialog_remove_buttons( GtkDialog *pDialog ) { - GdkThreadLock aLock; + GdkThreadLock aLock; - g_return_if_fail( GTK_IS_DIALOG( pDialog ) ); + g_return_if_fail( GTK_IS_DIALOG( pDialog ) ); - GList *pChildren = - gtk_container_get_children( GTK_CONTAINER( pDialog->action_area ) ); + GList *pChildren = + gtk_container_get_children( GTK_CONTAINER( pDialog->action_area ) ); - for( GList *p = pChildren; p; p = p->next ) - gtk_widget_destroy( GTK_WIDGET( p->data ) ); + for( GList *p = pChildren; p; p = p->next ) + gtk_widget_destroy( GTK_WIDGET( p->data ) ); - g_list_free( pChildren ); + g_list_free( pChildren ); } //------------------------------------------------------------------------------------ @@ -635,7 +635,7 @@ sal_Bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilte const UnoFilterEntry* pStart = _rGroupedFilters.getConstArray(); const UnoFilterEntry* pEnd = pStart + _rGroupedFilters.getLength(); for( ; pStart != pEnd; ++pStart ) - if( m_pFilterList->end() != ::std::find_if( + if( m_pFilterList->end() != ::std::find_if( m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch( pStart->First ) ) ) @@ -662,16 +662,16 @@ void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrent //----------------------------------------------------------------------------------------- -// +// //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter ) +void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); if( FilterNameExists( aTitle ) ) - throw IllegalArgumentException(); + throw IllegalArgumentException(); // ensure that we have a filter list ensureFilterList( aTitle ); @@ -681,74 +681,74 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const } //----------------------------------------------------------------------------------------- -// +// //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::setCurrentFilter( const rtl::OUString& aTitle ) +void SAL_CALL SalGtkFilePicker::setCurrentFilter( const rtl::OUString& aTitle ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); - OSL_TRACE( "Setting current filter to %s\n", + OSL_TRACE( "Setting current filter to %s\n", OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); if( aTitle != m_aCurrentFilter ) { m_aCurrentFilter = aTitle; SetCurFilter( m_aCurrentFilter ); - OSL_TRACE( "REALLY Setting current filter to %s\n", + OSL_TRACE( "REALLY Setting current filter to %s\n", OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); } - + // TODO m_pImpl->setCurrentFilter( aTitle ); } //----------------------------------------------------------------------------------------- -// +// //----------------------------------------------------------------------------------------- void SalGtkFilePicker::updateCurrentFilterFromName(const gchar* filtername) { OUString aFilterName(filtername, strlen(filtername), RTL_TEXTENCODING_UTF8); FilterList::iterator aEnd = m_pFilterList->end(); - for (FilterList::iterator aIter = m_pFilterList->begin(); aIter != aEnd; ++aIter) - { - if (aFilterName == shrinkFilterName( aIter->getTitle())) - { - m_aCurrentFilter = aIter->getTitle(); - break; - } - } + for (FilterList::iterator aIter = m_pFilterList->begin(); aIter != aEnd; ++aIter) + { + if (aFilterName == shrinkFilterName( aIter->getTitle())) + { + m_aCurrentFilter = aIter->getTitle(); + break; + } + } } void SalGtkFilePicker::UpdateFilterfromUI() { // Update the filtername from the users selection if they have had a chance to do so. - // If the user explicitly sets a type then use that, if not then take the implicit type - // from the filter of the files glob on which he is currently searching + // If the user explicitly sets a type then use that, if not then take the implicit type + // from the filter of the files glob on which he is currently searching if (!mnHID_FolderChange || !mnHID_SelectionChange) - return; - - GdkThreadLock aLock; - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView)); - GtkTreeIter iter; - GtkTreeModel *model; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - gchar *title; - gtk_tree_model_get (model, &iter, 2, &title, -1); - updateCurrentFilterFromName(title); - g_free (title); - } - else if( GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog))) - { + return; + + GdkThreadLock aLock; + + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView)); + GtkTreeIter iter; + GtkTreeModel *model; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + gchar *title; + gtk_tree_model_get (model, &iter, 2, &title, -1); + updateCurrentFilterFromName(title); + g_free (title); + } + else if( GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog))) + { if (m_pPseudoFilter != filter) - updateCurrentFilterFromName(gtk_file_filter_get_name( filter )); + updateCurrentFilterFromName(gtk_file_filter_get_name( filter )); else - updateCurrentFilterFromName(OUStringToOString( m_aInitialFilter, RTL_TEXTENCODING_UTF8 ).getStr()); - } + updateCurrentFilterFromName(OUStringToOString( m_aInitialFilter, RTL_TEXTENCODING_UTF8 ).getStr()); + } } rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException ) @@ -757,11 +757,11 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeE OSL_TRACE( "GetCURRENTfilter\n" ); - UpdateFilterfromUI(); + UpdateFilterfromUI(); - OSL_TRACE( "Returning current filter of %s\n", + OSL_TRACE( "Returning current filter of %s\n", OUStringToOString( m_aCurrentFilter, RTL_TEXTENCODING_UTF8 ).getStr() ); - + return m_aCurrentFilter; } @@ -769,7 +769,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeE // XFilterGroupManager functions //----------------------------------------------------------------------------------------- -void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) +void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); @@ -778,7 +778,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroup // check the names if( FilterNameExists( aFilters ) ) // TODO: a more precise exception message - throw IllegalArgumentException(); + throw IllegalArgumentException(); // ensure that we have a filter list ::rtl::OUString sInitialCurrentFilter; @@ -788,7 +788,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroup ensureFilterList( sInitialCurrentFilter ); // append the filter - const StringPair* pSubFilters = aFilters.getConstArray(); + const StringPair* pSubFilters = aFilters.getConstArray(); const StringPair* pSubFiltersEnd = pSubFilters + aFilters.getLength(); for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters ) m_pFilterList->insert( m_pFilterList->end(), FilterEntry( pSubFilters->First, pSubFilters->Second ) ); @@ -803,27 +803,27 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u { OSL_ASSERT( m_pDialog != NULL ); - GdkThreadLock aLock; + GdkThreadLock aLock; gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER(m_pDialog), bMode ); } -void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName ) +void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName ) throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); - GdkThreadLock aLock; + GdkThreadLock aLock; OString aStr = OUStringToOString( aName, RTL_TEXTENCODING_UTF8 ); - GtkFileChooserAction eAction = gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ); + GtkFileChooserAction eAction = gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ); - // set_current_name launches a Gtk critical error if called for other than save - if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) - gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER( m_pDialog ), aStr.getStr() ); + // set_current_name launches a Gtk critical error if called for other than save + if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) + gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER( m_pDialog ), aStr.getStr() ); } -void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory ) +void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { implsetDisplayDirectory(rDirectory); @@ -836,125 +836,125 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::Runti uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aFiles = getSelectedFiles(); - /* - The previous multiselection API design was completely broken - and unimplementable for some hetrogenous pseudo-URIs eg. search:// - Thus crop unconditionally to a single selection. - */ - aFiles.realloc (1); - return aFiles; + uno::Sequence< rtl::OUString > aFiles = getSelectedFiles(); + /* + The previous multiselection API design was completely broken + and unimplementable for some heterogeneous pseudo-URIs e.g. search:// + Thus crop unconditionally to a single selection. + */ + aFiles.realloc (1); + return aFiles; } uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); - GdkThreadLock aLock; + GdkThreadLock aLock; GSList* pPathList = gtk_file_chooser_get_uris( GTK_FILE_CHOOSER(m_pDialog) ); - + int nCount = g_slist_length( pPathList ); int nIndex = 0; OSL_TRACE( "GETFILES called %d files\n", nCount ); // get the current action setting GtkFileChooserAction eAction = gtk_file_chooser_get_action( - GTK_FILE_CHOOSER( m_pDialog )); - + GTK_FILE_CHOOSER( m_pDialog )); + uno::Sequence< rtl::OUString > aSelectedFiles(nCount); // Convert to OOo - for( GSList *pElem = pPathList; pElem; pElem = pElem->next) + for( GSList *pElem = pPathList; pElem; pElem = pElem->next) { gchar *pURI = reinterpret_cast<gchar*>(pElem->data); aSelectedFiles[ nIndex ] = uritounicode(pURI); if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) { - OUString sFilterName; - sal_Int32 nTokenIndex = 0; - bool bExtensionTypedIn = false; - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView)); - GtkTreeIter iter; - GtkTreeModel *model; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - gchar *title; - gtk_tree_model_get (model, &iter, 2, &title, -1); - sFilterName = OUString( title, strlen( title), RTL_TEXTENCODING_UTF8 ); - g_free (title); - } - else - { - if( aSelectedFiles[nIndex].indexOf('.') > 0 ) - { - rtl::OUString sExtension; - nTokenIndex = 0; - do - sExtension = aSelectedFiles[nIndex].getToken( 0, '.', nTokenIndex ); - while( nTokenIndex >= 0 ); - - if( sExtension.getLength() >= 3 ) // 3 = typical/minimum extension length - { - static const OUString aStarDot = OUString::createFromAscii( "*." ); - - ::rtl::OUString aNewFilter; - ::rtl::OUString aOldFilter = getCurrentFilter(); - sal_Bool bChangeFilter = sal_True; - for ( FilterList::iterator aListIter = m_pFilterList->begin(); - aListIter != m_pFilterList->end(); - ++aListIter - ) - { - if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 ) - { - if( !aNewFilter.getLength() ) - aNewFilter = aListIter->getTitle(); - - if( aOldFilter == aListIter->getTitle() ) - bChangeFilter = sal_False; - - bExtensionTypedIn = true; - } - } - if( bChangeFilter ) - setCurrentFilter( aNewFilter ); - } - } + OUString sFilterName; + sal_Int32 nTokenIndex = 0; + bool bExtensionTypedIn = false; + + GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView)); + GtkTreeIter iter; + GtkTreeModel *model; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + gchar *title; + gtk_tree_model_get (model, &iter, 2, &title, -1); + sFilterName = OUString( title, strlen( title), RTL_TEXTENCODING_UTF8 ); + g_free (title); + } + else + { + if( aSelectedFiles[nIndex].indexOf('.') > 0 ) + { + rtl::OUString sExtension; + nTokenIndex = 0; + do + sExtension = aSelectedFiles[nIndex].getToken( 0, '.', nTokenIndex ); + while( nTokenIndex >= 0 ); + + if( sExtension.getLength() >= 3 ) // 3 = typical/minimum extension length + { + static const OUString aStarDot = OUString::createFromAscii( "*." ); + + ::rtl::OUString aNewFilter; + ::rtl::OUString aOldFilter = getCurrentFilter(); + sal_Bool bChangeFilter = sal_True; + for ( FilterList::iterator aListIter = m_pFilterList->begin(); + aListIter != m_pFilterList->end(); + ++aListIter + ) + { + if( aListIter->getFilter().indexOf( aStarDot+sExtension ) >= 0 ) + { + if( !aNewFilter.getLength() ) + aNewFilter = aListIter->getTitle(); + + if( aOldFilter == aListIter->getTitle() ) + bChangeFilter = sal_False; + + bExtensionTypedIn = true; + } + } + if( bChangeFilter ) + setCurrentFilter( aNewFilter ); + } + } GtkFileFilter *filter = gtk_file_chooser_get_filter(GTK_FILE_CHOOSER(m_pDialog)); - if (m_pPseudoFilter != filter) + if (m_pPseudoFilter != filter) { - const gchar* filtername = - gtk_file_filter_get_name( filter ); - sFilterName = OUString( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 ); + const gchar* filtername = + gtk_file_filter_get_name( filter ); + sFilterName = OUString( filtername, strlen( filtername ), RTL_TEXTENCODING_UTF8 ); } else sFilterName = m_aInitialFilter; - } + } - OSL_TRACE( "2: current filter is %s\n", + OSL_TRACE( "2: current filter is %s\n", OUStringToOString( sFilterName, RTL_TEXTENCODING_UTF8 ).getStr() ); - FilterList::iterator aListIter = ::std::find_if( - m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(sFilterName) ); + FilterList::iterator aListIter = ::std::find_if( + m_pFilterList->begin(), m_pFilterList->end(), FilterTitleMatch(sFilterName) ); OUString aFilter; - if (aListIter != m_pFilterList->end()) - aFilter = aListIter->getFilter(); + if (aListIter != m_pFilterList->end()) + aFilter = aListIter->getFilter(); - OSL_TRACE( "turned into %s\n", + OSL_TRACE( "turned into %s\n", OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() ); nTokenIndex = 0; rtl::OUString sToken; - // rtl::OUString strExt; + // rtl::OUString strExt; do { sToken = aFilter.getToken( 0, '.', nTokenIndex ); - + if ( sToken.lastIndexOf( ';' ) != -1 ) { sal_Int32 nZero = 0; @@ -968,7 +968,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw if( !bExtensionTypedIn && ( !sToken.equalsAscii( "*" ) ) ) { - //if the filename does not already have the auto extension, stick it on + // if the filename does not already have the auto extension, stick it on OUString sExtension = OUString::createFromAscii( "." ) + sToken; OUString &rBase = aSelectedFiles[nIndex]; sal_Int32 nExtensionIdx = rBase.getLength() - sExtension.getLength(); @@ -1003,32 +1003,32 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) OSL_TRACE( "1: HERE WE ARE\n"); OSL_ASSERT( m_pDialog != NULL ); - GdkThreadLock aLock; + GdkThreadLock aLock; sal_Int16 retVal = 0; SetFilters(); - mnHID_FolderChange = + mnHID_FolderChange = g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "current-folder-changed", G_CALLBACK( folder_changed_cb ), ( gpointer )this ); - mnHID_SelectionChange = + mnHID_SelectionChange = g_signal_connect( GTK_FILE_CHOOSER( m_pDialog ), "selection-changed", G_CALLBACK( selection_changed_cb ), ( gpointer )this ); int btn = GTK_RESPONSE_NO; - uno::Reference< awt::XExtendedToolkit > xToolkit( - m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); + uno::Reference< awt::XExtendedToolkit > xToolkit( + m_xServiceMgr->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.awt.Toolkit") ), uno::UNO_QUERY); RunDialog* pRunDialog = new RunDialog(m_pDialog, xToolkit); uno::Reference < awt::XTopWindowListener > xLifeCycle(pRunDialog); while( GTK_RESPONSE_NO == btn ) { - btn = GTK_RESPONSE_YES; // we dont want to repeat unless user clicks NO for file save. + btn = GTK_RESPONSE_YES; // we don't want to repeat unless user clicks NO for file save. - gint nStatus = pRunDialog->run(); + gint nStatus = pRunDialog->run(); switch( nStatus ) { case GTK_RESPONSE_ACCEPT: @@ -1040,29 +1040,29 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) OString sFileName = unicodetouri( aPathSeq[0] ); if( g_file_test( g_filename_from_uri( sFileName.getStr(), NULL, NULL ), G_FILE_TEST_IS_REGULAR ) ) { - CResourceProvider aResProvider; + CResourceProvider aResProvider; GtkWidget *dlg; - - dlg = gtk_message_dialog_new( NULL, - GTK_DIALOG_MODAL, + + dlg = gtk_message_dialog_new( NULL, + GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, - "%s", - OUStringToOString( - aResProvider.getResString( FILE_PICKER_OVERWRITE ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - - gtk_window_set_title( GTK_WINDOW( dlg ), - OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ), - RTL_TEXTENCODING_UTF8 ).getStr() ); - - RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit); - uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog); - btn = pAnotherDialog->run(); + "%s", + OUStringToOString( + aResProvider.getResString( FILE_PICKER_OVERWRITE ), + RTL_TEXTENCODING_UTF8 ).getStr() ); + + gtk_window_set_title( GTK_WINDOW( dlg ), + OUStringToOString(aResProvider.getResString(FILE_PICKER_TITLE_SAVE ), + RTL_TEXTENCODING_UTF8 ).getStr() ); + + RunDialog* pAnotherDialog = new RunDialog(dlg, xToolkit); + uno::Reference < awt::XTopWindowListener > xAnotherLifeCycle(pAnotherDialog); + btn = pAnotherDialog->run(); gtk_widget_destroy( dlg ); } - + if( btn == GTK_RESPONSE_YES ) retVal = ExecutableDialogResults::OK; } @@ -1078,10 +1078,10 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) case 1: //PLAY { FilePickerEvent evt; - evt.ElementId = PUSHBUTTON_PLAY; - OSL_TRACE( "filter_changed, isn't it great %x\n", this); - controlStateChanged( evt ); - btn = GTK_RESPONSE_NO; + evt.ElementId = PUSHBUTTON_PLAY; + OSL_TRACE( "filter_changed, isn't it great %x\n", this); + controlStateChanged( evt ); + btn = GTK_RESPONSE_NO; } break; @@ -1090,12 +1090,12 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) break; } } - + if (mnHID_FolderChange) g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mnHID_FolderChange); if (mnHID_SelectionChange) g_signal_handler_disconnect(GTK_FILE_CHOOSER( m_pDialog ), mnHID_SelectionChange); - + return retVal; } @@ -1105,8 +1105,8 @@ sal_Int16 SAL_CALL SalGtkFilePicker::execute() throw( uno::RuntimeException ) GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) { OSL_TRACE("control id is %d", nControlId); - GType tType = GTK_TYPE_TOGGLE_BUTTON; //prevent waring by initializing - GtkWidget *pWidget = 0; + GType tType = GTK_TYPE_TOGGLE_BUTTON; // prevent waring by initializing + GtkWidget *pWidget = 0; #define MAP_TOGGLE( elem ) \ case ExtendedFilePickerElementIds::CHECKBOX_##elem: \ @@ -1159,152 +1159,152 @@ GtkWidget *SalGtkFilePicker::getWidget( sal_Int16 nControlId, GType *pType ) //------------------------------------------------------------------------------------ namespace { - void HackWidthToFirst(GtkComboBox *pWidget) - { - GdkThreadLock aLock; + void HackWidthToFirst(GtkComboBox *pWidget) + { + GdkThreadLock aLock; - GtkRequisition requisition; - gtk_widget_size_request(GTK_WIDGET(pWidget), &requisition); - gtk_widget_set_size_request(GTK_WIDGET(pWidget), requisition.width, -1); - } + GtkRequisition requisition; + gtk_widget_size_request(GTK_WIDGET(pWidget), &requisition); + gtk_widget_set_size_request(GTK_WIDGET(pWidget), requisition.width, -1); + } } void SalGtkFilePicker::HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction, const uno::Any& rValue) { - GdkThreadLock aLock; - - switch (nControlAction) - { - case ControlActions::ADD_ITEM: - { - OUString sItem; - rValue >>= sItem; - gtk_combo_box_append_text(pWidget, rtl::OUStringToOString(sItem, RTL_TEXTENCODING_UTF8).getStr()); - if (!bVersionWidthUnset) - { - HackWidthToFirst(pWidget); - bVersionWidthUnset = true; - } - } - break; - case ControlActions::ADD_ITEMS: - { - Sequence< OUString > aStringList; - rValue >>= aStringList; - sal_Int32 nItemCount = aStringList.getLength(); - for (sal_Int32 i = 0; i < nItemCount; ++i) - { - gtk_combo_box_append_text(pWidget, - rtl::OUStringToOString(aStringList[i], RTL_TEXTENCODING_UTF8).getStr()); - if (!bVersionWidthUnset) - { - HackWidthToFirst(pWidget); - bVersionWidthUnset = true; - } - } - } - break; - case ControlActions::DELETE_ITEM: - { - sal_Int32 nPos=0; - rValue >>= nPos; - gtk_combo_box_remove_text(pWidget, nPos); - } - break; - case ControlActions::DELETE_ITEMS: - { - gtk_combo_box_set_active(pWidget, -1); - gint nItems = 0; - do - { - nItems = - gtk_tree_model_iter_n_children( - gtk_combo_box_get_model(pWidget), NULL); - for (gint nI = 0; nI < nItems; ++nI) - gtk_combo_box_remove_text(pWidget, nI); - } - while (nItems); - } - break; - case ControlActions::SET_SELECT_ITEM: - { - sal_Int32 nPos=0; - rValue >>= nPos; - gtk_combo_box_set_active(pWidget, nPos); - } - break; - default: - OSL_TRACE("undocumented/unimplemented ControlAction for a list"); - break; - } - - //I think its best to make it insensitive unless there is the chance to - //actually select something from the list. - gint nItems = gtk_tree_model_iter_n_children( - gtk_combo_box_get_model(pWidget), NULL); - gtk_widget_set_sensitive(GTK_WIDGET(pWidget), nItems > 1 ? true : false); + GdkThreadLock aLock; + + switch (nControlAction) + { + case ControlActions::ADD_ITEM: + { + OUString sItem; + rValue >>= sItem; + gtk_combo_box_append_text(pWidget, rtl::OUStringToOString(sItem, RTL_TEXTENCODING_UTF8).getStr()); + if (!bVersionWidthUnset) + { + HackWidthToFirst(pWidget); + bVersionWidthUnset = true; + } + } + break; + case ControlActions::ADD_ITEMS: + { + Sequence< OUString > aStringList; + rValue >>= aStringList; + sal_Int32 nItemCount = aStringList.getLength(); + for (sal_Int32 i = 0; i < nItemCount; ++i) + { + gtk_combo_box_append_text(pWidget, + rtl::OUStringToOString(aStringList[i], RTL_TEXTENCODING_UTF8).getStr()); + if (!bVersionWidthUnset) + { + HackWidthToFirst(pWidget); + bVersionWidthUnset = true; + } + } + } + break; + case ControlActions::DELETE_ITEM: + { + sal_Int32 nPos=0; + rValue >>= nPos; + gtk_combo_box_remove_text(pWidget, nPos); + } + break; + case ControlActions::DELETE_ITEMS: + { + gtk_combo_box_set_active(pWidget, -1); + gint nItems = 0; + do + { + nItems = + gtk_tree_model_iter_n_children( + gtk_combo_box_get_model(pWidget), NULL); + for (gint nI = 0; nI < nItems; ++nI) + gtk_combo_box_remove_text(pWidget, nI); + } + while (nItems); + } + break; + case ControlActions::SET_SELECT_ITEM: + { + sal_Int32 nPos=0; + rValue >>= nPos; + gtk_combo_box_set_active(pWidget, nPos); + } + break; + default: + OSL_TRACE("undocumented/unimplemented ControlAction for a list"); + break; + } + + // I think its best to make it insensitive unless there is the chance to + // actually select something from the list. + gint nItems = gtk_tree_model_iter_n_children( + gtk_combo_box_get_model(pWidget), NULL); + gtk_widget_set_sensitive(GTK_WIDGET(pWidget), nItems > 1 ? true : false); } uno::Any SalGtkFilePicker::HandleGetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction) const { - GdkThreadLock aLock; - - uno::Any aAny; - switch (nControlAction) - { - case ControlActions::GET_ITEMS: - { - Sequence< OUString > aItemList; - - GtkTreeModel *pTree = gtk_combo_box_get_model(pWidget); - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first(pTree, &iter)) - { - sal_Int32 nSize = gtk_tree_model_iter_n_children( - pTree, NULL); - - aItemList.realloc(nSize); - for (sal_Int32 i=0; i < nSize; ++i) - { - gchar *item; - gtk_tree_model_get(gtk_combo_box_get_model(pWidget), - &iter, 0, &item, -1); - aItemList[i] = OUString(item, strlen(item), RTL_TEXTENCODING_UTF8); - g_free(item); - gtk_tree_model_iter_next(pTree, &iter); - } - } - aAny <<= aItemList; - } - break; - case ControlActions::GET_SELECTED_ITEM: - { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter(pWidget, &iter)) - { - gchar *item; - gtk_tree_model_get(gtk_combo_box_get_model(pWidget), - &iter, 0, &item, -1); - OUString sItem(item, strlen(item), RTL_TEXTENCODING_UTF8); - aAny <<= sItem; - g_free(item); - } - } - break; - case ControlActions::GET_SELECTED_ITEM_INDEX: - { - gint nActive = gtk_combo_box_get_active(pWidget); - aAny <<= static_cast< sal_Int32 >(nActive); - } - break; - default: - OSL_TRACE("undocumented/unimplemented ControlAction for a list"); - break; - } - return aAny; -} - -void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue ) + GdkThreadLock aLock; + + uno::Any aAny; + switch (nControlAction) + { + case ControlActions::GET_ITEMS: + { + Sequence< OUString > aItemList; + + GtkTreeModel *pTree = gtk_combo_box_get_model(pWidget); + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first(pTree, &iter)) + { + sal_Int32 nSize = gtk_tree_model_iter_n_children( + pTree, NULL); + + aItemList.realloc(nSize); + for (sal_Int32 i=0; i < nSize; ++i) + { + gchar *item; + gtk_tree_model_get(gtk_combo_box_get_model(pWidget), + &iter, 0, &item, -1); + aItemList[i] = OUString(item, strlen(item), RTL_TEXTENCODING_UTF8); + g_free(item); + gtk_tree_model_iter_next(pTree, &iter); + } + } + aAny <<= aItemList; + } + break; + case ControlActions::GET_SELECTED_ITEM: + { + GtkTreeIter iter; + if (gtk_combo_box_get_active_iter(pWidget, &iter)) + { + gchar *item; + gtk_tree_model_get(gtk_combo_box_get_model(pWidget), + &iter, 0, &item, -1); + OUString sItem(item, strlen(item), RTL_TEXTENCODING_UTF8); + aAny <<= sItem; + g_free(item); + } + } + break; + case ControlActions::GET_SELECTED_ITEM_INDEX: + { + gint nActive = gtk_combo_box_get_active(pWidget); + aAny <<= static_cast< sal_Int32 >(nActive); + } + break; + default: + OSL_TRACE("undocumented/unimplemented ControlAction for a list"); + break; + } + return aAny; +} + +void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue ) throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); @@ -1313,7 +1313,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr GType tType; GtkWidget *pWidget; - GdkThreadLock aLock; + GdkThreadLock aLock; if( !( pWidget = getWidget( nControlId, &tType ) ) ) OSL_TRACE("enable unknown control %d\n", nControlId); @@ -1327,12 +1327,12 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr HandleSetListValue(GTK_COMBO_BOX(pWidget), nControlAction, rValue); else { - OSL_TRACE("Can't set value on button / list %d %d\n", + OSL_TRACE("Can't set value on button / list %d %d\n", nControlId, nControlAction); } } -uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) +uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); @@ -1342,7 +1342,7 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC GType tType; GtkWidget *pWidget; - GdkThreadLock aLock; + GdkThreadLock aLock; if( !( pWidget = getWidget( nControlId, &tType ) ) ) OSL_TRACE("enable unknown control %d\n", nControlId); @@ -1351,20 +1351,20 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC else if( tType == GTK_TYPE_COMBO_BOX ) aRetval = HandleGetListValue(GTK_COMBO_BOX(pWidget), nControlAction); else - OSL_TRACE("Can't get value on button / list %d %d\n", + OSL_TRACE("Can't get value on button / list %d %d\n", nControlId, nControlAction ); return aRetval; } -void SAL_CALL SalGtkFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable ) +void SAL_CALL SalGtkFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); GtkWidget *pWidget; - GdkThreadLock aLock; + GdkThreadLock aLock; if ( nControlId == ExtendedFilePickerElementIds::LISTBOX_FILTER_SELECTOR ) gtk_expander_set_expanded( GTK_EXPANDER( m_pFilterExpander ), bEnable ); @@ -1385,7 +1385,7 @@ throw( uno::RuntimeException ) OSL_TRACE("enable unknown control %d\n", nControlId ); } -void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& rLabel ) +void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& rLabel ) throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); @@ -1393,28 +1393,28 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUS GType tType; GtkWidget *pWidget; - GdkThreadLock aLock; + GdkThreadLock aLock; if( !( pWidget = getWidget( nControlId, &tType ) ) ) { - OSL_TRACE("Set label on unknown control %d\n", nControlId); + OSL_TRACE("Set label on unknown control %d\n", nControlId); return; } - OString aTxt = OUStringToOString( rLabel.replace('~', '_'), RTL_TEXTENCODING_UTF8 ); - if (nControlId == ExtendedFilePickerElementIds::PUSHBUTTON_PLAY) - { + OString aTxt = OUStringToOString( rLabel.replace('~', '_'), RTL_TEXTENCODING_UTF8 ); + if (nControlId == ExtendedFilePickerElementIds::PUSHBUTTON_PLAY) + { #ifdef GTK_STOCK_MEDIA_PLAY - if (!msPlayLabel.getLength()) - msPlayLabel = rLabel; - if (msPlayLabel == rLabel) - gtk_button_set_label(GTK_BUTTON(pWidget), GTK_STOCK_MEDIA_PLAY); - else - gtk_button_set_label(GTK_BUTTON(pWidget), GTK_STOCK_MEDIA_STOP); + if (!msPlayLabel.getLength()) + msPlayLabel = rLabel; + if (msPlayLabel == rLabel) + gtk_button_set_label(GTK_BUTTON(pWidget), GTK_STOCK_MEDIA_PLAY); + else + gtk_button_set_label(GTK_BUTTON(pWidget), GTK_STOCK_MEDIA_STOP); #else - gtk_button_set_label(GTK_BUTTON(pWidget), aTxt.getStr()); + gtk_button_set_label(GTK_BUTTON(pWidget), aTxt.getStr()); #endif - } + } else if( tType == GTK_TYPE_TOGGLE_BUTTON || tType == GTK_TYPE_BUTTON || tType == GTK_TYPE_LABEL ) g_object_set( pWidget, "label", aTxt.getStr(), "use_underline", sal_True, (char *)NULL ); @@ -1431,7 +1431,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId ) OString aTxt; GtkWidget *pWidget; - GdkThreadLock aLock; + GdkThreadLock aLock; if( !( pWidget = getWidget( nControlId, &tType ) ) ) OSL_TRACE("Get label on unknown control %d\n", nControlId); @@ -1477,7 +1477,7 @@ sal_Int32 SAL_CALL SalGtkFilePicker::getAvailableHeight() throw( uno::RuntimeExc return m_PreviewImageHeight; } -void SAL_CALL SalGtkFilePicker::setImage( sal_Int16 /*aImageFormat*/, const uno::Any& /*aImage*/ ) +void SAL_CALL SalGtkFilePicker::setImage( sal_Int16 /*aImageFormat*/, const uno::Any& /*aImage*/ ) throw( lang::IllegalArgumentException, uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); @@ -1487,23 +1487,23 @@ void SAL_CALL SalGtkFilePicker::setImage( sal_Int16 /*aImageFormat*/, const uno: void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) { - CResourceProvider aResProvider; - OUString aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE ); - - GdkThreadLock aLock; - - GtkTreeIter iter; - GtkTreeModel *model; - if (gtk_tree_selection_get_selected (selection, &model, &iter)) - { - gchar *title; - gtk_tree_model_get (model, &iter, 2, &title, -1); - aLabel += rtl::OUString::createFromAscii( ": " ); - aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); - g_free (title); - } - gtk_expander_set_label (GTK_EXPANDER (m_pFilterExpander), - OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr()); + CResourceProvider aResProvider; + OUString aLabel = aResProvider.getResString( FILE_PICKER_FILE_TYPE ); + + GdkThreadLock aLock; + + GtkTreeIter iter; + GtkTreeModel *model; + if (gtk_tree_selection_get_selected (selection, &model, &iter)) + { + gchar *title; + gtk_tree_model_get (model, &iter, 2, &title, -1); + aLabel += rtl::OUString::createFromAscii( ": " ); + aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 ); + g_free (title); + } + gtk_expander_set_label (GTK_EXPANDER (m_pFilterExpander), + OUStringToOString( aLabel, RTL_TEXTENCODING_UTF8 ).getStr()); FilePickerEvent evt; evt.ElementId = LISTBOX_FILTER; controlStateChanged( evt ); @@ -1511,20 +1511,20 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection ) void SalGtkFilePicker::type_changed_cb( GtkTreeSelection *selection, SalGtkFilePicker *pobjFP ) { - pobjFP->implChangeType(selection); + pobjFP->implChangeType(selection); } void SalGtkFilePicker::unselect_type() { - GdkThreadLock aLock; + GdkThreadLock aLock; - gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView))); + gtk_tree_selection_unselect_all(gtk_tree_view_get_selection(GTK_TREE_VIEW(m_pFilterView))); } void SalGtkFilePicker::expander_changed_cb( GtkExpander *expander, SalGtkFilePicker *pobjFP ) { - if (gtk_expander_get_expanded(expander)) - pobjFP->unselect_type(); + if (gtk_expander_get_expanded(expander)) + pobjFP->unselect_type(); } void SalGtkFilePicker::filter_changed_cb( GtkFileChooser *, GParamSpec *, @@ -1568,7 +1568,7 @@ void SalGtkFilePicker::update_preview_cb( GtkFileChooser *file_chooser, SalGtkFi pobjFP->m_PreviewImageHeight, NULL ); have_preview = ( pixbuf != NULL ); - + gtk_image_set_from_pixbuf( GTK_IMAGE( preview ), pixbuf ); if( pixbuf ) gdk_pixbuf_unref( pixbuf ); @@ -1588,17 +1588,17 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u // TODO return m_pImpl->setShowState( bShowState ); if( bShowState != mbPreviewState ) { - GdkThreadLock aLock; + GdkThreadLock aLock; if( bShowState ) { // Show - if( !mHID_Preview ) - { - mHID_Preview = g_signal_connect( - GTK_FILE_CHOOSER( m_pDialog ), "update-preview", - G_CALLBACK( update_preview_cb ), ( gpointer )this ); - } + if( !mHID_Preview ) + { + mHID_Preview = g_signal_connect( + GTK_FILE_CHOOSER( m_pDialog ), "update-preview", + G_CALLBACK( update_preview_cb ), ( gpointer )this ); + } gtk_widget_show( m_pPreview ); } else @@ -1626,20 +1626,20 @@ sal_Bool SAL_CALL SalGtkFilePicker::getShowState() throw( uno::RuntimeException // XInitialization //------------------------------------------------------------------------------------ -void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) +void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) throw( uno::Exception, uno::RuntimeException ) { - // parameter checking + // parameter checking uno::Any aAny; if( 0 == aArguments.getLength() ) throw lang::IllegalArgumentException( rtl::OUString::createFromAscii( "no arguments" ), static_cast<XFilePicker2*>( this ), 1 ); - + aAny = aArguments[0]; if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) && - (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) + (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) ) throw lang::IllegalArgumentException( rtl::OUString::createFromAscii( "invalid argument type" ), static_cast<XFilePicker2*>( this ), 1 ); @@ -1651,8 +1651,8 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu const gchar *first_button_text = GTK_STOCK_OPEN; - // TODO: extract full semantic from - // svtools/source/filepicker/filepicker.cxx (getWinBits) + // TODO: extract full semantic from + // svtools/source/filepicker/filepicker.cxx (getWinBits) switch( templateId ) { case FILEOPEN_SIMPLE: @@ -1664,7 +1664,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu eAction = GTK_FILE_CHOOSER_ACTION_SAVE; first_button_text = GTK_STOCK_SAVE; OSL_TRACE( "2all true\n" ); - break; + break; case FILESAVE_AUTOEXTENSION_PASSWORD: eAction = GTK_FILE_CHOOSER_ACTION_SAVE; first_button_text = GTK_STOCK_SAVE; @@ -1679,21 +1679,21 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu mbToggleVisibility[FILTEROPTIONS] = true; OSL_TRACE( "4all true\n" ); // TODO - break; + break; case FILESAVE_AUTOEXTENSION_SELECTION: eAction = GTK_FILE_CHOOSER_ACTION_SAVE; // SELECT_FOLDER ? first_button_text = GTK_STOCK_SAVE; mbToggleVisibility[SELECTION] = true; OSL_TRACE( "5all true\n" ); // TODO - break; + break; case FILESAVE_AUTOEXTENSION_TEMPLATE: eAction = GTK_FILE_CHOOSER_ACTION_SAVE; first_button_text = GTK_STOCK_SAVE; mbListVisibility[TEMPLATE] = true; OSL_TRACE( "6all true\n" ); // TODO - break; + break; case FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE: eAction = GTK_FILE_CHOOSER_ACTION_OPEN; first_button_text = GTK_STOCK_OPEN; @@ -1701,18 +1701,18 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu mbToggleVisibility[PREVIEW] = true; mbListVisibility[IMAGE_TEMPLATE] = true; // TODO - break; - case FILEOPEN_PLAY: + break; + case FILEOPEN_PLAY: eAction = GTK_FILE_CHOOSER_ACTION_OPEN; first_button_text = GTK_STOCK_OPEN; mbButtonVisibility[PLAY] = true; // TODO - break; + break; case FILEOPEN_READONLY_VERSION: eAction = GTK_FILE_CHOOSER_ACTION_OPEN; first_button_text = GTK_STOCK_OPEN; mbToggleVisibility[READONLY] = true; - mbListVisibility[VERSION] = true; + mbListVisibility[VERSION] = true; break; case FILEOPEN_LINK_PREVIEW: eAction = GTK_FILE_CHOOSER_ACTION_OPEN; @@ -1720,49 +1720,49 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu mbToggleVisibility[LINK] = true; mbToggleVisibility[PREVIEW] = true; // TODO - break; + break; case FILESAVE_AUTOEXTENSION: eAction = GTK_FILE_CHOOSER_ACTION_SAVE; first_button_text = GTK_STOCK_SAVE; OSL_TRACE( "7all true\n" ); // TODO - break; + break; default: - throw lang::IllegalArgumentException( + throw lang::IllegalArgumentException( rtl::OUString::createFromAscii( "Unknown template" ), static_cast< XFilePicker2* >( this ), 1 ); } - GdkThreadLock aLock; - - if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) - { - CResourceProvider aResProvider; - OUString aFilePickerTitle(aResProvider.getResString( FILE_PICKER_TITLE_SAVE )); - gtk_window_set_title ( GTK_WINDOW( m_pDialog ), - OUStringToOString( aFilePickerTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); - } - - gtk_file_chooser_set_action( GTK_FILE_CHOOSER( m_pDialog ), eAction); - dialog_remove_buttons( GTK_DIALOG( m_pDialog ) ); - gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL ); - for( int nTVIndex = 0; nTVIndex < BUTTON_LAST; nTVIndex++ ) - { - if( mbButtonVisibility[nTVIndex] ) - { + GdkThreadLock aLock; + + if( GTK_FILE_CHOOSER_ACTION_SAVE == eAction ) + { + CResourceProvider aResProvider; + OUString aFilePickerTitle(aResProvider.getResString( FILE_PICKER_TITLE_SAVE )); + gtk_window_set_title ( GTK_WINDOW( m_pDialog ), + OUStringToOString( aFilePickerTitle, RTL_TEXTENCODING_UTF8 ).getStr() ); + } + + gtk_file_chooser_set_action( GTK_FILE_CHOOSER( m_pDialog ), eAction); + dialog_remove_buttons( GTK_DIALOG( m_pDialog ) ); + gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL ); + for( int nTVIndex = 0; nTVIndex < BUTTON_LAST; nTVIndex++ ) + { + if( mbButtonVisibility[nTVIndex] ) + { #ifdef GTK_STOCK_MEDIA_PLAY - m_pButtons[ nTVIndex ] = gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), GTK_STOCK_MEDIA_PLAY, 1 ); + m_pButtons[ nTVIndex ] = gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), GTK_STOCK_MEDIA_PLAY, 1 ); #else - CResourceProvider aResProvider; - OString aPlay = OUStringToOString( aResProvider.getResString( PUSHBUTTON_PLAY ), RTL_TEXTENCODING_UTF8 ); - m_pButtons[ nTVIndex ] = gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), aPlay.getStr(), 1 ); + CResourceProvider aResProvider; + OString aPlay = OUStringToOString( aResProvider.getResString( PUSHBUTTON_PLAY ), RTL_TEXTENCODING_UTF8 ); + m_pButtons[ nTVIndex ] = gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), aPlay.getStr(), 1 ); #endif - } - } - gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), first_button_text, GTK_RESPONSE_ACCEPT ); + } + } + gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), first_button_text, GTK_RESPONSE_ACCEPT ); - gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); + gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT ); // Setup special flags for( int nTVIndex = 0; nTVIndex < TOGGLE_LAST; nTVIndex++ ) @@ -1774,13 +1774,13 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu for( int nTVIndex = 0; nTVIndex < LIST_LAST; nTVIndex++ ) { if( mbListVisibility[nTVIndex] ) - { - gtk_widget_set_sensitive( m_pLists[ nTVIndex ], false ); + { + gtk_widget_set_sensitive( m_pLists[ nTVIndex ], false ); gtk_widget_show( m_pLists[ nTVIndex ] ); gtk_widget_show( m_pListLabels[ nTVIndex ] ); - gtk_widget_show( m_pAligns[ nTVIndex ] ); + gtk_widget_show( m_pAligns[ nTVIndex ] ); gtk_widget_show( m_pHBoxs[ nTVIndex ] ); - } + } } } @@ -1798,14 +1798,14 @@ void SAL_CALL SalGtkFilePicker::cancel() throw( uno::RuntimeException ) { OSL_ASSERT( m_pDialog != NULL ); - // TODO m_pImpl->cancel(); + // TODO m_pImpl->cancel(); } // ------------------------------------------------- // XServiceInfo // ------------------------------------------------- -rtl::OUString SAL_CALL SalGtkFilePicker::getImplementationName() +rtl::OUString SAL_CALL SalGtkFilePicker::getImplementationName() throw( uno::RuntimeException ) { return rtl::OUString::createFromAscii( FILE_PICKER_IMPL_NAME ); @@ -1815,7 +1815,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getImplementationName() // XServiceInfo // ------------------------------------------------- -sal_Bool SAL_CALL SalGtkFilePicker::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL SalGtkFilePicker::supportsService( const rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { uno::Sequence <rtl::OUString> SupportedServicesNames = FilePicker_getSupportedServiceNames(); @@ -1831,7 +1831,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::supportsService( const rtl::OUString& Servic // XServiceInfo // ------------------------------------------------- -uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSupportedServiceNames() +uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSupportedServiceNames() throw( uno::RuntimeException ) { return FilePicker_getSupportedServiceNames(); @@ -1843,7 +1843,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSupportedServiceNames //------------------------------------------------- void SalGtkFilePicker::SetCurFilter( const OUString& rFilter ) { - GdkThreadLock aLock; + GdkThreadLock aLock; // Get all the filters already added GSList *filters = gtk_file_chooser_list_filters ( GTK_FILE_CHOOSER( m_pDialog ) ); @@ -1872,35 +1872,35 @@ extern "C" static gboolean case_insensitive_filter (const GtkFileFilterInfo *filter_info, gpointer data) { - gboolean bRetval = sal_False; - const char *pFilter = (const char *) data; + gboolean bRetval = sal_False; + const char *pFilter = (const char *) data; - g_return_val_if_fail( data != NULL, sal_False ); - g_return_val_if_fail( filter_info != NULL, sal_False ); + g_return_val_if_fail( data != NULL, sal_False ); + g_return_val_if_fail( filter_info != NULL, sal_False ); - if( !filter_info->uri ) - return sal_False; + if( !filter_info->uri ) + return sal_False; - const char *pExtn = strrchr( filter_info->uri, '.' ); - if( !pExtn ) - return sal_False; - pExtn++; + const char *pExtn = strrchr( filter_info->uri, '.' ); + if( !pExtn ) + return sal_False; + pExtn++; - if( !g_ascii_strcasecmp( pFilter, pExtn ) ) - bRetval = sal_True; + if( !g_ascii_strcasecmp( pFilter, pExtn ) ) + bRetval = sal_True; #ifdef DEBUG - fprintf( stderr, "'%s' match extn '%s' vs '%s' yeilds %d\n", - filter_info->uri, pExtn, pFilter, bRetval ); + fprintf( stderr, "'%s' match extn '%s' vs '%s' yeilds %d\n", + filter_info->uri, pExtn, pFilter, bRetval ); #endif - return bRetval; + return bRetval; } } GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const OUString& rType ) { - GdkThreadLock aLock; + GdkThreadLock aLock; GtkFileFilter *filter = gtk_file_filter_new(); @@ -1908,8 +1908,8 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 ); gtk_file_filter_set_name( filter, aFilterName.getStr() ); - static const OUString aStarDot = OUString::createFromAscii( "*." ); - OUString aTokens; + static const OUString aStarDot = OUString::createFromAscii( "*." ); + OUString aTokens; bool bAllGlob = !rType.compareToAscii( "*.*" ) || !rType.compareToAscii( "*" ); if (bAllGlob) @@ -1921,26 +1921,26 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O do { aToken = rType.getToken( 0, ';', nIndex ); - // Assume all have the "*.<extn>" syntax - aToken = aToken.copy( aToken.lastIndexOf( aStarDot ) + 2 ); + // Assume all have the "*.<extn>" syntax + aToken = aToken.copy( aToken.lastIndexOf( aStarDot ) + 2 ); if (aToken.getLength()) - { - if (aTokens.getLength()) - aTokens += OUString::createFromAscii(","); - aTokens = aTokens += aToken; - gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, - case_insensitive_filter, - g_strdup( rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8).getStr() ), - (GDestroyNotify) g_free ); - - OSL_TRACE( "fustering with %s\n", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr()); - } + { + if (aTokens.getLength()) + aTokens += OUString::createFromAscii(","); + aTokens = aTokens += aToken; + gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI, + case_insensitive_filter, + g_strdup( rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8).getStr() ), + (GDestroyNotify) g_free ); + + OSL_TRACE( "fustering with %s\n", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr()); + } #ifdef DEBUG - else - { - g_warning( "Duff filter token '%s'\n", - rtl::OUStringToOString( rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ).getStr()); - } + else + { + g_warning( "Duff filter token '%s'\n", + rtl::OUStringToOString( rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ).getStr()); + } #endif } while( nIndex >= 0 ); @@ -1948,18 +1948,18 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O gtk_file_chooser_add_filter( GTK_FILE_CHOOSER( m_pDialog ), filter ); - if (!bAllGlob) - { - GtkTreeIter iter; - gtk_list_store_append (m_pFilterStore, &iter); - gtk_list_store_set (m_pFilterStore, &iter, - 0, OUStringToOString(shrinkFilterName( rFilter, true ), RTL_TEXTENCODING_UTF8).getStr(), - 1, OUStringToOString(aTokens, RTL_TEXTENCODING_UTF8).getStr(), - 2, aFilterName.getStr(), - 3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(), - -1); - } - return filter; + if (!bAllGlob) + { + GtkTreeIter iter; + gtk_list_store_append (m_pFilterStore, &iter); + gtk_list_store_set (m_pFilterStore, &iter, + 0, OUStringToOString(shrinkFilterName( rFilter, true ), RTL_TEXTENCODING_UTF8).getStr(), + 1, OUStringToOString(aTokens, RTL_TEXTENCODING_UTF8).getStr(), + 2, aFilterName.getStr(), + 3, OUStringToOString(rType, RTL_TEXTENCODING_UTF8).getStr(), + -1); + } + return filter; } void SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const Sequence< StringPair >& _rFilters ) @@ -1974,14 +1974,14 @@ void SalGtkFilePicker::implAddFilterGroup( const OUString& /*_rFilter*/, const S void SalGtkFilePicker::SetFilters() { - GdkThreadLock aLock; + GdkThreadLock aLock; if (!m_aInitialFilter.getLength()) m_aInitialFilter = m_aCurrentFilter; rtl::OUString sPseudoFilter; - if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) ) - { + if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) ) + { std::set<OUString> aAllFormats; if( m_pFilterList && !m_pFilterList->empty() ) { @@ -1994,7 +1994,7 @@ void SalGtkFilePicker::SetFilters() { // it's a filter group UnoFilterList aSubFilters; aListIter->getSubFilters( aSubFilters ); - const StringPair* pSubFilters = aSubFilters.getConstArray(); + const StringPair* pSubFilters = aSubFilters.getConstArray(); const StringPair* pSubFiltersEnd = pSubFilters + aSubFilters.getLength(); for( ; pSubFilters != pSubFiltersEnd; ++pSubFilters ) aAllFormats.insert(pSubFilters->Second); @@ -2017,7 +2017,7 @@ void SalGtkFilePicker::SetFilters() sPseudoFilter = aResProvider.getResString(FILE_PICKER_ALLFORMATS); m_pPseudoFilter = implAddFilter( sPseudoFilter, sAllFilter ); } - } + } if( m_pFilterList && !m_pFilterList->empty() ) { @@ -2043,10 +2043,10 @@ void SalGtkFilePicker::SetFilters() } } - if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_pFilterStore), NULL)) //If m_pFilterStore is not empty - gtk_widget_show( m_pFilterExpander ); - else - gtk_widget_hide( m_pFilterExpander ); + if (gtk_tree_model_iter_n_children(GTK_TREE_MODEL(m_pFilterStore), NULL)) //If m_pFilterStore is not empty + gtk_widget_show( m_pFilterExpander ); + else + gtk_widget_hide( m_pFilterExpander ); // set the default filter if (sPseudoFilter.getLength()) @@ -2065,15 +2065,15 @@ SalGtkFilePicker::~SalGtkFilePicker() gtk_widget_destroy( m_pToggles[i] ); for( i = 0; i < LIST_LAST; i++ ) - { + { gtk_widget_destroy( m_pListLabels[i] ); gtk_widget_destroy( m_pAligns[i] ); //m_pAligns[i] owns m_pLists[i] gtk_widget_destroy( m_pHBoxs[i] ); - } + } delete m_pFilterList; gtk_widget_destroy( m_pVBox ); } -/* vi:set tabstop=4 shiftwidth=4 expandtab: */ +/* vim: set noet sw=4 ts=4: */