openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1417535 [6/6] - in /openoffice/trunk/main: extras/prj/ extras/source/gallery/arrows/ extras/source/gallery/bullets/ extras/source/gallery/computers/ extras/source/gallery/diagrams/ extras/source/gallery/education/ extras/source/gallery/env...
Date Wed, 05 Dec 2012 17:18:49 GMT
Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle06-Striped-Blue.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle06-Striped-Blue.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle06-Striped-Blue.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle06-Striped-Blue.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle07-Striped-Green.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle07-Striped-Green.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle07-Striped-Green.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle07-Striped-Green.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle08-Striped-Red.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle08-Striped-Red.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle08-Striped-Red.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle08-Striped-Red.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle09-Striped-Orange.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle09-Striped-Orange.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle09-Striped-Orange.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Rectangle09-Striped-Orange.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square01-DarkBlue.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square01-DarkBlue.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square01-DarkBlue.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square01-DarkBlue.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square02-LightBlue.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square02-LightBlue.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square02-LightBlue.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square02-LightBlue.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square03-Green.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square03-Green.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square03-Green.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square03-Green.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square04-DarkRed.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square04-DarkRed.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square04-DarkRed.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square04-DarkRed.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square05-Orange.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square05-Orange.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square05-Orange.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square05-Orange.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square06-Striped-Blue.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square06-Striped-Blue.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square06-Striped-Blue.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square06-Striped-Blue.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square07-Striped-Green.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square07-Striped-Green.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square07-Striped-Green.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square07-Striped-Green.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square08-Striped-Red.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square08-Striped-Red.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square08-Striped-Red.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square08-Striped-Red.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/Square09-Striped-Orange.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/Square09-Striped-Orange.png?rev=1417535&view=auto
==============================================================================
Binary file - no diff available.

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square09-Striped-Orange.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/Square09-Striped-Orange.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/delzip
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/delzip?rev=1417535&view=auto
==============================================================================
--- openoffice/trunk/main/extras/source/gallery/txtshapes/delzip (added)
+++ openoffice/trunk/main/extras/source/gallery/txtshapes/delzip Wed Dec  5 17:17:41 2012
@@ -0,0 +1 @@
+ECHO is OFF

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/delzip
------------------------------------------------------------------------------
    svn:executable = *

Added: openoffice/trunk/main/extras/source/gallery/txtshapes/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/gallery/txtshapes/makefile.mk?rev=1417535&view=auto
==============================================================================
--- openoffice/trunk/main/extras/source/gallery/txtshapes/makefile.mk (added)
+++ openoffice/trunk/main/extras/source/gallery/txtshapes/makefile.mk Wed Dec  5 17:17:41
2012
@@ -0,0 +1,36 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+PRJ=..$/..$/..
+
+PRJNAME=extras
+TARGET=gallerytxtshapes
+
+.INCLUDE : settings.mk
+.INCLUDE : $(PRJ)$/util$/target.pmk
+
+ZIP1TARGET      = $(GALLERY_TXTSHAPES_TARGET)
+ZIP1LIST        = * -x makefile.*
+
+.INCLUDE : target.mk
+
+
+

Propchange: openoffice/trunk/main/extras/source/gallery/txtshapes/makefile.mk
------------------------------------------------------------------------------
    svn:executable = *

Modified: openoffice/trunk/main/extras/util/target.pmk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/extras/util/target.pmk?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/extras/util/target.pmk (original)
+++ openoffice/trunk/main/extras/util/target.pmk Wed Dec  5 17:17:41 2012
@@ -51,6 +51,17 @@ GALLERY_OPTIONAL_TARGET         = gallop
 GALLERY_SOUND_TARGET            = gallsound
 GALLERY_CLIPART_TARGET          = gallclipart
 GALLERY_BULLETS_TARGET          = gallbullets
+
+GALLERY_ARROWS_TARGET           = gallarrows
+GALLERY_COMPUTERS_TARGET        = gallcomputers
+GALLERY_DIAGRAMS_TARGET         = galldiagrams
+GALLERY_EDUCATION_TARGET        = galleducation
+GALLERY_ENVIRONMENT_TARGET      = gallenvironment
+GALLERY_FINANCE_TARGET          = gallfinance
+GALLERY_PEOPLE_TARGET           = gallpeople
+GALLERY_TRANSPORT_TARGET        = galltransport
+GALLERY_TXTSHAPES_TARGET        = galltxtshapes
+
 GALLERY_FLAGS_TARGET            = gallflags
 GALLERY_HTMLEXPO_TARGET         = gallhtmlexpo
 GALLERY_MAPS_TARGET             = gallmaps

Modified: openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/directory_ooo.scp Wed Dec  5 17:17:41 2012
@@ -891,6 +891,40 @@ Directory gid_Dir_Gallery_Bullets
     DosName = "bullets";
 End
 
+//////////////////////////////////////////////////////////////////////////////
+
+Directory gid_Dir_Gallery_Computers
+    ParentID = gid_Dir_Gallery;
+    DosName = "computers";
+End
+
+Directory gid_Dir_Gallery_Diagrams
+    ParentID = gid_Dir_Gallery;
+    DosName = "diagrams";
+End
+
+Directory gid_Dir_Gallery_Environment
+    ParentID = gid_Dir_Gallery;
+    DosName = "environment";
+End
+
+Directory gid_Dir_Gallery_Finance
+    ParentID = gid_Dir_Gallery;
+    DosName = "finance";
+End
+
+Directory gid_Dir_Gallery_Transport
+    ParentID = gid_Dir_Gallery;
+    DosName = "transport";
+End
+
+Directory gid_Dir_Gallery_Txtshapes
+    ParentID = gid_Dir_Gallery;
+    DosName = "textshapes";
+End
+
+//////////////////////////////////////////////////////////////////////////////
+
 Directory gid_Dir_Gallery_Flags
     ParentID = gid_Dir_Gallery;
     DosName = "flags";

Modified: openoffice/trunk/main/scp2/source/ooo/file_extra_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_extra_ooo.scp?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_extra_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_extra_ooo.scp Wed Dec  5 17:17:41 2012
@@ -245,6 +245,70 @@ File gid_File_Extra_Gallroot
     Name = "gallroot.zip";
 End
 
+//////////////////////////////////////////////////////////////////////////////
+
+File gid_File_Extra_Gallarrows
+    Dir = gid_Dir_Gallery_Arrows;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallarrows.zip";
+End
+
+File gid_File_Extra_Gallcomputers
+    Dir = gid_Dir_Gallery_Computers;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallcomputers.zip";
+End
+
+File gid_File_Extra_Galldiagrams
+    Dir = gid_Dir_Gallery_Diagrams;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galldiagrams.zip";
+End
+
+File gid_File_Extra_Galleducation
+    Dir = gid_Dir_Gallery_Education;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galleducation.zip";
+End
+
+File gid_File_Extra_Gallenvironment
+    Dir = gid_Dir_Gallery_Environment;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallenvironment.zip";
+End
+
+File gid_File_Extra_Gallfinance
+    Dir = gid_Dir_Gallery_Finance;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallfinance.zip";
+End
+
+File gid_File_Extra_Gallpeople
+    Dir = gid_Dir_Gallery_People;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallpeople.zip";
+End
+
+File gid_File_Extra_Gallsymbols
+    Dir = gid_Dir_Gallery_Symbols;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "gallsymbols.zip";
+End
+
+File gid_File_Extra_Galltransport
+    Dir = gid_Dir_Gallery_Transport;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galltransport.zip";
+End
+
+File gid_File_Extra_Galltxtshapes
+    Dir = gid_Dir_Gallery_Txtshapes;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "galltxtshapes.zip";
+End
+
+//////////////////////////////////////////////////////////////////////////////
+
 File gid_File_Extra_Gallrulers
     Dir = gid_Dir_Gallery_Rulers;
     ARCHIVE_TXT_FILE_BODY;

Modified: openoffice/trunk/main/svx/inc/galtheme.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/galtheme.hrc?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/galtheme.hrc (original)
+++ openoffice/trunk/main/svx/inc/galtheme.hrc Wed Dec  5 17:17:41 2012
@@ -67,7 +67,14 @@
 #define RID_GALLERYSTR_THEME_FONTWORK					(RID_GALLERYSTR_THEME_START + 37)
 #define RID_GALLERYSTR_THEME_FONTWORK_VERTICAL			(RID_GALLERYSTR_THEME_START + 38)
 
+#define RID_GALLERYSTR_THEME_COMPUTERS                  (RID_GALLERYSTR_THEME_START + 39)
+#define RID_GALLERYSTR_THEME_DIAGRAMS                   (RID_GALLERYSTR_THEME_START + 40)
+#define RID_GALLERYSTR_THEME_ENVIRONMENT                (RID_GALLERYSTR_THEME_START + 41)
+#define RID_GALLERYSTR_THEME_FINANCE                    (RID_GALLERYSTR_THEME_START + 42)
+#define RID_GALLERYSTR_THEME_TRANSPORT                  (RID_GALLERYSTR_THEME_START + 43)
+#define RID_GALLERYSTR_THEME_TXTSHAPES                  (RID_GALLERYSTR_THEME_START + 44)
+
 #define RID_GALLERYSTR_THEME_FIRST			RID_GALLERYSTR_THEME_3D
-#define RID_GALLERYSTR_THEME_LAST			RID_GALLERYSTR_THEME_FONTWORK_VERTICAL
+#define RID_GALLERYSTR_THEME_LAST			RID_GALLERYSTR_THEME_TXTSHAPES
 
 #endif

Modified: openoffice/trunk/main/svx/source/gallery2/gallery1.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/gallery2/gallery1.cxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/gallery2/gallery1.cxx (original)
+++ openoffice/trunk/main/svx/source/gallery2/gallery1.cxx Wed Dec  5 17:17:41 2012
@@ -601,7 +601,18 @@ String Gallery::GetThemeName( sal_uIntPt
 			case( GALLERY_THEME_RULERS ): aFallback = "Rulers"; break;
 			case( GALLERY_THEME_SOUNDS ): aFallback = "Sounds"; break;
 
-			default:
+            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;
 		}
 

Modified: openoffice/trunk/main/svx/source/gallery2/galobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/gallery2/galobj.cxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/gallery2/galobj.cxx (original)
+++ openoffice/trunk/main/svx/source/gallery2/galobj.cxx Wed Dec  5 17:17:41 2012
@@ -91,7 +91,7 @@ sal_Bool SgaObject::CreateThumb( const G
 		            else
 		                aBmpSize.Height() = FRound( aBmpSize.Width() / fFactorLog );
 
-		            aBmpEx.SetSizePixel( aBmpSize );
+		            aBmpEx.SetSizePixel( aBmpSize, BMP_SCALE_BESTQUALITY );
 		        }
 		    }
 
@@ -108,8 +108,10 @@ sal_Bool SgaObject::CreateThumb( const G
 				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 ) )
+				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;
@@ -127,7 +129,7 @@ sal_Bool SgaObject::CreateThumb( const G
 		else
 			aSize.Height() = (sal_Int32)( S_THUMB / fFactor );
 
-        const GraphicConversionParameters aParameters(aSize);
+        const GraphicConversionParameters aParameters(aSize, false, true, true, true);
         aThumbBmp = rGraphic.GetBitmap(aParameters);
 
 		if( !aThumbBmp.IsEmpty() )

Modified: openoffice/trunk/main/svx/source/gallery2/galtheme.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/gallery2/galtheme.src?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/gallery2/galtheme.src (original)
+++ openoffice/trunk/main/svx/source/gallery2/galtheme.src Wed Dec  5 17:17:41 2012
@@ -121,15 +121,15 @@ String RID_GALLERYSTR_THEME_SURFACES
 	Text [ en-US ] = "Surfaces";
 };
 
-// -----------------------------------------------------------------------------
-
-String RID_GALLERYSTR_THEME_HTMLBUTTONS
-{
-	// !!! Don't translate, please !!!
-	Text = "private://gallery/hidden/HtmlExportButtons";
-};
-
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+
+String RID_GALLERYSTR_THEME_HTMLBUTTONS
+{
+	// !!! Don't translate, please !!!
+	Text = "private://gallery/hidden/HtmlExportButtons";
+};
+
+// -----------------------------------------------------------------------------
 
 String RID_GALLERYSTR_THEME_POWERPOINT
 {
@@ -145,6 +145,38 @@ String RID_GALLERYSTR_THEME_RULERS
 };
 
 // -----------------------------------------------------------------------------
+
+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
 {

Modified: openoffice/trunk/main/vcl/inc/vcl/alpha.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/alpha.hxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/alpha.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/alpha.hxx Wed Dec  5 17:17:41 2012
@@ -66,7 +66,10 @@ public:
     void					SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); }
 
     Size					GetSizePixel() const { return Bitmap::GetSizePixel(); }
-	void					SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); }
+	void					SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE
) 
+    { 
+        Bitmap::SetSizePixel( rNewSize, nScaleFlag ); 
+    }
 
     sal_uLong					GetSizeBytes() const { return Bitmap::GetSizeBytes(); }
 	sal_uLong					GetChecksum() const { return Bitmap::GetChecksum(); }
@@ -81,8 +84,8 @@ public:
     sal_Bool                    Erase( sal_uInt8 cTransparency );
     sal_Bool                    Invert();
     sal_Bool                    Mirror( sal_uLong nMirrorFlags );
-    sal_Bool                    Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE
);
-    sal_Bool                    Scale( const double& rScaleX, const double& rScaleY,
sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+    sal_Bool                    Scale( const Size& rNewSize, sal_uInt32 nScaleFlag =
BMP_SCALE_FASTESTINTERPOLATE );
+    sal_Bool                    Scale( const double& rScaleX, const double& rScaleY,
sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
     sal_Bool                    Rotate( long nAngle10, sal_uInt8 cFillTransparency );
     sal_Bool                    Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency
);
     sal_Bool                    Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency,
sal_uLong nTol = 0UL );

Modified: openoffice/trunk/main/vcl/inc/vcl/bitmap.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/bitmap.hxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/bitmap.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/bitmap.hxx Wed Dec  5 17:17:41 2012
@@ -456,7 +456,7 @@ public:
     inline void             SetPrefSize( const Size& rSize );
 
     Size                    GetSizePixel() const;
-	void					SetSizePixel( const Size& rNewSize );
+	void					SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE
);
 
     /**
      * The pixel size of a bitmap's source (e.g. an image file)
@@ -654,7 +654,7 @@ public:
 
         @return sal_True, if the operation was completed successfully.        
      */
-    sal_Bool                    Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE
);
+    sal_Bool                    Scale( const Size& rNewSize, sal_uInt32 nScaleFlag =
BMP_SCALE_FASTESTINTERPOLATE );
 
     /** Scale the bitmap
 
@@ -666,7 +666,7 @@ public:
 
         @return sal_True, if the operation was completed successfully.        
      */
-    sal_Bool                    Scale( const double& rScaleX, const double& rScaleY,
sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
+    sal_Bool                    Scale( const double& rScaleX, const double& rScaleY,
sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE );
 
     // Adapt the BitCount of rNew to BitCount of lolal, including grey or color paltette
     // Can be used to create alpha/mask bitmaps after their processing in 24bit

Modified: openoffice/trunk/main/vcl/inc/vcl/bitmapex.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/bitmapex.hxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/bitmapex.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/bitmapex.hxx Wed Dec  5 17:17:41 2012
@@ -109,7 +109,7 @@ public:
 	AlphaMask			GetAlpha() const;
 
     const Size&         GetSizePixel() const { return aBitmapSize; }
-	void				SetSizePixel( const Size& rNewSize );
+	void				SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE
);
 
 	const Size&			GetPrefSize() const { return aBitmap.GetPrefSize(); }
 	void				SetPrefSize( const Size& rPrefSize ) { aBitmap.SetPrefSize( rPrefSize ); }
@@ -255,7 +255,7 @@ public:
 
         @return sal_True, if the operation was completed successfully.        
      */
-	sal_Bool				Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE
);
+	sal_Bool				Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_FASTESTINTERPOLATE
);
 
     /** Scale the bitmap
 
@@ -267,7 +267,7 @@ public:
 
         @return sal_True, if the operation was completed successfully.        
      */
-    sal_Bool				Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag
= BMP_SCALE_FASTESTINTERPOLATE );
+    sal_Bool				Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag
= BMP_SCALE_FASTESTINTERPOLATE );
 
     /** Rotate bitmap by the specified angle
 

Modified: openoffice/trunk/main/vcl/source/gdi/alpha.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/alpha.cxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/alpha.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/alpha.cxx Wed Dec  5 17:17:41 2012
@@ -282,7 +282,7 @@ sal_Bool AlphaMask::Mirror( sal_uLong nM
 
 // -----------------------------------------------------------------------------
 
-sal_Bool AlphaMask::Scale( const Size& rNewSize, sal_uLong nScaleFlag )
+sal_Bool AlphaMask::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag )
 {
 	sal_Bool bRet = Bitmap::Scale( rNewSize, nScaleFlag );
 
@@ -294,7 +294,7 @@ sal_Bool AlphaMask::Scale( const Size& r
 
 // -----------------------------------------------------------------------------
 
-sal_Bool AlphaMask::Scale( const double& rScaleX, const double& rScaleY, sal_uLong
nScaleFlag )
+sal_Bool AlphaMask::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32
nScaleFlag )
 {
 	sal_Bool bRet = Bitmap::Scale( rScaleX, rScaleY, nScaleFlag );
 

Modified: openoffice/trunk/main/vcl/source/gdi/bitmap.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/bitmap.cxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/bitmap.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/bitmap.cxx Wed Dec  5 17:17:41 2012
@@ -289,9 +289,12 @@ Size Bitmap::GetSizePixel() const
 }
 // ------------------------------------------------------------------
 
-void Bitmap::SetSizePixel( const Size& rNewSize )
+void Bitmap::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag )
 {
-	Scale( rNewSize );
+    if(GetSizePixel() != rNewSize)
+    {
+        Scale( rNewSize, nScaleFlag );
+    }
 }
 
 // ------------------------------------------------------------------

Modified: openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx Wed Dec  5 17:17:41 2012
@@ -904,9 +904,19 @@ sal_Bool Bitmap::ImplConvertGhosted()
 
 // ------------------------------------------------------------------------
 
-sal_Bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag
)
+sal_Bool Bitmap::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32
nScaleFlag )
 {
-    bool bRetval(false);
+    if(basegfx::fTools::equalZero(rScaleX) || basegfx::fTools::equalZero(rScaleY))
+    {
+        // no scale
+        return true;
+    }
+
+    if(basegfx::fTools::equal(rScaleX, 1.0) && basegfx::fTools::equal(rScaleY, 1.0))
+    {
+        // no scale
+        return true;
+    }
 
 #ifdef DBG_UTIL
     // #121233# allow to test the different scalers in debug build with source
@@ -929,84 +939,78 @@ sal_Bool Bitmap::Scale( const double& rS
     }
 #endif // DBG_UTIL
 
-    if(basegfx::fTools::equalZero(rScaleX) && basegfx::fTools::equalZero(rScaleY))
+    bool bRetval(false);
+
+    if(BMP_SCALE_BESTQUALITY == nScaleFlag)
     {
-        // no scale
-        bRetval = true;
+        // Use LANCZOS when best quality is requested
+        nScaleFlag = BMP_SCALE_LANCZOS;
     }
-    else
+    else if(BMP_SCALE_FASTESTINTERPOLATE == nScaleFlag)
     {
-        if(BMP_SCALE_BESTQUALITY == nScaleFlag)
+        // Use BMP_SCALE_SUPER when speed is requested, but not worst quality
+        nScaleFlag = BMP_SCALE_SUPER;
+    }
+
+    switch(nScaleFlag)
+    {
+        default:
+        case BMP_SCALE_NONE :
         {
-            // Use LANCZOS when best quality is requested
-            nScaleFlag = BMP_SCALE_LANCZOS;
+            bRetval = false;
+            break;
         }
-        else if(BMP_SCALE_FASTESTINTERPOLATE == nScaleFlag)
+        case BMP_SCALE_FAST :
         {
-            // Use BMP_SCALE_SUPER when speed is requested, but not worst quality
-            nScaleFlag = BMP_SCALE_SUPER;
+            bRetval = ImplScaleFast( rScaleX, rScaleY );
+            break;
         }
-
-        switch(nScaleFlag)
+        case BMP_SCALE_INTERPOLATE :
         {
-            default:
-            case BMP_SCALE_NONE :
-            {
-                bRetval = false;
-                break;
-            }
-            case BMP_SCALE_FAST :
+            bRetval = ImplScaleInterpolate( rScaleX, rScaleY );
+            break;
+        }
+        case BMP_SCALE_SUPER :
+        {
+            if(GetSizePixel().Width() < 2 || GetSizePixel().Height() < 2)
             {
+                // fallback to ImplScaleFast
                 bRetval = ImplScaleFast( rScaleX, rScaleY );
-                break;
             }
-            case BMP_SCALE_INTERPOLATE :
+            else
             {
-                bRetval = ImplScaleInterpolate( rScaleX, rScaleY );
-                break;
+                // #121233# use method from symphony
+                bRetval = ImplScaleSuper( rScaleX, rScaleY );
             }
-            case BMP_SCALE_SUPER :
-            {
-                if(GetSizePixel().Width() < 2 || GetSizePixel().Height() < 2)
-                {
-                    // fallback to ImplScaleFast
-                    bRetval = ImplScaleFast( rScaleX, rScaleY );
-                }
-                else
-                {
-                    // #121233# use method from symphony
-                    bRetval = ImplScaleSuper( rScaleX, rScaleY );
-                }
-                break;
-            }
-            case BMP_SCALE_LANCZOS :
-            {
-                const Lanczos3Kernel kernel;
+            break;
+        }
+        case BMP_SCALE_LANCZOS :
+        {
+            const Lanczos3Kernel kernel;
 
-                bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel);
-                break;
-            }
-            case BMP_SCALE_BICUBIC :
-            {
-                const BicubicKernel kernel;
+            bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel);
+            break;
+        }
+        case BMP_SCALE_BICUBIC :
+        {
+            const BicubicKernel kernel;
 
-                bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel );
-                break;
-            }
-            case BMP_SCALE_BILINEAR :
-            {
-                const BilinearKernel kernel;
+            bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel );
+            break;
+        }
+        case BMP_SCALE_BILINEAR :
+        {
+            const BilinearKernel kernel;
 
-                bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel );
-                break;
-            }
-            case BMP_SCALE_BOX :
-            {
-                const BoxKernel kernel;
+            bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel );
+            break;
+        }
+        case BMP_SCALE_BOX :
+        {
+            const BoxKernel kernel;
 
-                bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel );
-                break;
-            }
+            bRetval = ImplScaleConvolution( rScaleX, rScaleY, kernel );
+            break;
         }
     }
 
@@ -1022,7 +1026,7 @@ sal_Bool Bitmap::Scale( const double& rS
 
 // ------------------------------------------------------------------------
 
-sal_Bool Bitmap::Scale( const Size& rNewSize, sal_uLong nScaleFlag )
+sal_Bool Bitmap::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag )
 {
 	const Size	aSize( GetSizePixel() );
 	sal_Bool		bRet;

Modified: openoffice/trunk/main/vcl/source/gdi/bitmapex.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/bitmapex.cxx?rev=1417535&r1=1417534&r2=1417535&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/bitmapex.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/bitmapex.cxx Wed Dec  5 17:17:41 2012
@@ -393,9 +393,12 @@ sal_uLong BitmapEx::GetChecksum() const
 
 // ------------------------------------------------------------------
 
-void BitmapEx::SetSizePixel( const Size& rNewSize )
+void BitmapEx::SetSizePixel( const Size& rNewSize, sal_uInt32 nScaleFlag )
 {
-	Scale( rNewSize );
+    if(GetSizePixel() != rNewSize)
+    {
+        Scale( rNewSize, nScaleFlag );
+    }
 }
 
 // ------------------------------------------------------------------
@@ -434,7 +437,7 @@ sal_Bool BitmapEx::Mirror( sal_uLong nMi
 
 // ------------------------------------------------------------------
 
-sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uLong
nScaleFlag )
+sal_Bool BitmapEx::Scale( const double& rScaleX, const double& rScaleY, sal_uInt32
nScaleFlag )
 {
 	sal_Bool bRet = sal_False;
 
@@ -458,7 +461,7 @@ sal_Bool BitmapEx::Scale( const double& 
 
 // ------------------------------------------------------------------------
 
-sal_Bool BitmapEx::Scale( const Size& rNewSize, sal_uLong nScaleFlag )
+sal_Bool BitmapEx::Scale( const Size& rNewSize, sal_uInt32 nScaleFlag )
 {
 	sal_Bool bRet;
 



Mime
View raw message