mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, Adapt cui::ColorPicker UNO service to new style

Browse Source 
The service already existed, it just did not have an IDL file

Change-Id: I7a43b3f8c1299afde3a613dc7ec1c522c4b7a057
This commit is contained in:
Noel Grandin
2013-02-06 15:22:34 +02:00
parent 36d0933b66
commit 4d23fcf0c0
3 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
offapi/UnoApi_offapi.mk
View File

@@ -71,6 +71,9 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/configurat
Update \
theDefaultProvider \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/cui,\
ColorPicker \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/datatransfer,\
DataFormatTranslator \
MimeContentTypeFactory \

42
offapi/com/sun/star/cui/ColorPicker.idl Normal file
View File

@@ -0,0 +1,42 @@
/* -*- 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 __com_sun_star_cui_ColorPicker_idl__
#define __com_sun_star_cui_ColorPicker_idl__
#include <com/sun/star/ui/dialogs/XExecutableDialog.idl>
#include <com/sun/star/awt/XWindow.idl>
module com { module sun { module star { module cui {
/**
@since LibreOffice 4.1
*/
service ColorPicker : com::sun::star::ui::dialogs::XExecutableDialog
{
createWithParent([in] com::sun::star::awt::XWindow Parent);
};
}; }; }; };
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

8
svtools/source/dialogs/colrdlg.cxx
View File

@@ -22,6 +22,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/cui/ColorPicker.hpp>
#include <comphelper/processfactory.hxx>
@@ -76,14 +77,11 @@ short SvColorDialog::Execute()
try
{
const OUString sColor( RTL_CONSTASCII_USTRINGPARAM( "Color" ) );
Reference< XMultiServiceFactory > xSMGR( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
Reference< com::sun::star::awt::XWindow > xParent( VCLUnoHelper::GetInterface( mpParent ) );
Sequence< Any > args(1);
args[0] = Any( xParent );
Reference< XExecutableDialog > xDialog( xSMGR->createInstanceWithArguments(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.cui.ColorPicker")), args), UNO_QUERY_THROW );
Reference< XExecutableDialog > xDialog = com::sun::star::cui::ColorPicker::createWithParent(xContext, xParent);
Reference< XPropertyAccess > xPropertyAccess( xDialog, UNO_QUERY_THROW );
Sequence< PropertyValue > props( 2 );