#105490# MailMerge usability

3 files changed, 38 insertions, 6 deletions

diff --git a/svtools/inc/templdlg.hxx b/svtools/inc/templdlg.hxx
index c2423f953373..4df32dff7c2b 100644
--- a/svtools/inc/templdlg.hxx
+++ b/svtools/inc/templdlg.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templdlg.hxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: fs $ $Date: 2001-11-07 14:27:22 $
+ *  last change: $Author: os $ $Date: 2002-11-29 17:21:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,6 +110,8 @@ public:
     sal_Bool    IsFileSelected( ) const;
     String      GetSelectedFileURL( ) const;
 
+    void        SelectTemplateFolder();
+
 private:
     void InitImpl( );
 };
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 484fa5e99a50..00cf861bf1be 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templwin.cxx,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: mba $ $Date: 2002-10-07 10:25:11 $
+ *  last change: $Author: os $ $Date: 2002-11-29 17:22:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -574,6 +574,18 @@ void SvtIconWindow_Impl::UpdateIcons( sal_Bool _bHiContrast )
     aIconCtrl.GetEntry( ICON_POS_SAMPLES )->SetImage(
         Image( SvtResId( _bHiContrast ? IMG_SVT_SAMPLES_HC : IMG_SVT_SAMPLES ) ) );
 }
+/* -----------------27.11.2002 16:58-----------------
+ *
+ * --------------------------------------------------*/
+void SvtIconWindow_Impl::SelectFolder(sal_Int32 nFolderPosition)
+{
+    SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( nFolderPosition );
+    if(pEntry)
+    {
+        aIconCtrl.SetCursor( pEntry );
+        aIconCtrl.GetClickHdl().Call(&aIconCtrl);
+    }
+}
 
 // class SvtFileViewWindow_Impl -----------------------------------------_
 
@@ -1644,7 +1656,14 @@ void SvtTemplateWindow::WriteViewSettings()
     SvtViewOptions aViewSettings( E_DIALOG, VIEWSETTING_NEWFROMTEMPLATE );
     aViewSettings.SetUserData( aSettings );
 }
+/* -----------------27.11.2002 17:20-----------------
+ *
+ * --------------------------------------------------*/
 
+void SvtTemplateWindow::SelectFolder(sal_Int32 nFolderPosition)
+{
+    pIconWin->SelectFolder(nFolderPosition);
+}
 // struct SvtTmplDlg_Impl ------------------------------------------------
 
 struct SvtTmplDlg_Impl
@@ -1921,4 +1940,11 @@ IMPL_LINK ( SvtDocumentTemplateDialog, UpdateHdl_Impl, Timer*, _pEventSource )
     }
     return 0;
 }
+/* -----------------27.11.2002 16:54-----------------
+ *
+ * --------------------------------------------------*/
+void SvtDocumentTemplateDialog::SelectTemplateFolder()
+{
+    pImpl->pWin->SelectFolder(ICON_POS_TEMPLATES);
+}
 
diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 860d005b390f..85ee9c4e444e 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: templwin.hxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: pb $ $Date: 2002-05-31 10:28:47 $
+ *  last change: $Author: os $ $Date: 2002-11-29 17:22:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -148,6 +148,8 @@ public:
 
     inline sal_Bool         ProcessKeyEvent( const KeyEvent& rKEvt );
     inline const String&    GetSamplesFolderURL() const;
+
+    void                SelectFolder(sal_Int32 nFolderPos);
 };
 
 inline sal_Bool SvtIconWindow_Impl::ProcessKeyEvent( const KeyEvent& rKEvt )
@@ -330,6 +332,8 @@ public:
     void                SetPrevLevelButtonState( const String& rURL );  // sets state (enable/disable) for previous level button
     void                ClearHistory();
     long                CalcHeight() const;
+
+    void                SelectFolder(sal_Int32 nFolderPosition);
 };
 
 #endif // _SVTOOLS_TEMPLWIN_HXX