Resolves: #i121407# Gallery reorganizations...

and additions of new themes

(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)

Conflicts:
	extras/prj/build.lst
	extras/source/gallery/bullets/makefile.mk
	extras/source/gallery/gallery_system/sg2.sdg
	extras/source/gallery/gallery_system/sg2.sdv
	extras/source/gallery/gallery_system/sg2.thm
	extras/util/target.pmk
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_extra_ooo.scp
	svx/inc/galtheme.hrc
	svx/source/gallery2/gallery1.cxx
	svx/source/gallery2/galobj.cxx
	svx/source/gallery2/galtheme.src
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/alpha.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmap3.cxx
	vcl/source/gdi/bitmapex.cxx

(cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)

Conflicts:
	vcl/source/gdi/bitmap3.cxx

Change-Id: If4b2397b889f914487f2135679250c175181e1df

4 files changed, 77 insertions, 6 deletions

diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc
index 52b9fdd4646c..2ecb5268c460 100644
--- a/svx/inc/galtheme.hrc
+++ b/svx/inc/galtheme.hrc
@@ -170,10 +170,17 @@
 #define RID_GALLERYSTR_THEME_RELIGION            (RID_GALLERYSTR_THEME_START + 139)
 #define RID_GALLERYSTR_THEME_BUILDINGS            (RID_GALLERYSTR_THEME_START + 140)
 #define RID_GALLERYSTR_THEME_HOMEPAGE2            (RID_GALLERYSTR_THEME_START + 141)
-#define RID_GALLERYSTR_THEME_ELEMENTSBULLETS2            (RID_GALLERYSTR_THEME_START + 142)
+#define RID_GALLERYSTR_THEME_ELEMENTSBULLETS2     (RID_GALLERYSTR_THEME_START + 142)
+
+#define RID_GALLERYSTR_THEME_COMPUTERS            (RID_GALLERYSTR_THEME_START + 143)
+#define RID_GALLERYSTR_THEME_DIAGRAMS             (RID_GALLERYSTR_THEME_START + 144)
+#define RID_GALLERYSTR_THEME_ENVIRONMENT          (RID_GALLERYSTR_THEME_START + 145)
+#define RID_GALLERYSTR_THEME_FINANCE              (RID_GALLERYSTR_THEME_START + 146)
+#define RID_GALLERYSTR_THEME_TRANSPORT            (RID_GALLERYSTR_THEME_START + 147)
+#define RID_GALLERYSTR_THEME_TXTSHAPES            (RID_GALLERYSTR_THEME_START + 148)
 
 #define RID_GALLERYSTR_THEME_FIRST          RID_GALLERYSTR_THEME_3D
-#define RID_GALLERYSTR_THEME_LAST           RID_GALLERYSTR_THEME_ELEMENTSBULLETS2
+#define RID_GALLERYSTR_THEME_LAST           RID_GALLERYSTR_THEME_TXTSHAPES
 
 #endif
 
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 7adec4461277..ffeb3cff1514 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -498,6 +498,36 @@ OUString Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
             case( GALLERY_THEME_SOUNDS ):
                 aFallback = "Sounds";
                 break;
+            case( RID_GALLERYSTR_THEME_ARROWS ):
+                aFallback = "Arrows";
+                break;
+            case( RID_GALLERYSTR_THEME_COMPUTERS ):
+                aFallback = "Computers";
+                break;
+            case( RID_GALLERYSTR_THEME_DIAGRAMS ):
+                aFallback = "Diagrams";
+                break;
+            case( RID_GALLERYSTR_THEME_EDUCATION ):
+                aFallback = "Education";
+                break;
+            case( RID_GALLERYSTR_THEME_ENVIRONMENT ):
+                aFallback = "Environment";
+                break;
+            case( RID_GALLERYSTR_THEME_FINANCE ):
+                aFallback = "Finance";
+                break;
+            case( RID_GALLERYSTR_THEME_PEOPLE ):
+                aFallback = "People";
+                break;
+            case( RID_GALLERYSTR_THEME_SYMBOLS ):
+                aFallback = "Symbols";
+                break;
+            case( RID_GALLERYSTR_THEME_TRANSPORT ):
+                aFallback = "Transport";
+                break;
+            case( RID_GALLERYSTR_THEME_TXTSHAPES ):
+                aFallback = "Textshapes";
+                break;
             default:
                 break;
         }
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 290eaec38055..ec88e83c18b6 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -84,7 +84,7 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
                     else
                         aBmpSize.Height() = FRound( aBmpSize.Width() / fFactorLog );
 
-                    aBmpEx.SetSizePixel( aBmpSize );
+                    aBmpEx.SetSizePixel( aBmpSize, BMP_SCALE_BESTQUALITY );
                 }
             }
 
@@ -101,8 +101,10 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
                 const Size  aNewSize( std::max( (long) (fFactor < 1. ? S_THUMB * fFactor : S_THUMB), 8L ),
                                       std::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_BESTQUALITY ) )
+                if(aThumbBmp.Scale(
+                    (double) aNewSize.Width() / aBmpSize.Width(),
+                    (double) aNewSize.Height() / aBmpSize.Height(),
+                    BMP_SCALE_BESTQUALITY ) )
                 {
                     aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
                     bRet = sal_True;
@@ -120,7 +122,7 @@ sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
         else
             aSize.Height() = (sal_Int32)( S_THUMB / fFactor );
 
-        const GraphicConversionParameters aParameters(aSize);
+        const GraphicConversionParameters aParameters(aSize, false, true, true /*TODO: extra ", true" post-#i121194#*/);
         aThumbBmp = rGraphic.GetBitmap(aParameters);
 
         if( !aThumbBmp.IsEmpty() )
diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src
index 4b63b8251d15..d926a95baf49 100644
--- a/svx/source/gallery2/galtheme.src
+++ b/svx/source/gallery2/galtheme.src
@@ -135,6 +135,38 @@ String RID_GALLERYSTR_THEME_POWERPOINT
 
 // -----------------------------------------------------------------------------
 
+String RID_GALLERYSTR_THEME_COMPUTERS
+{
+       Text [ en-US ] = "Computers";
+};
+
+String RID_GALLERYSTR_THEME_DIAGRAMS
+{
+       Text [ en-US ] = "Diagrams";
+};
+
+String RID_GALLERYSTR_THEME_ENVIRONMENT
+{
+       Text [ en-US ] = "Environment";
+};
+
+String RID_GALLERYSTR_THEME_FINANCE
+{
+       Text [ en-US ] = "Finance";
+};
+
+String RID_GALLERYSTR_THEME_TRANSPORT
+{
+       Text [ en-US ] = "Transport";
+};
+
+String RID_GALLERYSTR_THEME_TXTSHAPES
+{
+       Text [ en-US ] = "Textshapes";
+};
+
+// -----------------------------------------------------------------------------
+
 String RID_GALLERYSTR_THEME_SOUNDS
 {
     Text [ en-US ] = "Sounds";