#105006# merge

5 files changed, 20 insertions, 31 deletions

diff --git a/sfx2/source/dialog/cfg.cxx b/sfx2/source/dialog/cfg.cxx
index a94ac5cfab79..6396746908d8 100644
--- a/sfx2/source/dialog/cfg.cxx
+++ b/sfx2/source/dialog/cfg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cfg.cxx,v $
  *
- *  $Revision: 1.30 $
+ *  $Revision: 1.31 $
  *
- *  last change: $Author: rt $ $Date: 2002-11-20 10:39:47 $
+ *  last change: $Author: obo $ $Date: 2002-11-20 11:41:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1444,7 +1444,7 @@ void SfxStatusBarConfigPage::Reset( const SfxItemSet& )
 String SfxConfigDialog::FileDialog_Impl( Window *pParent, WinBits nBits, const String& rTitle )
 {
     BOOL bSave = ( ( nBits & WB_SAVEAS ) == WB_SAVEAS );
-    short nDialogType = bSave? FILESAVE_SIMPLE : FILEOPEN_SIMPLE;
+    short nDialogType = bSave? ::sfx2::FILESAVE_SIMPLE : ::sfx2::FILEOPEN_SIMPLE;
 
     sfx2::FileDialogHelper aFileDlg( nDialogType, 0 );
     aFileDlg.SetTitle( rTitle );
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 5bb3b0b76fcc..3b68e034c29c 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dinfdlg.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: fs $ $Date: 2002-09-10 08:46:54 $
+ *  last change: $Author: obo $ $Date: 2002-11-20 11:41:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -733,13 +733,13 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet )
     INetURLObject aURL;
     aURL.SetSmartProtocol( INET_PROT_FILE );
     aURL.SetSmartURL( aFactory);
-    const String& rMainURL = aURL.GetMainURL();
+    const String& rMainURL = aURL.GetMainURL( INetURLObject::NO_DECODE );
     aBmp1.SetImage( SvFileInformationManager::GetImage( aURL, TRUE ) );
 
     // Bestimmung von Groesse und Typ
     String aSizeText( aUnknownSize );
     if ( aURL.GetProtocol() == INET_PROT_FILE )
-        aSizeText = CreateSizeText( SfxContentHelper::GetSize( aURL.GetMainURL() ) );
+        aSizeText = CreateSizeText( SfxContentHelper::GetSize( aURL.GetMainURL( INetURLObject::NO_DECODE ) ) );
     aShowSizeFT.SetText( aSizeText );
 
     String aDescription = SvFileInformationManager::GetDescription( rMainURL );
@@ -957,7 +957,7 @@ IMPL_LINK( SfxInternetPage, ClickHdlForward, Control*, pCtrl )
 
 IMPL_LINK( SfxInternetPage, ClickHdlBrowseURL, PushButton*, pButton )
 {
-    sfx2::FileDialogHelper aHelper( FILEOPEN_SIMPLE, WB_OPEN );
+    sfx2::FileDialogHelper aHelper( ::sfx2::FILEOPEN_SIMPLE, WB_OPEN );
     aHelper.SetDisplayDirectory( aEDForwardURL.GetText() );
 
     if( ERRCODE_NONE == aHelper.Execute() )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 56aa6964eda7..903c9f99ea37 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2,6 +2,9 @@
  *
  *  $RCSfile: filedlghelper.cxx,v $
  *
+ *  $Revision: 1.99 $
+ *
+ *  last change: $Author: obo $ $Date: 2002-11-20 11:41:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -234,20 +237,6 @@ using namespace ::cppu;
 
 //-----------------------------------------------------------------------------
 
-const short FILEOPEN_SIMPLE = TemplateDescription::FILEOPEN_SIMPLE;
-const short FILESAVE_SIMPLE = TemplateDescription::FILESAVE_SIMPLE;
-const short FILESAVE_AUTOEXTENSION_PASSWORD = TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD;
-const short FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS = TemplateDescription::FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS;
-const short FILESAVE_AUTOEXTENSION_SELECTION = TemplateDescription::FILESAVE_AUTOEXTENSION_SELECTION;
-const short FILESAVE_AUTOEXTENSION_TEMPLATE = TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE;
-const short FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE = TemplateDescription::FILEOPEN_LINK_PREVIEW_IMAGE_TEMPLATE;
-const short FILEOPEN_PLAY = TemplateDescription::FILEOPEN_PLAY;
-const short FILEOPEN_READONLY_VERSION = TemplateDescription::FILEOPEN_READONLY_VERSION;
-const short FILEOPEN_LINK_PREVIEW = TemplateDescription::FILEOPEN_LINK_PREVIEW;
-const short FILESAVE_AUTOEXTENSION = TemplateDescription::FILESAVE_AUTOEXTENSION;
-
-//-----------------------------------------------------------------------------
-
 #define IODLG_CONFIGNAME        String(DEFINE_CONST_UNICODE("FilePicker_Save"))
 #define IMPGRF_CONFIGNAME       String(DEFINE_CONST_UNICODE("FilePicker_Graph"))
 #define USERITEM_NAME           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserItem" ))
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index 2f7c59c9ec6d..4fe315c48884 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docvor.cxx,v $
  *
- *  $Revision: 1.29 $
+ *  $Revision: 1.30 $
  *
- *  last change: $Author: hr $ $Date: 2002-11-14 14:24:24 $
+ *  last change: $Author: obo $ $Date: 2002-11-20 11:42:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1545,7 +1545,7 @@ String SfxOrganizeDlg_Impl::GetPath_Impl( BOOL bOpen, const String& rFileName )
 {
     String aPath;
     String aExtension( DEFINE_CONST_UNICODE( "vor" ) );
-    short nDialogType = bOpen ? FILEOPEN_SIMPLE : FILESAVE_SIMPLE;
+    short nDialogType = bOpen ? ::sfx2::FILEOPEN_SIMPLE : ::sfx2::FILESAVE_SIMPLE;
     sfx2::FileDialogHelper aFileDlg( nDialogType, 0L );
 
     // add "All" filter
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 1e55c32c8dda..8c8b8c2fd766 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: objserv.cxx,v $
  *
- *  $Revision: 1.51 $
+ *  $Revision: 1.52 $
  *
- *  last change: $Author: mba $ $Date: 2002-11-18 12:20:02 $
+ *  last change: $Author: obo $ $Date: 2002-11-20 11:42:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -493,13 +493,13 @@ sal_Bool SfxObjectShell::GUISaveAs_Impl(sal_Bool bUrl, SfxRequest *pRequest)
             // get the filename by dialog ...
             // create the file dialog
             sal_Int16  aDialogMode = bAllowOptions ?
-                                        FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS :
-                                        FILESAVE_AUTOEXTENSION_PASSWORD;
+                                        ::sfx2::FILESAVE_AUTOEXTENSION_PASSWORD_FILTEROPTIONS :
+                                        ::sfx2::FILESAVE_AUTOEXTENSION_PASSWORD;
             sal_uInt32 aDialogFlags = 0;
 
             if( bIsExport )
             {
-                aDialogMode  = FILESAVE_AUTOEXTENSION_SELECTION;
+                aDialogMode  = ::sfx2::FILESAVE_AUTOEXTENSION_SELECTION;
                 aDialogFlags = SFXWB_EXPORT;
             }
 
@@ -706,7 +706,7 @@ sal_Bool SfxObjectShell::GUISaveAs_Impl(sal_Bool bUrl, SfxRequest *pRequest)
 
         // get the filename by dialog ...
         // create the file dialog
-        sfx2::FileDialogHelper aFileDlg( FILESAVE_AUTOEXTENSION_PASSWORD,
+        sfx2::FileDialogHelper aFileDlg( ::sfx2::FILESAVE_AUTOEXTENSION_PASSWORD,
                                          0L, GetFactory() );
 
         SfxItemSet* pTempSet = NULL;