diff options
| author | Noel Grandin <noel@peralex.com> | 2013-03-27 10:41:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-04-23 16:05:56 +0200 |
| commit | 9ffb86c7e93c1633866ed89f0749831fd7f31a35 (patch) | |
| tree | 7cdbb5e8dccc64ecd4c1825a15e346004bd9ab81 /svx | |
| parent | 1dec1f2f7efc579dedaec0535e3a750945039019 (diff) | |
fdo#46808, convert drawing::ColorTable to new style
The service already existed, it just needed an IDL file.
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/accessibility/lookupcolorname.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx index d0805d2f3e1a..b31f8f97f9b5 100644 --- a/svx/source/accessibility/lookupcolorname.cxx +++ b/svx/source/accessibility/lookupcolorname.cxx @@ -23,6 +23,7 @@ #include "boost/unordered_map.hpp" #include "com/sun/star/container/XNameAccess.hpp" #include "com/sun/star/container/XNameContainer.hpp" +#include "com/sun/star/drawing/ColorTable.hpp" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Reference.hxx" @@ -54,19 +55,15 @@ ColorNameMap::ColorNameMap() { try { // Create color table in which to look up the given color. - css::uno::Reference< css::container::XNameContainer > xColorTable ( - comphelper::getProcessServiceFactory()->createInstance( "com.sun.star.drawing.ColorTable" ), - css::uno::UNO_QUERY); + css::uno::Reference< css::container::XNameContainer > xColorTable = + css::drawing::ColorTable::create( comphelper::getProcessComponentContext() ); // Get list of color names in order to iterate over the color table. - xNA = css::uno::Reference< css::container::XNameAccess >(xColorTable, css::uno::UNO_QUERY); - if (xNA.is()) - { - // Lock the solar mutex here as workarround for missing lock in - // called function. - SolarMutexGuard aGuard; - aNames = xNA->getElementNames(); - } + + // Lock the solar mutex here as workarround for missing lock in + // called function. + SolarMutexGuard aGuard; + aNames = xNA->getElementNames(); } catch (css::uno::RuntimeException const&) { |