diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 08:00:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 08:00:56 +0000 |
| commit | 91b4117b4d7db64c5a04272baa43fd0d6c558925 (patch) | |
| tree | b67db64a89ea4b640a8fff6a0182960e99c2f2f1 /svx/source/unogallery | |
| parent | 1ddd49e6eb001c9246d5faa1e4199848608f0ef9 (diff) | |
INTEGRATION: CWS impress115 (1.5.162); FILE MERGED
2007/01/02 10:32:15 cl 1.5.162.1: #120142# made Gallery a singleton, no refcounting anymore
Diffstat (limited to 'svx/source/unogallery')
| -rw-r--r-- | svx/source/unogallery/unogaltheme.cxx | 10 | ||||
| -rw-r--r-- | svx/source/unogallery/unogalthemeprovider.cxx | 12 |
2 files changed, 6 insertions, 16 deletions
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index e96c532200..459cef039f 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unogaltheme.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:19:29 $ + * last change: $Author: obo $ $Date: 2007-01-23 09:00:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,9 +66,7 @@ namespace unogallery { GalleryTheme::GalleryTheme( const ::rtl::OUString& rThemeName ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - - mpGallery = ::Gallery::AcquireGallery( SvtPathOptions().GetGalleryPath() ); + mpGallery = ::Gallery::GetGalleryInstance(); mpTheme = ( mpGallery ? mpGallery->AcquireTheme( rThemeName, *this ) : NULL ); if( mpGallery ) @@ -91,8 +89,6 @@ GalleryTheme::~GalleryTheme() if( mpTheme ) mpGallery->ReleaseTheme( mpTheme, *this ); - - ::Gallery::ReleaseGallery( mpGallery ); } } diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index 979f3ce94e..f6136fc710 100644 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unogalthemeprovider.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:19:43 $ + * last change: $Author: obo $ $Date: 2007-01-23 09:00:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -96,19 +96,13 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GalleryThemeProvider_getSupportedServi GalleryThemeProvider::GalleryThemeProvider() : mbHiddenThemes( sal_False ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - - mpGallery = ::Gallery::AcquireGallery( SvtPathOptions().GetGalleryPath() ); + mpGallery = ::Gallery::GetGalleryInstance(); } // ------------------------------------------------------------------------------ GalleryThemeProvider::~GalleryThemeProvider() { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); - - if( mpGallery ) - ::Gallery::ReleaseGallery( mpGallery ); } // ------------------------------------------------------------------------------ |