summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:13:10 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 23:13:10 +0000
commite2a6306cc19c47f4b7a6eb567ebbd12b3035e3ae (patch)
tree2f8698e150c806ce6fadc5013cb58d927536e8c2
parent56c5a37090d69f4f6f2657e7318d19b8da45fde2 (diff)
INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED
2006/01/25 20:30:22 sb 1.3.18.2: RESYNC: (1.3-1.4); FILE MERGED 2005/11/16 12:07:41 pl 1.3.18.1: #i55991# removed warnings
-rw-r--r--fpicker/source/office/iodlgimp.hxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx
index b11a2e4d82..ba14c1d3c5 100644
--- a/fpicker/source/office/iodlgimp.hxx
+++ b/fpicker/source/office/iodlgimp.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: iodlgimp.hxx,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: obo $ $Date: 2005-12-21 13:10:55 $
+ * last change: $Author: hr $ $Date: 2006-06-20 00:13:10 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -108,7 +108,7 @@ public:
// SvtFileDialogFilterList_Impl
//*****************************************************************************
-SV_DECL_PTRARR_DEL( SvtFileDialogFilterList_Impl, SvtFileDialogFilter_Impl*, 3, 3 );
+SV_DECL_PTRARR_DEL( SvtFileDialogFilterList_Impl, SvtFileDialogFilter_Impl*, 3, 3 )
//*****************************************************************************
// SvtFileDlgMode
@@ -140,8 +140,7 @@ private:
PopupMenu* m_pMenu;
protected:
-// inline const SvtFileDialog* GetParent() const { return _pParent; }
- inline SvtFileDialog* GetParent() { return m_pParent; }
+ inline SvtFileDialog* GetDialogParent() { return m_pParent; }
protected:
void OpenURL( const String& rURL );