summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:13:47 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:13:47 +0000
commit6a5c4fd32fafe06ae8e9dde0ecabbd9e5e98eb17 (patch)
tree3e878cc32241c186ad34710970330b07e1a9dd81
parent34673b330dbea8d3d1514f820da0b5d13af30038 (diff)
INTEGRATION: CWS warnings01 (1.7.18); FILE MERGED
2005/11/16 12:07:43 pl 1.7.18.2: #i55991# removed warnings 2005/10/27 10:43:18 os 1.7.18.1: #i53898# warnings removed
-rw-r--r--fpicker/source/unx/gnome/SalGtkFilePicker.hxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
index 627d82ac90..37fd974b0a 100644
--- a/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
+++ b/fpicker/source/unx/gnome/SalGtkFilePicker.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: SalGtkFilePicker.hxx,v $
*
- * $Revision: 1.7 $
+ * $Revision: 1.8 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 23:35:03 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:13:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -246,6 +246,7 @@ class SalGtkFilePicker :
// XEventListener
//------------------------------------------------
+ using cppu::WeakComponentImplHelperBase::disposing;
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent )
throw(::com::sun::star::uno::RuntimeException);
@@ -336,7 +337,14 @@ class SalGtkFilePicker :
::rtl::OUString m_aCurrentFilter;
- GtkWidget *getWidget( sal_Int16 nControlId, GType *pType = NULL);
+ bool bVersionWidthUnset;
+ sal_Bool mbPreviewState;
+ gulong mHID_Preview;
+ GtkWidget* m_pPreview;
+ sal_Int32 m_PreviewImageWidth;
+ sal_Int32 m_PreviewImageHeight;
+
+ GtkWidget *getWidget( sal_Int16 nControlId, GType *pType = NULL);
void SetCurFilter( const OUString& rFilter );
void SetFilters();
@@ -348,14 +356,6 @@ class SalGtkFilePicker :
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair>& _rFilters );
void updateCurrentFilterFromName(const gchar* filtername);
void unselect_type();
-
- bool bVersionWidthUnset;
- sal_Bool mbPreviewState;
- gulong mHID_Preview;
- GtkWidget* m_pPreview;
- sal_Int32 m_PreviewImageWidth;
- sal_Int32 m_PreviewImageHeight;
-
void InitialMapping();
void HandleSetListValue(GtkComboBox *pWidget, sal_Int16 nControlAction,