diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2002-11-20 08:10:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2002-11-20 08:10:59 +0000 |
| commit | b772e59d3322d2eddbf9b0b2cfe282ceaaed0406 (patch) | |
| tree | 89904b40f820f69f15499b56dab61850d737d420 /sfx2 | |
| parent | c73c75da49d345645bc4e9fd6f72ef294cf85aaa (diff) | |
#100000#, #90974#: Joined change from 1.97.2.1 to 1.97.2.2 (author: GT) into HEAD.
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/filedlghelper.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 0d4cd72c61dd..56aa6964eda7 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2,9 +2,6 @@ * * $RCSfile: filedlghelper.cxx,v $ * - * $Revision: 1.97 $ - * - * last change: $Author: gt $ $Date: 2002-10-31 14:52:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -181,9 +178,9 @@ #ifndef _PICKERHELPER_HXX #include <svtools/pickerhelper.hxx> #endif -#ifndef _SVX_SVXIDS_HRC -#include <svx/svxids.hrc> -#endif +//#ifndef _SVX_SVXIDS_HRC +//#include <svx/svxids.hrc> +//#endif #ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> #endif @@ -2061,9 +2058,10 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext ) switch( _eNewContext ) { - case FileDialogHelper::SW_INSERT_GRAPHIC: - case FileDialogHelper::SC_INSERT_GRAPHIC: - case FileDialogHelper::SD_INSERT_GRAPHIC: nNewHelpId = SID_INSERT_GRAPHIC; break; +// #104952# dependency to SVX not allowed! When used again, another solution has to be found +// case FileDialogHelper::SW_INSERT_GRAPHIC: +// case FileDialogHelper::SC_INSERT_GRAPHIC: +// case FileDialogHelper::SD_INSERT_GRAPHIC: nNewHelpId = SID_INSERT_GRAPHIC; break; case FileDialogHelper::SW_INSERT_SOUND: case FileDialogHelper::SC_INSERT_SOUND: case FileDialogHelper::SD_INSERT_SOUND: nNewHelpId = SID_INSERT_SOUND; break; @@ -2076,8 +2074,8 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext ) if( pConfigId ) LoadLastUsedFilter( *pConfigId ); - if( nNewHelpId ) - this->setDialogHelpId( nNewHelpId ); +// if( nNewHelpId ) +// this->setDialogHelpId( nNewHelpId ); } // ------------------------------------------------------------------------ @@ -2343,8 +2341,8 @@ ErrCode FileOpenDialog_Impl( sal_uInt32 nFlags, ErrCode nRet; FileDialogHelper aDialog( nFlags, rFact ); - if( nHelpId ) - aDialog.SetDialogHelpId( nHelpId ); +// if( nHelpId ) +// aDialog.SetDialogHelpId( nHelpId ); nRet = aDialog.Execute( aPath, rpURLList, rpSet, rFilter ); |