diff options
| author | Armin Le Grand <alg@apache.org> | 2012-12-05 16:17:41 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-10 17:04:28 +0100 |
| commit | fb6f2e1109abdd09e80dbcd6660a9530fc06ff0f (patch) | |
| tree | 9b099e9edca5ee8993a86cf5989b34c46d76e7cd /include/vcl | |
| parent | f2b92a9ab5d1b0c7d3d01db675268b0e1925cdc6 (diff) | |
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
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/bitmap.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/bitmapex.hxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 30d7349a5673..7cf248c26ed0 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -609,7 +609,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_DEFAULT ); + sal_Bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); /** Scale the bitmap @@ -621,7 +621,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_DEFAULT ); + sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); /** Rotate bitmap by the specified angle diff --git a/include/vcl/bitmapex.hxx b/include/vcl/bitmapex.hxx index 9eaaf618200c..3b42244b149b 100644 --- a/include/vcl/bitmapex.hxx +++ b/include/vcl/bitmapex.hxx @@ -99,7 +99,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_DEFAULT ); const Size& GetPrefSize() const { return aBitmap.GetPrefSize(); } void SetPrefSize( const Size& rPrefSize ) { aBitmap.SetPrefSize( rPrefSize ); } @@ -245,7 +245,7 @@ public: @return sal_True, if the operation was completed successfully. */ - sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_DEFAULT ); + sal_Bool Scale( const Size& rNewSize, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); /** Scale the bitmap @@ -257,7 +257,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_DEFAULT ); + sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uInt32 nScaleFlag = BMP_SCALE_DEFAULT ); /** Rotate bitmap by the specified angle |