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

fdo#46808, Convert awt::grid::DefaultGridColumnModel to new style

Browse Source 
Change-Id: Id1b63847e21954c689dfa3c549713dbf5b1858c3
This commit is contained in:
Noel Grandin
2013-06-06 16:02:46 +02:00
parent 670e2329df
commit 34e5e9c650
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
offapi/UnoApi_offapi.mk
View File

@@ -64,6 +64,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,\
UnoControlDialogModelProvider \ UnoControlDialogModelProvider \
)) ))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
DefaultGridColumnModel \
DefaultGridDataModel \ DefaultGridDataModel \
SortableGridDataModel \ SortableGridDataModel \
)) ))
@@ -579,7 +580,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt,\
UnoControlTimeFieldModel \ UnoControlTimeFieldModel \
)) ))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/awt/grid,\
DefaultGridColumnModel \
GridColumn \ GridColumn \
UnoControlGrid \ UnoControlGrid \
UnoControlGridModel \ UnoControlGridModel \

5
offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
View File

@@ -28,10 +28,7 @@
/** If you do not want to implement the XGridColumnModel yourself, use this service. /** If you do not want to implement the XGridColumnModel yourself, use this service.
@since OOo 3.3 @since OOo 3.3
*/ */
service DefaultGridColumnModel service DefaultGridColumnModel : com::sun::star::awt::grid::XGridColumnModel;
{
interface com::sun::star::awt::grid::XGridColumnModel;
};
}; }; }; };}; }; }; }; };};

4
toolkit/source/controls/grid/gridcontrol.cxx
View File

@@ -27,7 +27,7 @@
#include <com/sun/star/awt/grid/XMutableGridDataModel.hpp> #include <com/sun/star/awt/grid/XMutableGridDataModel.hpp>
#include <com/sun/star/awt/grid/DefaultGridDataModel.hpp> #include <com/sun/star/awt/grid/DefaultGridDataModel.hpp>
#include <com/sun/star/awt/grid/SortableGridDataModel.hpp> #include <com/sun/star/awt/grid/SortableGridDataModel.hpp>
#include <com/sun/star/awt/grid/XGridColumnModel.hpp> #include <com/sun/star/awt/grid/DefaultGridColumnModel.hpp>
#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/unopropertyarrayhelper.hxx>
#include <toolkit/helper/property.hxx> #include <toolkit/helper/property.hxx>
#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp>
@@ -61,7 +61,7 @@ namespace
Reference< XGridColumnModel > lcl_getDefaultColumnModel_throw( const Reference<XComponentContext> & i_context ) Reference< XGridColumnModel > lcl_getDefaultColumnModel_throw( const Reference<XComponentContext> & i_context )
{ {
Reference< XGridColumnModel > const xColumnModel( i_context->getServiceManager()->createInstanceWithContext( "com.sun.star.awt.grid.DefaultGridColumnModel", i_context ), UNO_QUERY_THROW ); Reference< XGridColumnModel > const xColumnModel = DefaultGridColumnModel::create( i_context );
return xColumnModel; return xColumnModel;
} }
} }