#81041#: added help ids

5 files changed, 18 insertions, 18 deletions

diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 66060a88a595..3841ff6449f2 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws1.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-17 10:47:44 $
+ *  last change: $Author: ka $ $Date: 2000-12-01 14:03:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -64,6 +64,7 @@
 #include <vcl/msgbox.hxx>
 #include <ucbhelper/content.hxx>
 #include <sfx2/app.hxx>
+#include "helpid.hrc"
 #include "gallery1.hxx"
 #include "galtheme.hxx"
 #include "galmisc.hxx"
@@ -127,9 +128,11 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
 {
     StartListening( *mpGallery );
 
+    maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME );
     maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) );
     maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) );
 
+    mpThemes->SetHelpId( HID_GALLERY_THEMELIST );
     mpThemes->SetControlForeground( COL_WHITE );
     mpThemes->SetControlBackground( COL_GRAY );
     mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index d4e41a6a98a6..44be9eb86188 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws1.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2000-11-14 13:23:43 $
+ *  last change: $Author: ka $ $Date: 2000-12-01 14:03:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,7 +121,7 @@ public:
                             ~GalleryBrowser1();
 
     void                    SelectTheme( const String& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); }
-    void                    SelectTheme( ULONG nThemePos ) { mpThemes->SelectEntryPos( nThemePos ); SelectThemeHdl( NULL ); }
+    void                    SelectTheme( ULONG nThemePos ) { mpThemes->SelectEntryPos( (USHORT) nThemePos ); SelectThemeHdl( NULL ); }
     String                  GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : String(); }
 
     void                    ShowContextMenu();
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 3fce19363a5e..4cbea6a86bb2 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws2.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-17 10:47:44 $
+ *  last change: $Author: ka $ $Date: 2000-12-01 14:03:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -446,7 +446,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
     switch( rGalleryHint.GetType() )
     {
         case( GALLERY_HINT_THEME_UPDATEVIEW ):
-            ImplUpdateValueSet( rGalleryHint.GetData1() + 1 );
+            ImplUpdateValueSet( (USHORT) rGalleryHint.GetData1() + 1 );
         break;
 
         default:
@@ -639,7 +639,7 @@ void GalleryBrowser2::ImplUpdateValueSet( USHORT nSelectionId )
     if( mpCurTheme )
     {
         for( ULONG i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; )
-            mpValueSet->InsertItem( ++i );
+            mpValueSet->InsertItem( (USHORT) ++i );
     }
 
     mpValueSet->SelectItem( ( ( nSelectionId > mpValueSet->GetItemCount() ) ? mpValueSet->GetItemCount() : nSelectionId ) );
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 89acfd78734d..5d1c943b8494 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galexpl.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-16 12:16:21 $
+ *  last change: $Author: ka $ $Date: 2000-12-01 14:03:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -378,10 +378,7 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
                     if( nActPos++ == nSdrModelPos )
                     {
                         if( pModel )
-                        {
-                            ULONG nStmErr = ERRCODE_NONE;
-                            bRet = bRet || pTheme->GetModel( i, *pModel, nStmErr );
-                        }
+                            bRet = bRet || pTheme->GetModel( i, *pModel, FALSE );
 
                         if( pThumb )
                             bRet = bRet || pTheme->GetThumb( i, *pThumb );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index d5bb0d76a895..4a23c730a306 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gallery1.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-16 12:17:44 $
+ *  last change: $Author: ka $ $Date: 2000-12-01 14:03:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -657,7 +657,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
                     while ( HasTheme( aNewName ) && ( nCount++ < 16000 ) )
                     {
                         aNewName = aName;
-                        aNewName += nCount;
+                        aNewName += String::CreateFromInt32( nCount );
                     }
 
                     pImportTheme->SetImportName( aNewName );