[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - cui/source

Noel Grandin noel at peralex.com
Sun Nov 23 10:38:06 PST 2014


 cui/source/customize/cfg.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit f97025d1c6db6fb0bde601d48005399a9422e7c9
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Nov 10 12:16:41 2014 +0200

    fdo#76658 fix bad conversion of old-style UNO service..
    
    in my commit 0394cb37a2d378511f265004b285fd93df37e5ca
    "fdo#46808, Convert ui::ImageManager to new style"
    
    Change-Id: I77d3189723403221e7388969b1eb892a244b90af
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 00ddedcb477ed09b5649e816b629234d5689b861)
    Reviewed-on: https://gerrit.libreoffice.org/13069
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index c646ec6..9c4e1e8 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -5015,6 +5015,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
     aProp[ 1 ] <<= aPropValue;
 
     m_xImportedImageManager = css::ui::ImageManager::create( xComponentContext );
+    m_xImportedImageManager->initialize(aProp);
 
     ImageInfo mImageInfo;
     uno::Sequence< OUString > names;


More information about the Libreoffice-commits mailing list