added new theme defines (mytheme/usersound); added ID dialog

9 files changed, 185 insertions, 164 deletions

diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index e25dfb34168f..36daca02e002 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:18 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:46:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@ GalleryChildWindow::GalleryChildWindow( Window* pParent, USHORT nId, SfxBindings
     SfxChildWindow( pParent, nId )
 {
     pWindow = new GalleryBrowser( pBindings, this, pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) );
-    eChildAlignment = SFX_ALIGN_NOALIGNMENT;
+    eChildAlignment = SFX_ALIGN_TOP;
     ( (GalleryBrowser*) pWindow )->Initialize( pInfo );
 };
 
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index e060e2502587..c79eb995cefe 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:18 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:46:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,9 +153,11 @@ GalleryBrowser1::~GalleryBrowser1()
 
 ULONG GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
 {
+    static const BOOL bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
+
     ULONG nRet = LISTBOX_ENTRY_NOTFOUND;
 
-    if( pEntry && !pEntry->IsHidden() )
+    if( pEntry && ( !pEntry->IsHidden() || bShowHiddenThemes ) )
     {
         Bitmap aBMP( GAL_RESID( RID_SVXBMP_THEME_NORMAL ) );
         static const Image aImgNormal( BitmapEx( aBMP, COL_LIGHTMAGENTA ) );
@@ -304,7 +306,35 @@ void GalleryBrowser1::ShowContextMenu()
 
 IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, p )
 {
-    PopupMenu aMenu( GAL_RESID( RID_SVXMN_GALLERY1 ) );
+    PopupMenu           aMenu( GAL_RESID( RID_SVXMN_GALLERY1 ) );
+    GalleryTheme*       pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
+    BOOL                bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
+    static const BOOL   bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
+
+
+    if( pTheme->IsReadOnly() )
+    {
+        bUpdateAllowed = bRenameAllowed = bRemoveAllowed = FALSE;
+    }
+    else if( pTheme->IsImported() )
+    {
+        bUpdateAllowed = FALSE;
+        bRenameAllowed = bRemoveAllowed = TRUE;
+    }
+    else if( pTheme->IsDefault() )
+    {
+        bUpdateAllowed = bRenameAllowed = TRUE;
+        bRemoveAllowed = FALSE;
+    }
+    else
+        bUpdateAllowed = bRenameAllowed = bRemoveAllowed = TRUE;
+
+    aMenu.EnableItem( MN_ACTUALIZE, bUpdateAllowed );
+    aMenu.EnableItem( MN_RENAME, bRenameAllowed );
+    aMenu.EnableItem( MN_DELETE, bRemoveAllowed );
+    aMenu.EnableItem( MN_ASSIGN_ID, bIdDialog && !pTheme->IsReadOnly() && !pTheme->IsImported() );
+
+    mpGallery->ReleaseTheme( pTheme, *this );
 
     aMenu.SetSelectHdl( LINK( this, GalleryBrowser1, PopupMenuHdl ) );
     aMenu.RemoveDisabledEntries();
@@ -368,6 +398,22 @@ IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu )
         }
         break;
 
+        case( MN_ASSIGN_ID ):
+        {
+            GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
+
+            if( pTheme && !pTheme->IsReadOnly() && !pTheme->IsImported() )
+            {
+                GalleryIdDialog aDlg( this, pTheme );
+
+                if( aDlg.Execute() == RET_OK )
+                    pTheme->SetId( aDlg.GetId(), TRUE );
+            }
+
+            mpGallery->ReleaseTheme( pTheme, *this );
+        }
+        break;
+
         case( MN_PROPERTIES ):
         {
             SfxItemSet              aSet( SFX_APP()->GetPool() );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 68a9a4898d69..975540d49a28 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galbrws2.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ka $ $Date: 2000-10-17 13:56:59 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:46:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -152,20 +152,23 @@ void GalleryValueSet::UserDraw( const UserDrawEvent& rUDEvt )
 
             if ( aSize.Width() && aSize.Height() )
             {
-                Point           aNewPos;
-                const double    fBmpWH  = (double) aSize.Width() / aSize.Height();
-                const double    fThmpWH = (double) rRect.GetWidth() / rRect.GetHeight();
-
-                // Bitmap an Thumbgroesse anpassen
-                if ( fBmpWH < fThmpWH )
-                {
-                    aSize.Width() = (long) ( rRect.GetHeight() * fBmpWH );
-                    aSize.Height()= rRect.GetHeight();
-                }
-                else
+                if( ( aSize.Width() > rRect.GetWidth() ) || ( aSize.Height() > rRect.GetHeight() ) )
                 {
-                    aSize.Width() = rRect.GetWidth();
-                    aSize.Height()= (long) ( rRect.GetWidth() / fBmpWH );
+                    Point           aNewPos;
+                    const double    fBmpWH  = (double) aSize.Width() / aSize.Height();
+                    const double    fThmpWH = (double) rRect.GetWidth() / rRect.GetHeight();
+
+                    // Bitmap an Thumbgroesse anpassen
+                    if ( fBmpWH < fThmpWH )
+                    {
+                        aSize.Width() = (long) ( rRect.GetHeight() * fBmpWH );
+                        aSize.Height()= rRect.GetHeight();
+                    }
+                    else
+                    {
+                        aSize.Width() = rRect.GetWidth();
+                        aSize.Height()= (long) ( rRect.GetWidth() / fBmpWH );
+                    }
                 }
 
                 const Point aPos( ( ( rRect.GetWidth() - aSize.Width() ) >> 1 ) + rRect.Left(),
@@ -440,34 +443,16 @@ void GalleryBrowser2::Resize()
     // Valueset und Preview-Fenster in der Groesse anpassen
     if( mbIsPreview )
         mpPreview->Hide();
-    else if( nColCount )
-    {
-        nSelectId = mpValueSet->GetSelectItemId();
-        nSelLine = (nSelectId - 1) / nColCount - mpValueSet->GetFirstLine();
-        mpValueSet->Hide();
-    }
     else
         mpValueSet->Hide();
 
-    mpValueSet->SetColCount( nColCount = Max( (USHORT) ( aOutSize.Width() / 80 ), (USHORT) 1 ) );
-    mpValueSet->SetLineCount( Max( (USHORT) ( aOutSize.Height() / 70 ), (USHORT) 1 ) );
     mpValueSet->SetSizePixel( aOutSize );
     mpPreview->SetSizePixel( aOutSize );
 
     if( mbIsPreview )
         mpPreview->Show();
     else
-    {
-        USHORT nFirstLine = ( nSelectId - 1 ) / nColCount;
-
-        nSelLine = Min( (USHORT) nSelLine, (USHORT) ( mpValueSet->GetLineCount() - 1 ) );
-
-        if( nFirstLine > nSelLine )
-            nFirstLine -= nSelLine;
-
-        mpValueSet->SetFirstLine( nFirstLine );
         mpValueSet->Show();
-    }
 }
 
 // -----------------------------------------------------------------------------
@@ -595,14 +580,20 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
 
     mpCurTheme = mpGallery->AcquireTheme( rThemeName, *this );
 
-    mpValueSet = new GalleryValueSet( this, mpCurTheme, WB_3DLOOK | WB_BORDER | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_VSCROLL );
+    mpValueSet = new GalleryValueSet( this, mpCurTheme, WB_3DLOOK | WB_BORDER |
+                                                        WB_ITEMBORDER | WB_DOUBLEBORDER |
+                                                        WB_NAMEFIELD | WB_VSCROLL |
+                                                        WB_FLATVALUESET );
+    mpValueSet->SetBackground( Wallpaper( COL_WHITE ) );
+    mpValueSet->SetControlBackground( COL_WHITE );
+    mpValueSet->SetColor( COL_WHITE );
     mpValueSet->SetHelpId( HID_GALLERY_WINDOW );
     mpValueSet->SetPosSizePixel( Point(), GetOutputSizePixel() );
     mpValueSet->SetSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
     mpValueSet->SetDoubleClickHdl( LINK( this, GalleryBrowser2, DoubleClickObjectHdl ) );
-    mpValueSet->SetColCount( 3 );
-    mpValueSet->SetLineCount( 3 );
     mpValueSet->SetExtraSpacing( 2 );
+    mpValueSet->SetItemWidth( S_THUMB + 6 );
+    mpValueSet->SetItemHeight( S_THUMB + 6 );
 
     mpPreview = new GalleryPreview( this, WB_BORDER ),
     mpPreview->SetHelpId( HID_GALLERY_WINDOW );
@@ -655,8 +646,7 @@ void GalleryBrowser2::ShowPreview( BOOL bShow )
 
 void GalleryBrowser2::ImplUpdateValueSet( USHORT nSelectionId )
 {
-    USHORT  nCurItemId = mpValueSet->GetSelectItemId();
-    USHORT  nItem = ( ( nSelectionId > mpValueSet->GetItemCount() ) ? mpValueSet->GetItemCount() : nSelectionId );
+    USHORT nCurItemId = mpValueSet->GetSelectItemId();
 
     mpValueSet->Clear();
     mpPreview->Show( FALSE);
@@ -667,7 +657,7 @@ void GalleryBrowser2::ImplUpdateValueSet( USHORT nSelectionId )
             mpValueSet->InsertItem( ++i );
     }
 
-    mpValueSet->SelectItem( nItem );
+    mpValueSet->SelectItem( ( ( nSelectionId > mpValueSet->GetItemCount() ) ? mpValueSet->GetItemCount() : nSelectionId ) );
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src
index 20e041ecd5de..83bc1bac9293 100644
--- a/svx/source/gallery2/gallery.src
+++ b/svx/source/gallery2/gallery.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gallery.src,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nf $ $Date: 2000-09-27 19:22:47 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:47:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2073,6 +2073,37 @@ Menu RID_SVXMN_GALLERY1
         };
         MenuItem
         {
+            Identifier = MN_ASSIGN_ID;
+            Text = "~ID vergeben" ;
+            Text [ English ] = "Assign ~ID" ;
+            Text [ english_us ] = "Assign ~ID" ;
+            Text[ portuguese ] = "Atribuir ~ID";
+            Text[ russian ] = "��������� ~ID";
+            Text[ dutch ] = "~ID bezet";
+            Text[ french ] = "Attribuer un ~ID";
+            Text[ spanish ] = "Asignar ~ID";
+            Text[ italian ] = "Attribuisci ~ID";
+            Text[ danish ] = "Tildel ~ID";
+            Text[ swedish ] = "Tilldela ~ID";
+            Text[ polish ] = "Przypisz ~identyfikator";
+            Text[ portuguese_brazilian ] = "Assign ~ID";
+            Text[ japanese ] = "~ID �̊��蓖��";
+            Text[ chinese_simplified ] = "���� ~ID";
+            Text[ chinese_traditional ] = "���t ~ID";
+            Text[ arabic ] = "����� �������";
+            Text[ dutch ] = "~ID bezet";
+            Text[ chinese_simplified ] = "���� ~ID";
+            Text[ greek ] = "������� ���������� (~ID)";
+            Text[ korean ] = "~ID ����";
+            Text[ turkish ] = "Tan�t�c� ata";
+            Text[ language_user1 ] = " ";
+        };
+        MenuItem
+        {
+            Separator = TRUE ;
+        };
+        MenuItem
+        {
             Identifier = MN_PROPERTIES;
             HelpId = HID_GALLERY_PROPERTIES;
             Text = "~Eigenschaften ..." ;
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index b67499a30470..b9bc3b88e60b 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: gallery1.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:18 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:47:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -634,9 +634,9 @@ BOOL Gallery::CreateImportTheme( const String& rPath, const String& rImportName
             }
             else
             {
-                ByteString                      aTmpStr;
-                String                          aThemeName; aInStm >> aTmpStr; aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 );
-                String                          aNumberStr( aPath.GetBase() );
+                ByteString              aTmpStr;
+                String                  aThemeName; aInStm >> aTmpStr; aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 );
+                String                  aNumberStr( aPath.GetBase() );
                 GalleryThemeEntry*      pThemeEntry = new GalleryThemeEntry( aPath.GetPath(), rImportName,
                                                                          aNumberStr.Erase( 0, 2 ).Erase( 6 ).ToInt32(),
                                                                          TRUE, TRUE, TRUE, 0, FALSE );
@@ -864,7 +864,19 @@ GalleryTheme* Gallery::AcquireTheme( const String& rThemeName, SfxListener& rLis
     GalleryThemeEntry*      pThemeEntry = ImplGetThemeEntry( rThemeName );
 
     if( pThemeEntry && ( ( pTheme = ImplGetCachedTheme( pThemeEntry ) ) != NULL ) )
+    {
+#ifdef DBG_UTIL
+        for( USHORT i = 0; i < pTheme->GetListenerCount(); i++ )
+        {
+            if( pTheme->GetListener( i ) == &rListener )
+            {
+                DBG_ERROR( "Theme is already registered at this listener" );
+            }
+        }
+
+#endif
         rListener.StartListening( *pTheme );
+    }
 
     return pTheme;
 }
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index fb2964b89c7d..3943faf9e999 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galmisc.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: pb $ $Date: 2000-10-23 12:08:49 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:47:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -59,7 +59,7 @@
  *
  ************************************************************************/
 
-#include <comphelper/processfactory.hxx>
+#include <unotools/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 #include <tools/resmgr.hxx>
 #include <tools/intn.hxx>
@@ -389,13 +389,16 @@ BOOL CreateDir( const INetURLObject& rURL )
             INetURLObject                           aNewFolderURL( rURL );
             INetURLObject                           aParentURL( aNewFolderURL ); aParentURL.removeSegment();
             Content                                 aParent( aParentURL.GetMainURL(), aCmdEnv );
-            uno::Sequence< OUString >               aProps( 1 );
-            uno::Sequence< uno::Any >               aValues( 1 );
+            uno::Sequence< OUString >               aProps( 2 );
+            uno::Sequence< uno::Any >               aValues( 2 );
 
             aProps.getArray()[ 0 ] = OUString::createFromAscii( "Title" );
             aValues.getArray()[ 0 ] = uno::makeAny( OUString( aNewFolderURL.GetName() ) );
 
-            bRet = aParent.insertNewContent( OUString::createFromAscii( "application/vnd.sun.staroffice.fsys-folder" ), aProps, aValues,
+            aProps.getArray()[ 1 ] = OUString::createFromAscii( "IsFolder" );
+            aValues.getArray()[ 1 ] = uno::makeAny( sal_Bool( sal_True ) );
+
+            bRet = aParent.insertNewContent( OUString::createFromAscii( "FSysFolder" ), aProps, aValues,
                                              Content( aNewFolderURL.GetMainURL(), aCmdEnv ) );
         }
         catch( ... )
@@ -460,7 +463,7 @@ BOOL KillFile( const INetURLObject& rURL )
 GalleryProgress::GalleryProgress( GraphicFilter* pFilter ) :
     mpFilter( pFilter )
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::utl::getProcessServiceFactory() );
 
     if( xMgr.is() )
     {
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index cbd438e328e7..2633d82d3081 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galobj.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:19 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:47:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,12 +70,6 @@
 #include "galmisc.hxx"
 #include "galobj.hxx"
 
-// -----------
-// - Defines -
-// -----------
-
-#define S_THUMB 80
-
 // -------------
 // - SgaObject -
 // -------------
@@ -95,18 +89,26 @@ BOOL SgaObject::CreateThumb( const Bitmap& rBitmap )
 
     if( aBmpSize.Width() && aBmpSize.Height() )
     {
-        const float fFactor  = (float) aBmpSize.Width() / aBmpSize.Height();
-        const Size  aNewSize( Max( (long) (fFactor < 1. ? S_THUMB * fFactor : S_THUMB), 8L ),
-                              Max( (long) (fFactor < 1. ? S_THUMB : S_THUMB / fFactor), 8L ) );
-
         aThumbBmp = rBitmap;
 
-        if( aThumbBmp.Scale( (double) aNewSize.Width() / aBmpSize.Width(),
-                             (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_INTERPOLATE ) )
+        if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) )
         {
             aThumbBmp.Dither( BMP_DITHER_FLOYD );
             bRet = TRUE;
         }
+        else
+        {
+            const float fFactor  = (float) aBmpSize.Width() / aBmpSize.Height();
+            const Size  aNewSize( Max( (long) (fFactor < 1. ? S_THUMB * fFactor : S_THUMB), 8L ),
+                                  Max( (long) (fFactor < 1. ? S_THUMB : S_THUMB / fFactor), 8L ) );
+
+            if( aThumbBmp.Scale( (double) aNewSize.Width() / aBmpSize.Width(),
+                                 (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_INTERPOLATE ) )
+            {
+                aThumbBmp.Dither( BMP_DITHER_FLOYD );
+                bRet = TRUE;
+            }
+        }
     }
 
     return bRet;
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 0a54b487d901..dfe49b4bf4fd 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galtheme.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:19 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:49:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -235,6 +235,9 @@ SgaObject* GalleryTheme::ImplReadSgaObject( GalleryObject* pEntry )
         }
     }
 
+    if( pSgaObj )
+        pSgaObj->ImplUpdatePath( pEntry->aPath );
+
     return pSgaObj;
 }
 
@@ -301,7 +304,12 @@ String GalleryTheme::ImplGetPathToFile( const GalleryObject* pObject ) const
 void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
 {
     if( !IsBroadcasterLocked() )
+    {
+        if( GetObjectCount() && ( nUpdatePos >= GetObjectCount() ) )
+            nUpdatePos = GetObjectCount() - 1;
+
         Broadcast( GalleryHint( GALLERY_HINT_THEME_UPDATEVIEW, GetName(), nUpdatePos ) );
+    }
 }
 
 // ------------------------------------------------------------------------
@@ -398,7 +406,7 @@ BOOL GalleryTheme::ChangeObjectPos( ULONG nOldPos, ULONG nNewPos )
 
             aObjectList.Remove( nOldPos );
             ImplSetModified( bRet = TRUE );
-            ImplBroadcast( nNewPos );
+            ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) );
         }
     }
 
@@ -788,7 +796,10 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
 
                 if( pObj )
                 {
-                    rGraphic = BitmapEx( pObj->GetThumbBmp(), COL_LIGHTMAGENTA );
+                    Bitmap aBmp( pObj->GetThumbBmp() );
+
+                    aBmp.Replace( COL_LIGHTMAGENTA, COL_WHITE );
+                    rGraphic = aBmp;
                     ReleaseObject( pObj );
                     bRet = TRUE;
                 }
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 36f3003f93c1..a4713005373f 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: galtheme.src,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:01:19 $
+ *  last change: $Author: ka $ $Date: 2000-10-25 14:49:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,7 +65,6 @@
 
 String RID_GALLERYSTR_THEME_3D
 {
-    // !!! zunaechst bitte nicht uebersetzen
     Text = "3D";
     Text[ENGLISH] = "3D";
     Text[english_us] = "3D";
@@ -81,23 +80,6 @@ String RID_GALLERYSTR_THEME_3D
     Text[ portuguese_brazilian ] = "3D";
     Text[ japanese ] = "3D";
     Text[ chinese_simplified ] = "3 ά";
-/*
-    Text = "3D";
-    Text[ENGLISH] = "3D";
-    Text[english_us] = "3-D";
-    Text[ portuguese ] = "3D";
-    Text[ russian ] = "3D";
-    Text[ dutch ] = "3D";
-    Text[ french ] = "3D";
-    Text[ spanish ] = "3D";
-    Text[ italian ] = "3D";
-    Text[ danish ] = "3D";
-    Text[ swedish ] = "3D";
-    Text[ polish ] = "3-W";
-    Text[ portuguese_brazilian ] = "3D";
-    Text[ japanese ] = "3D";
-    Text[ chinese_simplified ] = "3 άͼ��";
-*/
     Text[ chinese_traditional ] = "3 ��";
     Text[ arabic ] = "����� ������ �������";
     Text[ greek ] = "3�";
@@ -137,7 +119,6 @@ String RID_GALLERYSTR_THEME_ANIMATIONS
 
 String RID_GALLERYSTR_THEME_BULLETS
 {
-    // !!! zunaechst bitte nicht uebersetzen
     Text = "Bullets";
     Text[ENGLISH] = "Bullets";
     Text[english_us] = "Bullets";
@@ -153,24 +134,6 @@ String RID_GALLERYSTR_THEME_BULLETS
     Text[ portuguese_brazilian ] = "Bullets";
     Text[ japanese ] = "�ӏ����������";
     Text[ chinese_simplified ] = "��ʽͼ��";
-
-/*
-    Text = "Bullets";
-    Text[ENGLISH] = "Bullets";
-    Text[english_us] = "Bullets";
-    Text[ portuguese ] = "Marcas";
-    Text[ russian ] = "Bullets";
-    Text[ dutch ] = "Opsommingstekens";
-    Text[ french ] = "Bullets";
-    Text[ spanish ] = "Vi�etas";
-    Text[ italian ] = "Bullets";
-    Text[ danish ] = "Bullets";
-    Text[ swedish ] = "Bullets";
-    Text[ polish ] = "Bullets";
-    Text[ portuguese_brazilian ] = "Bullets";
-    Text[ japanese ] = "Bullets";
-    Text[ chinese_simplified ] = "��ʽͼ��";
-*/
     Text[ chinese_traditional ] = "�U���ϼ�";
     Text[ arabic ] = "������ �����";
     Text[ greek ] = "��������";
@@ -480,7 +443,7 @@ String RID_GALLERYSTR_THEME_SURFACES
 
 String RID_GALLERYSTR_THEME_HTMLBUTTONS
 {
-    // !!! bitte nicht uebersetzen
+    // !!! Don't translate, please !!!
     Text = "private://gallery/hidden/HtmlExportButtons";
 };
 
@@ -488,7 +451,7 @@ String RID_GALLERYSTR_THEME_HTMLBUTTONS
 
 String RID_GALLERYSTR_THEME_POWERPOINT
 {
-    // !!! bitte nicht uebersetzen
+    // !!! Don't translate, please !!!
     Text = "private://gallery/hidden/imgppt";
 };
 
@@ -496,8 +459,7 @@ String RID_GALLERYSTR_THEME_POWERPOINT
 
 String RID_GALLERYSTR_THEME_RULERS
 {
-    // !!! zunaechst bitte nicht uebersetzen
-    Text = "Rulers";
+    Text = "Begrenzungen";
     Text[ENGLISH] = "Rulers";
     Text[english_us] = "Rulers";
     Text[ portuguese ] = "R�guas";
@@ -512,24 +474,6 @@ String RID_GALLERYSTR_THEME_RULERS
     Text[ portuguese_brazilian ] = "Rulers";
     Text[ japanese ] = "ٰװ";
     Text[ chinese_simplified ] = "��ɫ����";
-
-/*
-    Text = "Begrenzungen";
-    Text[ENGLISH] = "Rulers";
-    Text[english_us] = "Rulers";
-    Text[ portuguese ] = "R�guas";
-    Text[ russian ] = "Rulers";
-    Text[ dutch ] = "Begrenzingen";
-    Text[ french ] = "R�gles";
-    Text[ spanish ] = "L�mites";
-    Text[ italian ] = "Delimitazioni";
-    Text[ danish ] = "Rulers";
-    Text[ swedish ] = "Linjer";
-    Text[ polish ] = "Rulers";
-    Text[ portuguese_brazilian ] = "Rulers";
-    Text[ japanese ] = "Rulers";
-    Text[ chinese_simplified ] = "��ɫ����";
-*/
     Text[ chinese_traditional ] = "�m��u��";
     Text[ arabic ] = "�����";
     Text[ greek ] = "�������";
@@ -542,8 +486,7 @@ String RID_GALLERYSTR_THEME_RULERS
 
 String RID_GALLERYSTR_THEME_SOUNDS
 {
-    // !!! zunaechst bitte nicht uebersetzen
-    Text = "Sounds";
+    Text = "Kl�nge";
     Text[ENGLISH] = "Sounds";
     Text[english_us] = "Sounds";
     Text[ portuguese ] = "Sons";
@@ -558,23 +501,6 @@ String RID_GALLERYSTR_THEME_SOUNDS
     Text[ portuguese_brazilian ] = "Sounds";
     Text[ japanese ] = "�����";
     Text[ chinese_simplified ] = "����ͼ��";
-/*
-    Text = "Kl�nge";
-    Text[ENGLISH] = "Sounds";
-    Text[english_us] = "Sounds";
-    Text[ portuguese ] = "Sons";
-    Text[ russian ] = "Sounds";
-    Text[ dutch ] = "Geluiden";
-    Text[ french ] = "Sons";
-    Text[ spanish ] = "Sonidos";
-    Text[ italian ] = "Suoni";
-    Text[ danish ] = "Sounds";
-    Text[ swedish ] = "Ljud";
-    Text[ polish ] = "D�wi�ki";
-    Text[ portuguese_brazilian ] = "Sounds";
-    Text[ japanese ] = "Sounds";
-    Text[ chinese_simplified ] = "����ͼ��";
-*/
     Text[ chinese_traditional ] = "�n���ϥ�";
     Text[ arabic ] = "�����";
     Text[ greek ] = "����";
@@ -638,17 +564,17 @@ String RID_GALLERYSTR_THEME_MYTHEME
 
 // -----------------------------------------------------------------------------
 
-String RID_GALLERYSTR_THEME_DUMMY2
+String RID_GALLERYSTR_THEME_USERSOUNDS
 {
-    // !!! bitte nicht uebersetzen
-    Text = "Dummy 2";
+    // !!! Don't translate, please !!!
+    Text = "private://gallery/hidden/usersounds";
 };
 
 // -----------------------------------------------------------------------------
 
 String RID_GALLERYSTR_THEME_DUMMY3
 {
-    // !!! bitte nicht uebersetzen
+    // !!! Don't translate, please !!!
     Text = "Dummy 3";
 };
 
@@ -656,7 +582,7 @@ String RID_GALLERYSTR_THEME_DUMMY3
 
 String RID_GALLERYSTR_THEME_DUMMY4
 {
-    // !!! bitte nicht uebersetzen
+    // !!! Don't translate, please !!!
     Text = "Dummy 4";
 };
 
@@ -664,6 +590,6 @@ String RID_GALLERYSTR_THEME_DUMMY4
 
 String RID_GALLERYSTR_THEME_DUMMY5
 {
-    // !!! bitte nicht uebersetzen
+    // !!! Don't translate, please !!!
     Text = "Dummy 5";
 };