diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-12-18 14:31:14 +0100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-12-19 21:37:46 +0000 |
commit | a538162b8b9c437ccd0f47bdb042317914118c6d (patch) | |
tree | 5305faedd2e1be27f4e1a218ccd08a412f039b28 /vcl | |
parent | 4a5ee9a074c94f2a0cc9733e12d5e412926633d1 (diff) |
vcl: separate ImplImageTree - ImageTree singleton and public iface
ImplImageTree was used outside of VCL which is not consistent with
the name and the header also contains a lot of implementation
detail. This separates the implementation to ImplImageTree and
the public interface and singleton to ImageTree only.
Change-Id: I3a26444f0f6971a6b1d83472e9cef19c93192d3e
Reviewed-on: https://gerrit.libreoffice.org/32134
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit bf5f6df9e47bd31dc052c6411f6f88ec2d4e3cea)
Reviewed-on: https://gerrit.libreoffice.org/32165
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
-rw-r--r-- | vcl/backendtest/VisualBackendTest.cxx | 1 | ||||
-rw-r--r-- | vcl/inc/implimagetree.hxx | 136 | ||||
-rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/vcldemo-debug.hxx | 25 | ||||
-rw-r--r-- | vcl/osx/vclnsapp.mm | 16 | ||||
-rw-r--r-- | vcl/source/app/settings.cxx | 2 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 4 | ||||
-rw-r--r-- | vcl/source/bitmap/BitmapTools.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/bitmapex.cxx | 4 | ||||
-rw-r--r-- | vcl/source/image/Image.cxx | 2 | ||||
-rw-r--r-- | vcl/source/image/ImageArrayData.cxx | 4 | ||||
-rw-r--r-- | vcl/source/image/ImageList.cxx | 2 | ||||
-rw-r--r-- | vcl/source/image/ImageRepository.cxx | 6 | ||||
-rw-r--r-- | vcl/source/image/ImageTree.cxx | 56 | ||||
-rw-r--r-- | vcl/source/image/ImplImageTree.cxx | 19 | ||||
-rw-r--r-- | vcl/workben/vcldemo.cxx | 9 |
18 files changed, 226 insertions, 67 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b8cb25748d3f..f552b55925f4 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -313,6 +313,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/image/Image \ vcl/source/image/ImageArrayData \ vcl/source/image/ImageList \ + vcl/source/image/ImageTree \ vcl/source/image/ImageRepository \ vcl/source/image/ImplImage \ vcl/source/image/ImplImageList \ diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx index ced23d971f7d..fd6f27b2cb63 100644 --- a/vcl/backendtest/VisualBackendTest.cxx +++ b/vcl/backendtest/VisualBackendTest.cxx @@ -41,7 +41,6 @@ #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <vcldemo-debug.hxx> #include <rtl/math.hxx> diff --git a/vcl/inc/implimagetree.hxx b/vcl/inc/implimagetree.hxx new file mode 100644 index 000000000000..a229177c4709 --- /dev/null +++ b/vcl/inc/implimagetree.hxx @@ -0,0 +1,136 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * 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 . + */ + +#ifndef INCLUDED_VCL_INC_IMPLIMAGETREE_HXX +#define INCLUDED_VCL_INC_IMPLIMAGETREE_HXX + +#include <sal/config.h> + +#include <memory> +#include <unordered_map> +#include <utility> +#include <vector> + +#include <com/sun/star/uno/Reference.hxx> +#include <rtl/ustring.hxx> +#include <vcl/bitmapex.hxx> +#include <vcl/dllapi.h> +#include <i18nlangtag/languagetag.hxx> +#include <vcl/ImageTree.hxx> + +namespace com { namespace sun { namespace star { namespace container { + class XNameAccess; +}}}} + +class ImplImageTree +{ +public: + ImplImageTree(); + ~ImplImageTree(); + + OUString getImageUrl( + OUString const & name, OUString const & style, OUString const & lang); + + bool loadImage( + OUString const & name, OUString const & style, + BitmapEx & bitmap, bool localized, + const ImageLoadFlags eFlags = ImageLoadFlags::NONE); + + bool loadDefaultImage( + OUString const & style, + BitmapEx& bitmap, + const ImageLoadFlags eFlags = ImageLoadFlags::NONE); + + /** a crude form of life cycle control (called from DeInitVCL; otherwise, + * if the ImplImageTree singleton were destroyed during exit that would + * be too late for the destructors of the bitmaps in maIconCache)*/ + void shutdown(); + + css::uno::Reference< css::container::XNameAccess > getNameAccess(); + +private: + ImplImageTree(const ImplImageTree&) = delete; + ImplImageTree& operator=(const ImplImageTree&) = delete; + + typedef std::unordered_map<OUString, std::pair<bool, BitmapEx>, OUStringHash> IconCache; + typedef std::unordered_map<OUString, OUString, OUStringHash> IconLinkHash; + + struct IconSet + { + OUString maURL; + css::uno::Reference<css::container::XNameAccess> maNameAccess; + IconCache maIconCache; + IconLinkHash maLinkHash; + + IconSet() + {} + + IconSet(const OUString & rURL) + : maURL(rURL) + {} + }; + + /// Map between the theme name(s) and the content. + typedef std::unordered_map<OUString, IconSet, OUStringHash> StyleIconSet; + + /// Remember all the (used) icon styles and individual icons in them. + StyleIconSet maIconSets; + + /// Style used for the current operations; switches switch several times during fallback search. + OUString maCurrentStyle; + + IconSet& getCurrentIconSet() + { + return maIconSets[maCurrentStyle]; + } + + bool doLoadImage( + OUString const & name, OUString const & style, + BitmapEx & bitmap, bool localized, const ImageLoadFlags eFlags); + + std::vector<OUString> getPaths(OUString const & name, LanguageTag& rLanguageTag); + + bool checkPathAccess(); + + void setStyle(OUString const & rStyle); + + void createStyle(); + + bool iconCacheLookup(OUString const & rName, bool bLocalized, const ImageLoadFlags eFlags, BitmapEx & rBitmap); + + bool findImage(std::vector<OUString> const & rPaths, BitmapEx & rBitmap, const ImageLoadFlags eFlags); + + void loadImageLinks(); + + void parseLinkFile(std::shared_ptr<SvStream> const & aStream); + + /// Return name of a real .png according to links.txt. + OUString const & getRealImageName(OUString const & rName); + + + /** Return name of the fallback style for the provided one. + + Must not be cyclic :-) The last theme in the chain returns an empty string. + */ + static OUString fallbackStyle(const OUString &rStyle); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index e283e036bc45..6ef9e2a5069e 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -151,7 +151,7 @@ #include <vcl/help.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/image.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/layout.hxx> diff --git a/vcl/inc/vcldemo-debug.hxx b/vcl/inc/vcldemo-debug.hxx deleted file mode 100644 index 37dae2481b9e..000000000000 --- a/vcl/inc/vcldemo-debug.hxx +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_VCL_INC_VCLDEMO_DEBUG_HXX -#define INCLUDED_VCL_INC_VCLDEMO_DEBUG_HXX - -#include <sal/config.h> - -#include <com/sun/star/uno/Sequence.hxx> -#include <rtl/ustring.hxx> -#include <sal/types.h> -#include <vcl/dllapi.h> - -// For vcldemo / debugging -VCL_DLLPUBLIC css::uno::Sequence< OUString > ImageTree_getAllImageNames(); - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm index a8eb84aa297d..4c38466961b0 100644 --- a/vcl/osx/vclnsapp.mm +++ b/vcl/osx/vclnsapp.mm @@ -24,7 +24,7 @@ #include <sal/main.h> #include <vcl/commandevent.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -374,8 +374,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP (void)app; std::vector<OUString> aFile; aFile.push_back( GetOUString( pFile ) ); - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFile); - AquaSalInstance::aAppEventList.push_back( pAppEvent ); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFile); + AquaSalInstance::aAppEventList.push_back( pAppEvent ); return YES; } -(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels @@ -393,8 +393,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP { aFileList.push_back( GetOUString( pFile ) ); } - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFileList); - AquaSalInstance::aAppEventList.push_back( pAppEvent ); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFileList); + AquaSalInstance::aAppEventList.push_back( pAppEvent ); // we have no back channel here, we have to assume success // correct handling would be NSPrintingReplyLater and then send [app replyToOpenOrPrint] return NSPrintingSuccess; @@ -425,7 +425,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP { ApplicationEvent aEv(ApplicationEvent::Type::PrivateDoShutdown); GetpApp()->AppEvent( aEv ); - ImplImageTree::get().shutDown(); + ImageTree::get().shutdown(); // DeInitVCL should be called in ImplSVMain - unless someon _exits first which // can occur in Desktop::doShutdown for example } @@ -440,8 +440,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP SolarMutexGuard aGuard; const SalData* pSalData = GetSalData(); - if( !pSalData->maFrames.empty() ) - pSalData->maFrames.front()->CallCallback( SalEvent::SettingsChanged, nullptr ); + if( !pSalData->maFrames.empty() ) + pSalData->maFrames.front()->CallCallback( SalEvent::SettingsChanged, nullptr ); } -(void)screenParametersChanged: (NSNotification*) pNotification diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index d9dbe571081d..e4d90f91e253 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -42,7 +42,7 @@ #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/i18nhelp.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/configsettings.hxx> #include <vcl/gradient.hxx> #include <vcl/outdev.hxx> diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 2012764b18c2..2cd613727ab4 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -38,7 +38,7 @@ #include <vcl/cvtgrf.hxx> #include <vcl/scheduler.hxx> #include <vcl/image.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/settings.hxx> #include <vcl/unowrap.hxx> #include <vcl/commandinfoprovider.hxx> @@ -403,7 +403,7 @@ void DeInitVCL() SAL_WARN_IF( nBadTopWindows!=0, "vcl", aBuf.getStr() ); #endif - ImplImageTree::get().shutDown(); + ImageTree::get().shutdown(); osl_removeSignalHandler( pExceptionHandler); pExceptionHandler = nullptr; diff --git a/vcl/source/bitmap/BitmapTools.cxx b/vcl/source/bitmap/BitmapTools.cxx index 1016a78e1504..40e79b721b71 100644 --- a/vcl/source/bitmap/BitmapTools.cxx +++ b/vcl/source/bitmap/BitmapTools.cxx @@ -42,7 +42,7 @@ BitmapEx loadFromName(const OUString& rFileName, const ImageLoadFlags eFlags) OUString aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - ImplImageTree::get().loadImage(rFileName, aIconTheme, aBitmapEx, true, eFlags); + ImageTree::get().loadImage(rFileName, aIconTheme, aBitmapEx, true, eFlags); return aBitmapEx; } diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index dae1d42bc335..688c7785ecb3 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -23,7 +23,7 @@ #include <vcl/dialog.hxx> #include <vcl/event.hxx> #include <vcl/fixed.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 7bde2ffc5f84..808886f9fbb8 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -25,7 +25,7 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> #include <tools/rc.h> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/salbtype.hxx> #include <vcl/outdev.hxx> #include <vcl/alpha.hxx> @@ -110,7 +110,7 @@ void BitmapEx::loadFromIconTheme( const OUString& rIconName ) { OUString aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - if( !ImplImageTree::get().loadImage( rIconName, aIconTheme, *this, true ) ) + if (!ImageTree::get().loadImage(rIconName, aIconTheme, *this, true)) { #ifdef DBG_UTIL OStringBuffer aErrorStr( diff --git a/vcl/source/image/Image.cxx b/vcl/source/image/Image.cxx index 22b6fbc451de..51dcca4ed94e 100644 --- a/vcl/source/image/Image.cxx +++ b/vcl/source/image/Image.cxx @@ -30,7 +30,7 @@ #include <vcl/svapp.hxx> #include <vcl/image.hxx> #include <vcl/imagerepository.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <sal/types.h> #include <image.h> diff --git a/vcl/source/image/ImageArrayData.cxx b/vcl/source/image/ImageArrayData.cxx index bd2f1dfec1d7..543543804a70 100644 --- a/vcl/source/image/ImageArrayData.cxx +++ b/vcl/source/image/ImageArrayData.cxx @@ -26,7 +26,7 @@ #include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <image.h> #include <memory> @@ -70,7 +70,7 @@ void ImageAryData::Load(const OUString &rPrefix) OUString aFileName = rPrefix; aFileName += maName; - bool bSuccess = ImplImageTree::get().loadImage(aFileName, aIconTheme, maBitmapEx, true); + bool bSuccess = ImageTree::get().loadImage(aFileName, aIconTheme, maBitmapEx, true); if (bSuccess) {} diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx index 29bdbc00a4a8..3dadd1466cfa 100644 --- a/vcl/source/image/ImageList.cxx +++ b/vcl/source/image/ImageList.cxx @@ -30,7 +30,7 @@ #include <vcl/svapp.hxx> #include <vcl/image.hxx> #include <vcl/imagerepository.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <image.h> ImageList::ImageList() diff --git a/vcl/source/image/ImageRepository.cxx b/vcl/source/image/ImageRepository.cxx index 855ae80c6306..7b9255f32348 100644 --- a/vcl/source/image/ImageRepository.cxx +++ b/vcl/source/image/ImageRepository.cxx @@ -19,7 +19,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/imagerepository.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -29,13 +29,13 @@ namespace vcl { OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - return ImplImageTree::get().loadImage( _rName, sIconTheme, _out_rImage, _bSearchLanguageDependent ); + return ImageTree::get().loadImage( _rName, sIconTheme, _out_rImage, _bSearchLanguageDependent ); } bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage) { OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - return ImplImageTree::get().loadDefaultImage( sIconTheme,_out_rImage); + return ImageTree::get().loadDefaultImage( sIconTheme,_out_rImage); } } // namespace vcl diff --git a/vcl/source/image/ImageTree.cxx b/vcl/source/image/ImageTree.cxx new file mode 100644 index 000000000000..0c9dcac957a6 --- /dev/null +++ b/vcl/source/image/ImageTree.cxx @@ -0,0 +1,56 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ + +#include <vcl/ImageTree.hxx> +#include "implimagetree.hxx" +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/container/XNameAccess.hpp> + +ImageTree & ImageTree::get() { + static ImageTree s_ImageTree; + return s_ImageTree; +} + +ImageTree::ImageTree() + : mpImplImageTree(new ImplImageTree) +{ +} + +OUString ImageTree::getImageUrl(OUString const & rName, OUString const & rStyle, OUString const & rLang) + +{ + return mpImplImageTree->getImageUrl(rName, rStyle, rLang); +} + +bool ImageTree::loadImage(OUString const & rName, OUString const & rStyle, + BitmapEx & rBitmap, bool bLocalized, + const ImageLoadFlags eFlags) +{ + return mpImplImageTree->loadImage(rName, rStyle, rBitmap, bLocalized, eFlags); +} + +bool ImageTree::loadDefaultImage(OUString const & rStyle, BitmapEx& rBitmap, + const ImageLoadFlags eFlags) +{ + return mpImplImageTree->loadDefaultImage(rStyle, rBitmap, eFlags); +} + +css::uno::Reference<css::container::XNameAccess> ImageTree::getNameAccess() +{ + return mpImplImageTree->getNameAccess(); +} + +void ImageTree::shutdown() +{ + mpImplImageTree->shutdown(); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/image/ImplImageTree.cxx b/vcl/source/image/ImplImageTree.cxx index bd36080633e2..744d48736dc5 100644 --- a/vcl/source/image/ImplImageTree.cxx +++ b/vcl/source/image/ImplImageTree.cxx @@ -37,13 +37,13 @@ #include "tools/stream.hxx" #include "tools/urlobj.hxx" +#include "implimagetree.hxx" + #include <vcl/bitmapex.hxx> #include <vcl/dibtools.hxx> -#include <vcl/implimagetree.hxx> #include <vcl/pngread.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcldemo-debug.hxx> #include <vcl/BitmapProcessor.hxx> #include <vcl/BitmapTools.hxx> @@ -171,11 +171,6 @@ void loadImageFromStream(std::shared_ptr<SvStream> const & xStream, OUString con } -ImplImageTree & ImplImageTree::get() { - static ImplImageTree s_ImplImageTree; - return s_ImplImageTree; -} - ImplImageTree::ImplImageTree() { } @@ -368,7 +363,7 @@ bool ImplImageTree::doLoadImage(OUString const & name, OUString const & style, B return found; } -void ImplImageTree::shutDown() +void ImplImageTree::shutdown() { maCurrentStyle.clear(); maIconSets.clear(); @@ -545,12 +540,4 @@ css::uno::Reference<css::container::XNameAccess> ImplImageTree::getNameAccess() return getCurrentIconSet().maNameAccess; } -/// Recursively dump all names ... -css::uno::Sequence<OUString> ImageTree_getAllImageNames() -{ - css::uno::Reference<css::container::XNameAccess> xRef(ImplImageTree::get().getNameAccess()); - - return xRef->getElementNames(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 5458bb4799fd..964904fdf71f 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -17,6 +17,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/container/XNameAccess.hpp> #include <osl/time.h> #include <vcl/vclmain.hxx> @@ -38,10 +41,10 @@ #include <vcl/bitmapaccess.hxx> #include <vcl/help.hxx> #include <vcl/menu.hxx> +#include <vcl/ImageTree.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <vcldemo-debug.hxx> #include <opengl/zone.hxx> // internal headers for OpenGLTests class. @@ -1211,7 +1214,9 @@ public: return; bHasLoadedAll = true; - css::uno::Sequence< OUString > aAllIcons = ImageTree_getAllImageNames(); + css::uno::Reference<css::container::XNameAccess> xRef(ImageTree::get().getNameAccess()); + css::uno::Sequence< OUString > aAllIcons = xRef->getElementNames(); + for (sal_Int32 i = 0; i < aAllIcons.getLength(); i++) { if (aAllIcons[i].endsWithIgnoreAsciiCase("svg")) |