[Libreoffice-commits] core.git: 57 commits - avmedia/source basctl/source basic/source bridges/source bridges/test chart2/source cli_ure/source codemaker/source comphelper/source connectivity/source cppuhelper/source cppuhelper/test cppu/qa cui/source dbaccess/source desktop/source dtrans/source dtrans/test editeng/source embeddedobj/source extensions/source extensions/test filter/source forms/source fpicker/source framework/inc framework/source i18npool/source include/com include/comphelper include/cppu include/editeng include/svl include/svx include/toolkit include/ucbhelper io/test javaunohelper/source linguistic/source mysqlc/source odk/examples pyuno/source reportdesign/source sax/source sax/test sccomp/source sc/inc scripting/source sc/source sd/source sfx2/source sot/source starmath/source stoc/source stoc/test svl/source svtools/source svx/source sw/source test/source testtools/source toolkit/source ucbhelper/source ucb/source UnoControls/source unotools/source vbahelper/source vcl/osx vc l/unx winaccessibility/source xmlhelp/source xmloff/source xmlscript/source

Stephan Bergmann sbergman at redhat.com
Tue Mar 31 23:47:40 PDT 2015


 UnoControls/source/base/multiplexer.cxx                                         |    2 
 UnoControls/source/controls/framecontrol.cxx                                    |    2 
 avmedia/source/macavf/window.mm                                                 |   28 
 avmedia/source/quicktime/window.mm                                              |   28 
 avmedia/source/win/window.cxx                                                   |   28 
 basctl/source/basicide/basidectrlr.cxx                                          |    2 
 basctl/source/dlged/dlged.cxx                                                   |    4 
 basctl/source/dlged/dlgedfac.cxx                                                |    2 
 basic/source/classes/propacc.cxx                                                |    4 
 basic/source/classes/sbunoobj.cxx                                               |   12 
 basic/source/runtime/methods1.cxx                                               |    6 
 bridges/source/cpp_uno/gcc3_aix_powerpc/uno2cpp.cxx                             |    2 
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx                                  |    4 
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm.cxx                             |    2 
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-arm64.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_ios_arm/uno2cpp-i386.cxx                            |    2 
 bridges/source/cpp_uno/gcc3_linux_alpha/uno2cpp.cxx                             |    2 
 bridges/source/cpp_uno/gcc3_linux_arm/except.cxx                                |    4 
 bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx                               |    2 
 bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx                               |    4 
 bridges/source/cpp_uno/gcc3_linux_hppa/uno2cpp.cxx                              |    2 
 bridges/source/cpp_uno/gcc3_linux_ia64/uno2cpp.cxx                              |    2 
 bridges/source/cpp_uno/gcc3_linux_intel/except.cxx                              |    4 
 bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx                             |    2 
 bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx                               |    4 
 bridges/source/cpp_uno/gcc3_linux_m68k/uno2cpp.cxx                              |    2 
 bridges/source/cpp_uno/gcc3_linux_mips/except.cxx                               |    4 
 bridges/source/cpp_uno/gcc3_linux_mips/uno2cpp.cxx                              |    2 
 bridges/source/cpp_uno/gcc3_linux_powerpc/uno2cpp.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx                         |    2 
 bridges/source/cpp_uno/gcc3_linux_s390/uno2cpp.cxx                              |    2 
 bridges/source/cpp_uno/gcc3_linux_s390x/uno2cpp.cxx                             |    2 
 bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx                              |    4 
 bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx                             |    2 
 bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx                             |    4 
 bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx                            |    2 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx                            |    4 
 bridges/source/cpp_uno/gcc3_macosx_x86-64/uno2cpp.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx                            |    4 
 bridges/source/cpp_uno/gcc3_solaris_intel/uno2cpp.cxx                           |    2 
 bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx                            |    4 
 bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx                           |    2 
 bridges/source/cpp_uno/mingw_intel/except.cxx                                   |    4 
 bridges/source/cpp_uno/mingw_intel/uno2cpp.cxx                                  |    2 
 bridges/source/cpp_uno/mingw_x86-64/except.cxx                                  |    4 
 bridges/source/cpp_uno/mingw_x86-64/uno2cpp.cxx                                 |    2 
 bridges/source/cpp_uno/msvc_win32_intel/except.cxx                              |    4 
 bridges/source/cpp_uno/msvc_win32_intel/uno2cpp.cxx                             |    2 
 bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx                             |    4 
 bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx                            |    4 
 bridges/source/jni_uno/jni_info.cxx                                             |   13 
 bridges/source/jni_uno/jni_uno2java.cxx                                         |    4 
 bridges/test/java_uno/any/transport.cxx                                         |    6 
 bridges/test/java_uno/equals/testequals.cxx                                     |   13 
 bridges/test/testcomp.cxx                                                       |   13 
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx                        |   28 
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx               |   16 
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx             |    2 
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx                     |   72 +-
 chart2/source/controller/chartapiwrapper/TitleWrapper.cxx                       |    2 
 chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx |    2 
 chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx              |    2 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx         |    2 
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx         |    2 
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx            |    2 
 chart2/source/model/filter/XMLFilter.cxx                                        |    4 
 chart2/source/model/main/Axis.cxx                                               |   14 
 chart2/source/model/main/BaseCoordinateSystem.cxx                               |    2 
 chart2/source/model/main/ChartModel.cxx                                         |    8 
 chart2/source/model/main/DataPointProperties.cxx                                |    8 
 chart2/source/model/main/DataSeriesProperties.cxx                               |    4 
 chart2/source/model/main/Diagram.cxx                                            |   18 
 chart2/source/model/main/GridProperties.cxx                                     |    2 
 chart2/source/model/main/Legend.cxx                                             |    2 
 chart2/source/model/main/Title.cxx                                              |    4 
 chart2/source/model/template/CandleStickChartType.cxx                           |    6 
 chart2/source/model/template/ColumnChartType.cxx                                |    4 
 chart2/source/model/template/GL3DBarChartType.cxx                               |    2 
 chart2/source/model/template/GL3DBarChartTypeTemplate.cxx                       |    2 
 chart2/source/model/template/PieChartType.cxx                                   |    2 
 chart2/source/model/template/PieChartTypeTemplate.cxx                           |    2 
 chart2/source/model/template/StockChartTypeTemplate.cxx                         |    8 
 chart2/source/tools/CachedDataSequence.cxx                                      |    4 
 chart2/source/tools/CharacterProperties.cxx                                     |   14 
 chart2/source/tools/DataSourceHelper.cxx                                        |    2 
 chart2/source/tools/ErrorBar.cxx                                                |    4 
 chart2/source/tools/ModifyListenerHelper.cxx                                    |    4 
 chart2/source/tools/OPropertySet.cxx                                            |    2 
 chart2/source/tools/RangeHighlighter.cxx                                        |    4 
 chart2/source/tools/RegressionCurveModel.cxx                                    |    2 
 chart2/source/tools/RegressionEquation.cxx                                      |    4 
 chart2/source/tools/SceneProperties.cxx                                         |   18 
 chart2/source/tools/UncachedDataSequence.cxx                                    |    8 
 chart2/source/view/main/ChartView.cxx                                           |    4 
 chart2/source/view/main/DummyXShape.cxx                                         |    4 
 cli_ure/source/native/native_share.h                                            |    4 
 cli_ure/source/uno_bridge/cli_proxy.cxx                                         |    4 
 codemaker/source/cppumaker/cpputype.cxx                                         |   14 
 comphelper/source/container/IndexedPropertyValuesContainer.cxx                  |    2 
 comphelper/source/container/NamedPropertyValuesContainer.cxx                    |    2 
 comphelper/source/misc/proxyaggregation.cxx                                     |    2 
 comphelper/source/misc/types.cxx                                                |    2 
 connectivity/source/commontools/parameters.cxx                                  |    4 
 connectivity/source/drivers/ado/AColumn.cxx                                     |    2 
 connectivity/source/drivers/ado/AResultSet.cxx                                  |    4 
 connectivity/source/drivers/ado/AStatement.cxx                                  |    4 
 connectivity/source/drivers/ado/Aolevariant.cxx                                 |    4 
 connectivity/source/drivers/calc/CResultSet.cxx                                 |    2 
 connectivity/source/drivers/dbase/DResultSet.cxx                                |    2 
 connectivity/source/drivers/evoab2/NResultSet.cxx                               |    2 
 connectivity/source/drivers/evoab2/NStatement.cxx                               |    2 
 connectivity/source/drivers/file/FStatement.cxx                                 |    2 
 connectivity/source/drivers/firebird/ResultSet.cxx                              |   10 
 connectivity/source/drivers/firebird/StatementCommonBase.cxx                    |    4 
 connectivity/source/drivers/firebird/Table.cxx                                  |    2 
 connectivity/source/drivers/flat/EResultSet.cxx                                 |    2 
 connectivity/source/drivers/hsqldb/HColumns.cxx                                 |    2 
 connectivity/source/drivers/hsqldb/HTable.cxx                                   |    2 
 connectivity/source/drivers/jdbc/JStatement.cxx                                 |    4 
 connectivity/source/drivers/kab/KResultSet.cxx                                  |    2 
 connectivity/source/drivers/kab/KStatement.cxx                                  |    4 
 connectivity/source/drivers/macab/MacabResultSet.cxx                            |    2 
 connectivity/source/drivers/macab/MacabStatement.cxx                            |    4 
 connectivity/source/drivers/mork/MResultSet.cxx                                 |    2 
 connectivity/source/drivers/mork/MStatement.cxx                                 |    2 
 connectivity/source/drivers/mozab/MResultSet.cxx                                |    2 
 connectivity/source/drivers/mozab/MStatement.cxx                                |    2 
 connectivity/source/drivers/mysql/YColumns.cxx                                  |    2 
 connectivity/source/drivers/mysql/YTable.cxx                                    |    2 
 connectivity/source/drivers/odbc/OResultSet.cxx                                 |    2 
 connectivity/source/drivers/odbc/OStatement.cxx                                 |    4 
 connectivity/source/drivers/postgresql/pq_baseresultset.cxx                     |   18 
 connectivity/source/drivers/postgresql/pq_connection.cxx                        |    4 
 connectivity/source/drivers/postgresql/pq_databasemetadata.cxx                  |    2 
 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx                 |    2 
 connectivity/source/drivers/postgresql/pq_resultset.cxx                         |    4 
 connectivity/source/drivers/postgresql/pq_statement.cxx                         |    2 
 connectivity/source/drivers/postgresql/pq_statics.cxx                           |    4 
 connectivity/source/drivers/postgresql/pq_tools.cxx                             |    2 
 connectivity/source/drivers/postgresql/pq_updateableresultset.hxx               |    4 
 connectivity/source/drivers/postgresql/pq_xcolumns.cxx                          |    4 
 connectivity/source/drivers/postgresql/pq_xcontainer.cxx                        |    8 
 connectivity/source/drivers/postgresql/pq_xcontainer.hxx                        |    4 
 connectivity/source/drivers/postgresql/pq_xindexes.cxx                          |    6 
 connectivity/source/parse/PColumn.cxx                                           |   14 
 connectivity/source/sdbcx/VColumn.cxx                                           |   26 
 connectivity/source/sdbcx/VIndex.cxx                                            |    6 
 connectivity/source/sdbcx/VIndexColumn.cxx                                      |    2 
 cppu/qa/test_any.cxx                                                            |  160 ++---
 cppu/qa/test_reference.cxx                                                      |    4 
 cppu/qa/test_unotype.cxx                                                        |  208 -------
 cppuhelper/source/access_control.cxx                                            |    6 
 cppuhelper/source/component.cxx                                                 |   16 
 cppuhelper/source/component_context.cxx                                         |    6 
 cppuhelper/source/exc_thrower.cxx                                               |   12 
 cppuhelper/source/factory.cxx                                                   |   21 
 cppuhelper/source/implbase.cxx                                                  |   12 
 cppuhelper/source/implbase_ex.cxx                                               |   16 
 cppuhelper/source/macro_expander.cxx                                            |    2 
 cppuhelper/source/propshlp.cxx                                                  |   10 
 cppuhelper/source/tdmgr.cxx                                                     |    2 
 cppuhelper/test/testpropshlp.cxx                                                |   50 -
 cui/source/dialogs/scriptdlg.cxx                                                |    4 
 cui/source/options/connpoolconfig.cxx                                           |    4 
 cui/source/options/optasian.cxx                                                 |    2 
 dbaccess/source/core/api/CRowSetDataColumn.cxx                                  |    2 
 dbaccess/source/core/api/RowSet.cxx                                             |   22 
 dbaccess/source/core/api/RowSetBase.cxx                                         |    6 
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx                          |    2 
 dbaccess/source/core/api/column.cxx                                             |    2 
 dbaccess/source/core/api/columnsettings.cxx                                     |    4 
 dbaccess/source/core/api/datasettings.cxx                                       |   52 -
 dbaccess/source/core/api/definitioncolumn.cxx                                   |   32 -
 dbaccess/source/core/api/query.cxx                                              |   14 
 dbaccess/source/core/api/querydescriptor.cxx                                    |   14 
 dbaccess/source/core/api/resultcolumn.cxx                                       |    4 
 dbaccess/source/core/api/resultset.cxx                                          |    2 
 dbaccess/source/core/dataaccess/ComponentDefinition.cxx                         |    6 
 dbaccess/source/core/dataaccess/ContentHelper.cxx                               |    4 
 dbaccess/source/core/dataaccess/ModelImpl.cxx                                   |    2 
 dbaccess/source/core/dataaccess/commanddefinition.cxx                           |   12 
 dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx                        |    2 
 dbaccess/source/core/dataaccess/documentcontainer.cxx                           |    2 
 dbaccess/source/core/dataaccess/documentdefinition.cxx                          |    6 
 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx                             |    6 
 dbaccess/source/inc/apitools.hxx                                                |   22 
 dbaccess/source/ui/browser/brwctrlr.cxx                                         |    2 
 dbaccess/source/ui/browser/exsrcbrw.cxx                                         |    2 
 dbaccess/source/ui/browser/sbagrid.cxx                                          |    4 
 dbaccess/source/ui/querydesign/querycontroller.cxx                              |    4 
 dbaccess/source/ui/uno/ColumnModel.cxx                                          |   12 
 dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx                                    |    4 
 dbaccess/source/ui/uno/composerdialogs.cxx                                      |    4 
 dbaccess/source/ui/uno/unosqlmessage.cxx                                        |    2 
 desktop/source/deployment/manager/dp_extensionmanager.cxx                       |    4 
 desktop/source/deployment/manager/dp_manager.cxx                                |    4 
 desktop/source/deployment/registry/dp_backend.cxx                               |    4 
 dtrans/source/test/test_dtrans.cxx                                              |    2 
 dtrans/source/win32/clipb/WinClipboard.cxx                                      |    4 
 dtrans/source/win32/dnd/sourcecontext.cxx                                       |    2 
 dtrans/source/win32/dnd/target.cxx                                              |    4 
 dtrans/source/win32/dtobj/DOTransferable.cxx                                    |    2 
 dtrans/source/win32/dtobj/DataFmtTransl.cxx                                     |    2 
 dtrans/source/win32/dtobj/XTDataObject.cxx                                      |    2 
 dtrans/source/win32/ftransl/ftransl.cxx                                         |    4 
 dtrans/source/win32/workbench/test_wincb.cxx                                    |    2 
 dtrans/test/win32/dnd/targetlistener.cxx                                        |    2 
 dtrans/test/win32/dnd/transferable.cxx                                          |    2 
 editeng/source/items/frmitems.cxx                                               |    6 
 editeng/source/items/paraitem.cxx                                               |    2 
 editeng/source/misc/acorrcfg.cxx                                                |    4 
 editeng/source/uno/unofield.cxx                                                 |   14 
 editeng/source/uno/unonrule.cxx                                                 |    2 
 editeng/source/uno/unotext.cxx                                                  |    2 
 editeng/source/uno/unotext2.cxx                                                 |    2 
 editeng/source/xml/xmltxtexp.cxx                                                |    2 
 embeddedobj/source/commonembedding/visobj.cxx                                   |    2 
 embeddedobj/source/msole/olecomponent.cxx                                       |   14 
 embeddedobj/source/msole/olevisual.cxx                                          |    6 
 embeddedobj/source/msole/xdialogcreator.cxx                                     |    2 
 extensions/source/abpilot/unodialogabp.cxx                                      |    2 
 extensions/source/bibliography/bibconfig.cxx                                    |    2 
 extensions/source/bibliography/bibload.cxx                                      |    8 
 extensions/source/bibliography/datman.cxx                                       |    2 
 extensions/source/bibliography/framectr.cxx                                     |    4 
 extensions/source/bibliography/general.cxx                                      |    8 
 extensions/source/bibliography/toolbar.cxx                                      |    6 
 extensions/source/ole/servprov.cxx                                              |    4 
 extensions/source/ole/unoconversionutilities.hxx                                |   14 
 extensions/source/propctrlr/controlfontdialog.cxx                               |    2 
 extensions/source/propctrlr/eventhandler.cxx                                    |    2 
 extensions/source/propctrlr/formcomponenthandler.cxx                            |    2 
 extensions/source/propctrlr/inspectormodelbase.cxx                              |    8 
 extensions/source/propctrlr/pcrunodialogs.cxx                                   |    4 
 extensions/source/propctrlr/standardcontrol.cxx                                 |    2 
 extensions/source/resource/ResourceIndexAccess.cxx                              |    2 
 extensions/test/ole/OleClient/clientTest.cxx                                    |    2 
 extensions/test/ole/OleClient/funcs.cxx                                         |    2 
 filter/source/config/cache/basecontainer.cxx                                    |    2 
 filter/source/msfilter/escherex.cxx                                             |    6 
 forms/source/component/DatabaseForm.cxx                                         |    2 
 forms/source/component/Edit.cxx                                                 |    2 
 forms/source/component/File.cxx                                                 |    2 
 forms/source/component/FormComponent.cxx                                        |    4 
 forms/source/component/Grid.cxx                                                 |    2 
 forms/source/component/ListBox.cxx                                              |    8 
 forms/source/component/formcontrolfont.cxx                                      |    2 
 forms/source/component/navigationbar.cxx                                        |    2 
 forms/source/inc/property.hxx                                                   |   16 
 forms/source/xforms/NameContainer.hxx                                           |    2 
 forms/source/xforms/collection.hxx                                              |    2 
 forms/source/xforms/convert.cxx                                                 |    2 
 forms/source/xforms/datatypes.cxx                                               |   10 
 forms/source/xforms/datatypes.hxx                                               |    2 
 forms/source/xforms/propertysetbase.hxx                                         |    2 
 fpicker/source/office/commonpicker.cxx                                          |    4 
 fpicker/source/win32/filepicker/FilePicker.cxx                                  |    4 
 fpicker/source/win32/filepicker/previewbase.cxx                                 |    2 
 fpicker/source/win32/misc/WinImplHelper.cxx                                     |    2 
 framework/inc/macros/xtypeprovider.hxx                                          |   24 
 framework/inc/uielement/constitemcontainer.hxx                                  |    2 
 framework/inc/uielement/itemcontainer.hxx                                       |    2 
 framework/inc/uielement/rootitemcontainer.hxx                                   |    2 
 framework/source/layoutmanager/layoutmanager.cxx                                |   12 
 framework/source/recording/dispatchrecorder.cxx                                 |    4 
 framework/source/services/autorecovery.cxx                                      |    6 
 framework/source/services/desktop.cxx                                           |    4 
 framework/source/services/frame.cxx                                             |    2 
 framework/source/services/modulemanager.cxx                                     |    2 
 framework/source/services/pathsettings.cxx                                      |    4 
 framework/source/uiconfiguration/windowstateconfiguration.cxx                   |    2 
 framework/source/uielement/uicommanddescription.cxx                             |    2 
 i18npool/source/localedata/localedata.cxx                                       |    2 
 include/com/sun/star/uno/Any.h                                                  |    4 
 include/com/sun/star/uno/Any.hxx                                                |    6 
 include/com/sun/star/uno/Sequence.h                                             |   14 
 include/com/sun/star/uno/Sequence.hxx                                           |    2 
 include/com/sun/star/uno/Type.h                                                 |   82 ++
 include/comphelper/property.hxx                                                 |    4 
 include/comphelper/types.hxx                                                    |    4 
 include/cppu/unotype.hxx                                                        |   13 
 include/editeng/unotext.hxx                                                     |   50 -
 include/svl/poolitem.hxx                                                        |    4 
 include/svx/unoshprp.hxx                                                        |  150 ++---
 include/toolkit/helper/macros.hxx                                               |    2 
 include/ucbhelper/macros.hxx                                                    |    4 
 io/test/stm/datatest.cxx                                                        |   12 
 javaunohelper/source/bootstrap.cxx                                              |    2 
 linguistic/source/lngopt.cxx                                                    |   26 
 mysqlc/source/mysqlc_resultset.cxx                                              |    2 
 mysqlc/source/mysqlc_statement.cxx                                              |    4 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx             |    2 
 odk/examples/DevelopersGuide/Database/DriverSkeleton/SStatement.cxx             |    4 
 pyuno/source/module/pyuno_adapter.cxx                                           |    6 
 pyuno/source/module/pyuno_callable.cxx                                          |    6 
 pyuno/source/module/pyuno_runtime.cxx                                           |   12 
 reportdesign/source/core/api/ReportDefinition.cxx                               |   26 
 reportdesign/source/filter/xml/xmlControlProperty.cxx                           |    6 
 reportdesign/source/filter/xml/xmlHelper.cxx                                    |   32 -
 sax/source/expatwrap/sax_expat.cxx                                              |    2 
 sax/source/fastparser/fastparser.cxx                                            |    2 
 sax/test/sax/testsax.cxx                                                        |    4 
 sc/inc/miscuno.hxx                                                              |    4 
 sc/inc/rangeseq.hxx                                                             |    2 
 sc/source/core/data/dpsave.cxx                                                  |    2 
 sc/source/core/data/dptabsrc.cxx                                                |   26 
 sc/source/core/data/validat.cxx                                                 |    2 
 sc/source/core/tool/addincol.cxx                                                |   26 
 sc/source/core/tool/token.cxx                                                   |    4 
 sc/source/filter/xml/XMLCodeNameProvider.cxx                                    |    2 
 sc/source/filter/xml/xmlwrap.cxx                                                |   14 
 sc/source/ui/app/transobj.cxx                                                   |    2 
 sc/source/ui/unoobj/afmtuno.cxx                                                 |   22 
 sc/source/ui/unoobj/appluno.cxx                                                 |   28 
 sc/source/ui/unoobj/celllistsource.cxx                                          |    2 
 sc/source/ui/unoobj/cellsuno.cxx                                                |  228 ++++----
 sc/source/ui/unoobj/cellvaluebinding.cxx                                        |    2 
 sc/source/ui/unoobj/chart2uno.cxx                                               |    8 
 sc/source/ui/unoobj/chartuno.cxx                                                |    2 
 sc/source/ui/unoobj/condformatuno.cxx                                           |   22 
 sc/source/ui/unoobj/confuno.cxx                                                 |   42 -
 sc/source/ui/unoobj/dapiuno.cxx                                                 |   38 -
 sc/source/ui/unoobj/datauno.cxx                                                 |   44 -
 sc/source/ui/unoobj/docuno.cxx                                                  |   58 +-
 sc/source/ui/unoobj/eventuno.cxx                                                |    2 
 sc/source/ui/unoobj/fielduno.cxx                                                |   10 
 sc/source/ui/unoobj/fmtuno.cxx                                                  |    6 
 sc/source/ui/unoobj/funcuno.cxx                                                 |   10 
 sc/source/ui/unoobj/miscuno.cxx                                                 |    2 
 sc/source/ui/unoobj/nameuno.cxx                                                 |    4 
 sc/source/ui/unoobj/optuno.cxx                                                  |   14 
 sc/source/ui/unoobj/shapeuno.cxx                                                |    2 
 sc/source/ui/unoobj/srchuno.cxx                                                 |   16 
 sc/source/ui/unoobj/styleuno.cxx                                                |  120 ++--
 sc/source/ui/unoobj/tokenuno.cxx                                                |   10 
 sc/source/ui/unoobj/viewuno.cxx                                                 |   40 -
 sc/source/ui/vba/vbarange.cxx                                                   |    6 
 sc/source/ui/vba/vbaworksheets.cxx                                              |    2 
 sc/source/ui/vba/vbawsfunction.cxx                                              |   10 
 sccomp/source/solver/SolverComponent.cxx                                        |   10 
 scripting/source/basprov/basmethnode.cxx                                        |    4 
 scripting/source/basprov/basscript.cxx                                          |    4 
 scripting/source/vbaevents/eventhelper.cxx                                      |    2 
 sd/source/core/stlsheet.cxx                                                     |    6 
 sd/source/filter/xml/sdxmlwrp.cxx                                               |   10 
 sd/source/ui/func/fusel.cxx                                                     |    2 
 sd/source/ui/slideshow/slideshow.cxx                                            |   22 
 sd/source/ui/unoidl/DrawController.cxx                                          |    4 
 sd/source/ui/unoidl/UnoDocumentSettings.cxx                                     |   48 -
 sd/source/ui/unoidl/unohelp.hxx                                                 |    2 
 sd/source/ui/unoidl/unolayer.cxx                                                |    6 
 sd/source/ui/unoidl/unomodel.cxx                                                |    8 
 sd/source/ui/unoidl/unoobj.cxx                                                  |   18 
 sd/source/ui/unoidl/unopage.cxx                                                 |   56 -
 sd/source/ui/unoidl/unosrch.cxx                                                 |    6 
 sfx2/source/control/bindings.cxx                                                |    2 
 sfx2/source/control/querystatus.cxx                                             |    2 
 sfx2/source/dialog/templateinfodlg.cxx                                          |    6 
 sfx2/source/doc/iframe.cxx                                                      |    8 
 sfx2/source/doc/oleprops.cxx                                                    |    2 
 sfx2/source/doc/plugin.cxx                                                      |    2 
 sfx2/source/doc/sfxbasemodel.cxx                                                |   50 -
 sfx2/source/notify/eventsupplier.cxx                                            |    2 
 sfx2/source/sidebar/Theme.cxx                                                   |    4 
 sfx2/source/statbar/stbitem.cxx                                                 |    4 
 sfx2/source/toolbox/tbxitem.cxx                                                 |    8 
 sot/source/base/exchange.cxx                                                    |  284 +++++-----
 starmath/source/mathmlexport.cxx                                                |    6 
 starmath/source/mathmlimport.cxx                                                |    2 
 starmath/source/unomodel.cxx                                                    |   52 -
 stoc/source/defaultregistry/defaultregistry.cxx                                 |    2 
 stoc/source/implementationregistration/implreg.cxx                              |    4 
 stoc/source/invocation_adapterfactory/iafactory.cxx                             |   12 
 stoc/source/proxy_factory/proxyfac.cxx                                          |    8 
 stoc/source/servicemanager/servicemanager.cxx                                   |    6 
 stoc/source/typeconv/convert.cxx                                                |   10 
 stoc/test/testconv.cxx                                                          |   14 
 stoc/test/testcorefl.cxx                                                        |   20 
 stoc/test/testiadapter.cxx                                                      |   18 
 svl/source/config/cjkoptions.cxx                                                |    2 
 svl/source/config/ctloptions.cxx                                                |    2 
 svl/source/items/globalnameitem.cxx                                             |    2 
 svl/source/items/ilstitem.cxx                                                   |    2 
 svl/source/numbers/numfmuno.cxx                                                 |   28 
 svtools/source/config/apearcfg.cxx                                              |    2 
 svtools/source/config/colorcfg.cxx                                              |    2 
 svtools/source/config/fontsubstconfig.cxx                                       |    4 
 svtools/source/config/htmlcfg.cxx                                               |    2 
 svtools/source/uno/addrtempuno.cxx                                              |    2 
 svtools/source/uno/genericunodialog.cxx                                         |    4 
 svtools/source/uno/popupmenucontrollerbase.cxx                                  |    4 
 svtools/source/uno/toolboxcontroller.cxx                                        |    4 
 svtools/source/uno/treecontrolpeer.cxx                                          |    2 
 svtools/source/uno/unoevent.cxx                                                 |    2 
 svtools/source/uno/unoimap.cxx                                                  |    8 
 svx/source/dialog/rubydialog.cxx                                                |    2 
 svx/source/form/dataaccessdescriptor.cxx                                        |    6 
 svx/source/form/fmshimp.cxx                                                     |   10 
 svx/source/form/fmsrccfg.cxx                                                    |    2 
 svx/source/form/fmsrcimp.cxx                                                    |    2 
 svx/source/form/formcontroller.cxx                                              |    4 
 svx/source/form/xfm_addcondition.cxx                                            |    8 
 svx/source/items/customshapeitem.cxx                                            |   14 
 svx/source/table/cell.cxx                                                       |    4 
 svx/source/table/tablecolumn.cxx                                                |    8 
 svx/source/table/tablerow.cxx                                                   |    8 
 svx/source/unodraw/unomod.cxx                                                   |    2 
 svx/source/unodraw/unomtabl.cxx                                                 |    2 
 svx/source/unodraw/unopage.cxx                                                  |    6 
 svx/source/unodraw/unoprov.cxx                                                  |   81 +-
 svx/source/unodraw/unoshap2.cxx                                                 |   10 
 svx/source/unodraw/unoshap3.cxx                                                 |    2 
 svx/source/unodraw/unoshape.cxx                                                 |    4 
 svx/source/unodraw/unoshcol.cxx                                                 |    4 
 svx/source/xoutdev/xattr.cxx                                                    |    8 
 sw/source/core/doc/docbasic.cxx                                                 |    2 
 sw/source/core/fields/docufld.cxx                                               |    4 
 sw/source/core/txtnode/fmtatr2.cxx                                              |    2 
 sw/source/core/unocore/unocrsrhelper.cxx                                        |    2 
 sw/source/core/unocore/unofield.cxx                                             |    6 
 sw/source/core/unocore/unoframe.cxx                                             |   10 
 sw/source/core/unocore/unoftn.cxx                                               |    2 
 sw/source/core/unocore/unoidx.cxx                                               |    6 
 sw/source/core/unocore/unoobj.cxx                                               |   14 
 sw/source/core/unocore/unoparagraph.cxx                                         |    4 
 sw/source/core/unocore/unosett.cxx                                              |   24 
 sw/source/core/unocore/unosrch.cxx                                              |    2 
 sw/source/core/unocore/unostyle.cxx                                             |    4 
 sw/source/core/unocore/unotbl.cxx                                               |    4 
 sw/source/core/unocore/unotext.cxx                                              |    6 
 sw/source/filter/html/htmlform.cxx                                              |   12 
 sw/source/filter/html/htmlforw.cxx                                              |   20 
 sw/source/filter/xml/swxml.cxx                                                  |   20 
 sw/source/filter/xml/wrtxml.cxx                                                 |   16 
 sw/source/filter/xml/xmlexp.cxx                                                 |    2 
 sw/source/filter/xml/xmlimp.cxx                                                 |    6 
 sw/source/ui/dbui/addresslistdialog.cxx                                         |    2 
 sw/source/ui/index/cntex.cxx                                                    |    4 
 sw/source/uibase/app/docsh2.cxx                                                 |    4 
 sw/source/uibase/dbui/mailmergehelper.cxx                                       |    2 
 sw/source/uibase/uiview/view2.cxx                                               |    4 
 sw/source/uibase/uno/unotxdoc.cxx                                               |    8 
 sw/source/uibase/uno/unotxvw.cxx                                                |    2 
 sw/source/uibase/utlui/unotools.cxx                                             |    2 
 test/source/beans/xpropertyset.cxx                                              |   18 
 testtools/source/bridgetest/bridgetest.cxx                                      |   34 -
 testtools/source/performance/ubobject.cxx                                       |   10 
 testtools/source/performance/ubtest.cxx                                         |   20 
 toolkit/source/awt/vclxprinter.cxx                                              |    2 
 toolkit/source/controls/geometrycontrolmodel.cxx                                |   22 
 toolkit/source/controls/roadmapentry.cxx                                        |    8 
 toolkit/source/controls/unocontrol.cxx                                          |    4 
 toolkit/source/controls/unocontrolmodel.cxx                                     |    2 
 toolkit/source/helper/property.cxx                                              |   10 
 ucb/source/cacher/cachedcontentresultset.cxx                                    |    3 
 ucb/source/core/ucbcmds.cxx                                                     |    2 
 ucb/source/core/ucbprops.cxx                                                    |   46 -
 ucb/source/sorter/sortresult.cxx                                                |    2 
 ucb/source/ucp/cmis/cmis_content.cxx                                            |   36 -
 ucb/source/ucp/cmis/cmis_repo_content.cxx                                       |   14 
 ucb/source/ucp/ext/ucpext_content.cxx                                           |   18 
 ucb/source/ucp/file/filrow.cxx                                                  |    2 
 ucb/source/ucp/file/shell.cxx                                                   |   10 
 ucb/source/ucp/ftp/ftpcontentcaps.cxx                                           |   21 
 ucb/source/ucp/ftp/ftpcontentidentifier.cxx                                     |    6 
 ucb/source/ucp/gio/gio_content.cxx                                              |   26 
 ucb/source/ucp/gvfs/gvfs_content.cxx                                            |   24 
 ucb/source/ucp/hierarchy/hierarchycontent.cxx                                   |    6 
 ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx                               |  109 +--
 ucb/source/ucp/hierarchy/hierarchydatasource.cxx                                |    2 
 ucb/source/ucp/package/pkgcontent.cxx                                           |   13 
 ucb/source/ucp/package/pkgcontentcaps.cxx                                       |   74 +-
 ucb/source/ucp/tdoc/tdoc_content.cxx                                            |    6 
 ucb/source/ucp/tdoc/tdoc_contentcaps.cxx                                        |   93 +--
 ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx                                    |    6 
 ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx                             |    8 
 ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx                                |   35 -
 ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx                                  |    8 
 ucb/source/ucp/webdav/webdavcontentcaps.cxx                                     |   30 -
 ucbhelper/source/provider/propertyvalueset.cxx                                  |    4 
 ucbhelper/source/provider/resultset.cxx                                         |    2 
 ucbhelper/source/provider/resultsetmetadata.cxx                                 |    6 
 unotools/source/config/configitem.cxx                                           |    2 
 unotools/source/config/eventcfg.cxx                                             |    2 
 unotools/source/config/fltrcfg.cxx                                              |    4 
 unotools/source/config/lingucfg.cxx                                             |    2 
 unotools/source/config/misccfg.cxx                                              |    2 
 unotools/source/config/saveopt.cxx                                              |    2 
 vbahelper/source/vbahelper/vbashapes.cxx                                        |    2 
 vcl/osx/DataFlavorMapping.cxx                                                   |    8 
 vcl/osx/DropTarget.cxx                                                          |    4 
 vcl/osx/OSXTransferable.cxx                                                     |    2 
 vcl/unx/generic/dtrans/X11_selection.cxx                                        |    8 
 vcl/unx/generic/dtrans/X11_transferable.cxx                                     |    2 
 winaccessibility/source/UAccCOM/AccEditableText.cxx                             |    2 
 winaccessibility/source/UAccCOM/MAccessible.cxx                                 |    4 
 winaccessibility/source/service/AccObject.cxx                                   |    2 
 xmlhelp/source/cxxhelp/inc/tvread.hxx                                           |    2 
 xmlhelp/source/cxxhelp/provider/contentcaps.cxx                                 |   26 
 xmloff/source/core/SettingsExportHelper.cxx                                     |   10 
 xmloff/source/core/xmlexp.cxx                                                   |    2 
 xmloff/source/core/xmlimp.cxx                                                   |    2 
 xmloff/source/forms/elementimport.cxx                                           |    4 
 xmloff/source/forms/formattributes.cxx                                          |    2 
 xmloff/source/forms/propertyexport.hxx                                          |    2 
 xmloff/source/forms/propertyimport.cxx                                          |    6 
 xmloff/source/style/PageMasterImportPropMapper.cxx                              |    8 
 xmloff/source/style/PageMasterPropHdlFactory.cxx                                |    6 
 xmloff/source/style/xmlnumi.cxx                                                 |    2 
 xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx                    |    2 
 xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx                        |   16 
 xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx                 |    6 
 xmloff/source/text/XMLIndexObjectSourceContext.cxx                              |   10 
 xmloff/source/text/XMLIndexSourceBaseContext.cxx                                |    4 
 xmloff/source/text/XMLIndexTOCContext.cxx                                       |    2 
 xmloff/source/text/XMLIndexTOCSourceContext.cxx                                 |    6 
 xmloff/source/text/XMLIndexTabStopEntryContext.cxx                              |    4 
 xmloff/source/text/XMLIndexTableSourceContext.cxx                               |    2 
 xmloff/source/text/XMLIndexUserSourceContext.cxx                                |   14 
 xmloff/source/text/XMLLineNumberingImportContext.cxx                            |    8 
 xmloff/source/text/XMLSectionFootnoteConfigImport.cxx                           |    6 
 xmloff/source/text/XMLSectionImportContext.cxx                                  |    6 
 xmloff/source/text/XMLSectionSourceDDEImportContext.cxx                         |    2 
 xmloff/source/text/XMLTextColumnsContext.cxx                                    |    2 
 xmloff/source/text/XMLTextFrameContext.cxx                                      |   10 
 xmloff/source/text/XMLTextHeaderFooterContext.cxx                               |   10 
 xmloff/source/text/XMLTextShapeStyleContext.cxx                                 |    2 
 xmloff/source/text/txtdropi.cxx                                                 |    2 
 xmloff/source/text/txtfldi.cxx                                                  |   34 -
 xmloff/source/text/txtparae.cxx                                                 |    2 
 xmloff/source/text/txtprhdl.cxx                                                 |   14 
 xmloff/source/text/txtstyli.cxx                                                 |    2 
 xmloff/source/text/txtvfldi.cxx                                                 |   16 
 xmlscript/source/inc/misc.hxx                                                   |    2 
 534 files changed, 2633 insertions(+), 2835 deletions(-)

New commits:
commit 99661d3f5f902a004883a4be21649245de68a2fa
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:56 2015 +0200

    Deprecate getCppuType et al in favor of cppu::UnoType
    
    ...which doesn't suffer from the sal_uInt16 vs. sal_Unicode ambiguity.
    
    Change-Id: I4de265145e720615652e88b6a68e03903ad8cba2

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index d8e3ea7..0b3e9fd 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -357,7 +357,7 @@ void CppuType::dumpGetCppuTypePostamble(FileStream & out) {
         }
     }
     dumpTemplateHead(out);
-    out << ("inline ::css::uno::Type const & SAL_CALL"
+    out << ("SAL_DEPRECATED(\"use cppu::UnoType\") inline ::css::uno::Type const & SAL_CALL"
             " getCppuType(SAL_UNUSED_PARAMETER ");
     dumpType(out, name_);
     dumpTemplateParameters(out);
@@ -560,7 +560,7 @@ void CppuType::dumpHFileContent(
     }
     out << "\n";
     dumpTemplateHead(out);
-    out << "inline ::css::uno::Type const & SAL_CALL getCppuType(";
+    out << "SAL_DEPRECATED(\"use cppu::UnoType\") inline ::css::uno::Type const & SAL_CALL getCppuType(";
     dumpType(out, name_, true);
     dumpTemplateParameters(out);
     out << " *);\n\n#endif\n";
@@ -569,7 +569,7 @@ void CppuType::dumpHFileContent(
 void CppuType::dumpGetCppuType(FileStream & out) {
     if (name_ == "com.sun.star.uno.XInterface") {
         out << indent()
-            << ("inline ::css::uno::Type const & SAL_CALL"
+            << ("SAL_DEPRECATED(\"use cppu::UnoType\") inline ::css::uno::Type const & SAL_CALL"
                 " getCppuType(SAL_UNUSED_PARAMETER ");
         dumpType(out, name_, true);
         out << " *) {\n";
@@ -581,7 +581,7 @@ void CppuType::dumpGetCppuType(FileStream & out) {
         out << indent() << "}\n";
     } else if (name_ == "com.sun.star.uno.Exception") {
         out << indent()
-            << ("inline ::css::uno::Type const & SAL_CALL"
+            << ("SAL_DEPRECATED(\"use cppu::UnoType\") inline ::css::uno::Type const & SAL_CALL"
                 " getCppuType(SAL_UNUSED_PARAMETER ");
         dumpType(out, name_, true);
         out << " *) {\n";
@@ -1110,9 +1110,9 @@ void InterfaceType::dumpHxxFile(
         << codemaker::cpp::scopedCppName(u2b(name_))
         << "::static_type(SAL_UNUSED_PARAMETER void *) {\n";
     inc();
-    out << indent() << "return ::getCppuType(static_cast< ";
-    dumpType(out, name_);
-    out << " * >(0));\n";
+    out << indent() << "return ::cppu::UnoType< ";
+    dumpType(out, name_, false, false, true);
+    out << " >::get();\n";
     dec();
     out << "}\n\n#endif // "<< headerDefine << "\n";
 }
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index ea69ec7..3ab2a44 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -376,7 +376,11 @@ inline bool SAL_CALL operator == ( const Any & rAny, const BaseReference & value
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type any
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( SAL_UNUSED_PARAMETER const ::com::sun::star::uno::Any * )
 {
     return ::cppu::UnoType< ::com::sun::star::uno::Any >::get();
diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h
index b52894d..6b82410 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -281,8 +281,11 @@ inline ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL toUnoSequence(
 
     @tparam E element type of sequence
     @return type of IDL sequence
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
-template< class E >
+template< class E > SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type &
 SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * );
 
@@ -295,8 +298,11 @@ SAL_CALL getCppuType( const ::com::sun::star::uno::Sequence< E > * );
     @tparam E element type of sequence
     @param rElementType element type of sequence
     @return type of IDL sequence
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
-template< class E >
+template< class E > SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type &
 SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType );
 
@@ -306,7 +312,11 @@ SAL_CALL getCppuSequenceType( const ::com::sun::star::uno::Type & rElementType )
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL sequence< char >
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type &
 SAL_CALL getCharSequenceCppuType();
 
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index c1d0590..23c5527 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -210,28 +210,48 @@ public:
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type "type"
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::com::sun::star::uno::Type * );
 
 /** Gets the meta type of IDL type void.
     @return type of IDL type void
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuVoidType();
 /** Gets the meta type of IDL type void.
 
     @return type of IDL type void
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getVoidCppuType();
 
 /** Gets the meta type of IDL type boolean.
 
     @return type of IDL type boolean
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuBooleanType();
 /** Gets the meta type of IDL type boolean.
 
     @return type of IDL type boolean
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType();
 /** Gets the meta type of IDL type boolean.
 
@@ -241,7 +261,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getBooleanCppuType();
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type boolean
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool * );
 /** Gets the meta type of IDL type boolean.
 
@@ -251,19 +275,31 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Bool
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type boolean
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType(
     bool const * );
 
 /** Gets the meta type of IDL type char.
 
     @return type of IDL type char
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCharCppuType();
 /** Gets the meta type of IDL type char.
 
     @return type of IDL type char
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType();
 
 /** Gets the meta type of IDL type byte.
@@ -274,7 +310,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuCharType();
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type byte
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8 * );
 
 /** Gets the meta type of IDL type string.
@@ -285,7 +325,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int8
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type string
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OUString * );
 
 /** Gets the meta type of IDL type short.
@@ -296,7 +340,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const ::rtl::OU
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type short
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16 * );
 
 /** Gets the meta type of IDL type unsigned short.
@@ -307,7 +355,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int16
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type unsigned short
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt16 * );
 
 /** Gets the meta type of IDL type long.
@@ -318,7 +370,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt1
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type long
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32 * );
 
 /** Gets the meta type of IDL type unsigned long.
@@ -329,7 +385,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int32
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type unsigned long
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt32 * );
 
 /** Gets the meta type of IDL type hyper.
@@ -340,7 +400,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt3
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type hyper
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64 * );
 
 /** Gets the meta type of IDL type unsigned hyper.
@@ -351,7 +415,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_Int64
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type unsigned hyper
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt64 * );
 
 /** Gets the meta type of IDL type float.
@@ -362,7 +430,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const sal_uInt6
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type float
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * );
 
 /** Gets the meta type of IDL type double.
@@ -373,7 +445,11 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const float * )
     The dummy parameter is just a typed pointer for function signature.
 
     @return type of IDL type double
+
+    @deprecated
+    Use cppu::UnoType instead.
 */
+SAL_DEPRECATED("use cppu::UnoType")
 inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double * );
 
 /** Gets the meta type of an IDL type.
@@ -394,7 +470,8 @@ inline const ::com::sun::star::uno::Type & SAL_CALL getCppuType( const double *
 
     @since UDK 3.2.0
 */
-template< typename T > inline const ::com::sun::star::uno::Type & SAL_CALL
+template< typename T > SAL_DEPRECATED("use cppu::UnoType")
+inline const ::com::sun::star::uno::Type & SAL_CALL
 getCppuType();
 
 /** Gets the meta type of IDL type char.
@@ -408,7 +485,8 @@ getCppuType();
 
     @since UDK 3.2.0
 */
-template<> inline const ::com::sun::star::uno::Type & SAL_CALL
+template<> SAL_DEPRECATED("use cppu::UnoType")
+inline const ::com::sun::star::uno::Type & SAL_CALL
 getCppuType< sal_Unicode >();
 
 #endif
commit 42c848c506b53a6de21c3b0129fd11d2f74e20b2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:42 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: Ida0a4cced7d35be6f9da16447ae4e23ded5e415a

diff --git a/xmlscript/source/inc/misc.hxx b/xmlscript/source/inc/misc.hxx
index 79b447a..e8ece5e 100644
--- a/xmlscript/source/inc/misc.hxx
+++ b/xmlscript/source/inc/misc.hxx
@@ -31,7 +31,7 @@ inline void extract_throw( T * p, ::com::sun::star::uno::Any const & a )
     if (! (a >>= *p))
     {
         throw ::com::sun::star::uno::RuntimeException(
-            "expected " + ::getCppuType( p ).getTypeName(),
+            "expected " + cppu::UnoType<T>::get().getTypeName(),
             ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XInterface>() );
     }
commit a0c46d2f20989bab56a7bc95409d0043a3f323c7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:33 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: Ic3764caeeb2cdec397071706845bf8517c848917

diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx
index b36953f..7e8a68d 100644
--- a/xmloff/source/core/SettingsExportHelper.cxx
+++ b/xmloff/source/core/SettingsExportHelper.cxx
@@ -130,13 +130,13 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
         default:
         {
             uno::Type aType = aAny.getValueType();
-            if (aType.equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ) )
+            if (aType.equals(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get() ) )
             {
                 uno::Sequence< beans::PropertyValue> aProps;
                 aAny >>= aProps;
                 exportSequencePropertyValue(aProps, rName);
             }
-            else if( aType.equals(getCppuType( (uno::Sequence<sal_Int8> *)0 ) ) )
+            else if( aType.equals(cppu::UnoType<uno::Sequence<sal_Int8>>::get() ) )
             {
                 uno::Sequence< sal_Int8 > aProps;
                 aAny >>= aProps;
@@ -166,7 +166,7 @@ void XMLSettingsExportHelper::CallTypeFunction(const uno::Any& rAny,
             {
                 exportForbiddenCharacters( aAny, rName );
             }
-            else if( aType.equals(getCppuType( (uno::Sequence<formula::SymbolDescriptor> *)0 ) ) )
+            else if( aType.equals(cppu::UnoType<uno::Sequence<formula::SymbolDescriptor>>::get() ) )
             {
                 uno::Sequence< formula::SymbolDescriptor > aProps;
                 aAny >>= aProps;
@@ -382,7 +382,7 @@ void XMLSettingsExportHelper::exportNameAccess(
                     const OUString& rName) const
 {
     DBG_ASSERT(!rName.isEmpty(), "no name");
-    DBG_ASSERT(aNamed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ),
+    DBG_ASSERT(aNamed->getElementType().equals(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get() ),
                 "wrong NameAccess" );
     if(aNamed->hasElements())
     {
@@ -400,7 +400,7 @@ void XMLSettingsExportHelper::exportIndexAccess(
                     const OUString& rName) const
 {
     DBG_ASSERT(!rName.isEmpty(), "no name");
-    DBG_ASSERT(rIndexed->getElementType().equals(getCppuType( (uno::Sequence<beans::PropertyValue> *)0 ) ),
+    DBG_ASSERT(rIndexed->getElementType().equals(cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get() ),
                 "wrong IndexAccess" );
     OUString sEmpty;
     if (rIndexed->hasElements())
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index e6ef5df..89cee10 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -2074,7 +2074,7 @@ ProgressBarHelper*  SvXMLExport::GetProgressBarHelper()
                 if (xPropertySetInfo->hasPropertyByName(sRepeat))
                 {
                     uno::Any aAny = mxExportInfo->getPropertyValue(sRepeat);
-                    if (aAny.getValueType() == getBooleanCppuType())
+                    if (aAny.getValueType() == cppu::UnoType<bool>::get())
                         mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
                     else {
                         SAL_WARN("xmloff.core", "why is it no boolean?" );
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index a30ad8f..48b54c4 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -1503,7 +1503,7 @@ ProgressBarHelper*  SvXMLImport::GetProgressBarHelper()
                 if (xPropertySetInfo->hasPropertyByName(sRepeat))
                 {
                     uno::Any aAny = mxImportInfo->getPropertyValue(sRepeat);
-                    if (aAny.getValueType() == getBooleanCppuType())
+                    if (aAny.getValueType() == cppu::UnoType<bool>::get())
                         mpProgressBarHelper->SetRepeat(::cppu::any2bool(aAny));
                     else {
                         SAL_WARN( "xmloff.core", "why is it no boolean?" );
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index aafd03e..c41c0d7 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -1135,7 +1135,7 @@ namespace xmloff
         if ( _rLocalName == GetXMLToken( XML_IMAGE_POSITION ) )
         {
             OSL_VERIFY( PropertyConversion::convertString(
-                ::getCppuType( &m_nImagePosition ),
+                cppu::UnoType<decltype(m_nImagePosition)>::get(),
                 _rValue, OEnumMapper::getEnumMap( OEnumMapper::epImagePosition )
             ) >>= m_nImagePosition );
             m_bHaveImagePosition = true;
@@ -1145,7 +1145,7 @@ namespace xmloff
         if ( _rLocalName == GetXMLToken( XML_IMAGE_ALIGN ) )
         {
             OSL_VERIFY( PropertyConversion::convertString(
-                ::getCppuType( &m_nImageAlign ),
+                cppu::UnoType<decltype(m_nImageAlign)>::get(),
                 _rValue, OEnumMapper::getEnumMap( OEnumMapper::epImageAlign )
             ) >>= m_nImageAlign );
             return true;
diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx
index 1973c23..e63d89c 100644
--- a/xmloff/source/forms/formattributes.cxx
+++ b/xmloff/source/forms/formattributes.cxx
@@ -234,7 +234,7 @@ namespace xmloff
     {
         OUStringBuffer aDefault;
         ::sax::Converter::convertBool(aDefault, _bAttributeDefault);
-        AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, ::getBooleanCppuType(), aDefault.makeStringAndClear());
+        AttributeAssignment& aAssignment = implAdd(_pAttributeName, _rPropertyName, cppu::UnoType<bool>::get(), aDefault.makeStringAndClear());
         aAssignment.bInverseSemantics = _bInverseSemantics;
     }
 
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index 9f2cdd8..2c38bc3 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -391,7 +391,7 @@ namespace xmloff
     //= helper
 #ifdef DBG_UTIL
     #define DBG_CHECK_PROPERTY(name, type)  \
-        dbg_implCheckProperty(name, &::getCppuType(static_cast< type* >(NULL)))
+        dbg_implCheckProperty(name, &cppu::UnoType<type>::get())
 
     #define DBG_CHECK_PROPERTY_NO_TYPE(name)    \
         dbg_implCheckProperty(name, NULL)
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 9395746..ceda8bd 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -234,12 +234,12 @@ Any PropertyConversion::convertString( const ::com::sun::star::uno::Type& _rExpe
 
 Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
 {
-    Type aUnoType( ::getVoidCppuType() );
+    Type aUnoType( cppu::UnoType<cppu::UnoVoidType>::get() );
 
     static std::map< OUString, css::uno::Type > s_aTypeNameMap;
     if ( s_aTypeNameMap.empty() )
     {
-        s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = ::getBooleanCppuType();
+        s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = cppu::UnoType<bool>::get();
         // Not a copy paste error, quotation from:
         // http://nabble.documentfoundation.org/Question-unoType-for-getXmlToken-dbaccess-reportdesign-module-tp4109071p4109116.html
         // all numeric types (including the UNO double)
@@ -247,7 +247,7 @@ Type PropertyConversion::xmlTypeToUnoType( const OUString& _rType )
         // C++ type "float" to "double" makes absolute sense
         s_aTypeNameMap[ token::GetXMLToken( token::XML_FLOAT )   ] = ::cppu::UnoType<double>::get();
         s_aTypeNameMap[ token::GetXMLToken( token::XML_STRING )  ] = ::cppu::UnoType<OUString>::get();
-        s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID )    ] = ::getVoidCppuType();
+        s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID )    ] = cppu::UnoType<cppu::UnoVoidType>::get();
     }
 
     const std::map< OUString, css::uno::Type >::iterator aTypePos = s_aTypeNameMap.find( _rType );
diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx
index 7073ab6..de381ce 100644
--- a/xmloff/source/style/PageMasterImportPropMapper.cxx
+++ b/xmloff/source/style/PageMasterImportPropMapper.cxx
@@ -315,28 +315,28 @@ void PageMasterImportPropertyMapper::finished(::std::vector< XMLPropertyState >&
     {
         sal_Bool bValue(sal_False);
         uno::Any aAny;
-        aAny.setValue( &bValue, ::getBooleanCppuType() );
+        aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xHeaderDynamic.reset(new XMLPropertyState(pHeaderHeight->mnIndex + 2, aAny));
     }
     if (pHeaderMinHeight)
     {
         sal_Bool bValue(sal_True);
         uno::Any aAny;
-        aAny.setValue( &bValue, ::getBooleanCppuType() );
+        aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xHeaderDynamic.reset(new XMLPropertyState(pHeaderMinHeight->mnIndex + 1, aAny));
     }
     if (pFooterHeight)
     {
         sal_Bool bValue(sal_False);
         uno::Any aAny;
-        aAny.setValue( &bValue, ::getBooleanCppuType() );
+        aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xFooterDynamic.reset(new XMLPropertyState(pFooterHeight->mnIndex + 2, aAny));
     }
     if (pFooterMinHeight)
     {
         sal_Bool bValue(sal_True);
         uno::Any aAny;
-        aAny.setValue( &bValue, ::getBooleanCppuType() );
+        aAny.setValue( &bValue, cppu::UnoType<bool>::get() );
         xFooterDynamic.reset(new XMLPropertyState(pFooterMinHeight->mnIndex + 1, aAny));
     }
 
diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx
index 67ce532..4416545 100644
--- a/xmloff/source/style/PageMasterPropHdlFactory.cxx
+++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx
@@ -138,7 +138,7 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
 
             //UUUU
             case XML_SW_TYPE_FILLSTYLE:
-                pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, ::getCppuType((const FillStyle*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, cppu::UnoType<FillStyle>::get() );
                 break;
             case XML_SW_TYPE_FILLBITMAPSIZE:
                 pHdl = new XMLFillBitmapSizePropertyHandler();
@@ -147,10 +147,10 @@ const XMLPropertyHandler* XMLPageMasterPropHdlFactory::GetPropertyHandler( sal_I
                 pHdl = new XMLBitmapLogicalSizePropertyHandler();
                 break;
             case XML_SW_TYPE_BITMAP_REFPOINT:
-                pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, getCppuType((const RectanglePoint*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<RectanglePoint>::get() );
                 break;
             case XML_SW_TYPE_BITMAP_MODE:
-                pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, getCppuType((const BitmapMode*)0) );
+                pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, cppu::UnoType<BitmapMode>::get() );
                 break;
             case XML_SW_TYPE_BITMAPREPOFFSETX:
             case XML_SW_TYPE_BITMAPREPOFFSETY:
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index bea31bf..4fbd4f4 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1115,7 +1115,7 @@ void SvxXMLListStyleContext::FillUnoNumRule(
         {
             Any aAny;
             sal_Bool bTmp = bConsecutive;
-            aAny.setValue( &bTmp, ::getBooleanCppuType() );
+            aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
             xPropSet->setPropertyValue( sIsContinuousNumbering, aAny );
         }
     }
diff --git a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
index ef326bb..8d010e5 100644
--- a/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteConfigurationImportContext.cxx
@@ -414,7 +414,7 @@ void XMLFootnoteConfigurationImportContext::ProcessSettings(
 
     if (!bIsEndnote)
     {
-        aAny.setValue(&bPosition, ::getBooleanCppuType());
+        aAny.setValue(&bPosition, cppu::UnoType<bool>::get());
         rConfig->setPropertyValue(sPropertyPositionEndOfDoc, aAny);
 
         aAny <<= nNumbering;
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
index 0fba2c1..8568eb0 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.cxx
@@ -203,28 +203,28 @@ void XMLIndexAlphabeticalSourceContext::EndElement()
         rIndexPropertySet->setPropertyValue(sMainEntryCharacterStyleName,aAny);
     }
 
-    aAny.setValue(&bSeparators, ::getBooleanCppuType());
+    aAny.setValue(&bSeparators, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sUseAlphabeticalSeparators, aAny);
 
-    aAny.setValue(&bCombineEntries, ::getBooleanCppuType());
+    aAny.setValue(&bCombineEntries, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sUseCombinedEntries, aAny);
 
-    aAny.setValue(&bCaseSensitive, ::getBooleanCppuType());
+    aAny.setValue(&bCaseSensitive, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sIsCaseSensitive, aAny);
 
-    aAny.setValue(&bEntry, ::getBooleanCppuType());
+    aAny.setValue(&bEntry, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sUseKeyAsEntry, aAny);
 
-    aAny.setValue(&bUpperCase, ::getBooleanCppuType());
+    aAny.setValue(&bUpperCase, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sUseUpperCase, aAny);
 
-    aAny.setValue(&bCombineDash, ::getBooleanCppuType());
+    aAny.setValue(&bCombineDash, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sUseDash, aAny);
 
-    aAny.setValue(&bCombinePP, ::getBooleanCppuType());
+    aAny.setValue(&bCombinePP, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sUsePP, aAny);
 
-    aAny.setValue(&bCommaSeparated, ::getBooleanCppuType());
+    aAny.setValue(&bCommaSeparated, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sIsCommaSeparated, aAny);
 
 
diff --git a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
index cc816b5..9129b62 100644
--- a/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
+++ b/xmloff/source/text/XMLIndexBibliographyConfigurationContext.cxx
@@ -209,7 +209,7 @@ SvXMLImportContext *XMLIndexBibliographyConfigurationContext::CreateChildContext
 
             PropertyValue aSortValue;
             aSortValue.Name = sIsSortAscending;
-            aAny.setValue(&bSort, ::getBooleanCppuType());
+            aAny.setValue(&bSort, cppu::UnoType<bool>::get());
             aSortValue.Value = aAny;
             aKey[1] = aSortValue;
 
@@ -260,10 +260,10 @@ void XMLIndexBibliographyConfigurationContext::CreateAndInsert(bool)
                 aAny <<= sPrefix;
                 xPropSet->setPropertyValue(sBracketBefore, aAny);
 
-                aAny.setValue(&bNumberedEntries, ::getBooleanCppuType());
+                aAny.setValue(&bNumberedEntries, cppu::UnoType<bool>::get());
                 xPropSet->setPropertyValue(sIsNumberEntries, aAny);
 
-                aAny.setValue(&bSortByPosition, ::getBooleanCppuType());
+                aAny.setValue(&bSortByPosition, cppu::UnoType<bool>::get());
                 xPropSet->setPropertyValue(sIsSortByPosition, aAny);
 
                 if( !maLanguageTagODF.isEmpty() )
diff --git a/xmloff/source/text/XMLIndexObjectSourceContext.cxx b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
index 98451c6..8b8eb50 100644
--- a/xmloff/source/text/XMLIndexObjectSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexObjectSourceContext.cxx
@@ -132,19 +132,19 @@ void XMLIndexObjectSourceContext::EndElement()
 {
     Any aAny;
 
-    aAny.setValue(&bUseCalc, ::getBooleanCppuType());
+    aAny.setValue(&bUseCalc, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromStarCalc, aAny);
 
-    aAny.setValue(&bUseChart, ::getBooleanCppuType());
+    aAny.setValue(&bUseChart, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromStarChart, aAny);
 
-    aAny.setValue(&bUseDraw, ::getBooleanCppuType());
+    aAny.setValue(&bUseDraw, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromStarDraw, aAny);
 
-    aAny.setValue(&bUseMath, ::getBooleanCppuType());
+    aAny.setValue(&bUseMath, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromStarMath, aAny);
 
-    aAny.setValue(&bUseOtherObjects, ::getBooleanCppuType());
+    aAny.setValue(&bUseOtherObjects, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromOtherEmbeddedObjects, aAny);
 
     XMLIndexSourceBaseContext::EndElement();
diff --git a/xmloff/source/text/XMLIndexSourceBaseContext.cxx b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
index f301985..f7d29f4 100644
--- a/xmloff/source/text/XMLIndexSourceBaseContext.cxx
+++ b/xmloff/source/text/XMLIndexSourceBaseContext.cxx
@@ -221,10 +221,10 @@ void XMLIndexSourceBaseContext::EndElement()
 {
     Any aAny;
 
-    aAny.setValue(&bRelativeTabs, ::getBooleanCppuType());
+    aAny.setValue(&bRelativeTabs, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sIsRelativeTabstops, aAny);
 
-    aAny.setValue(&bChapterIndex, ::getBooleanCppuType());
+    aAny.setValue(&bChapterIndex, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromChapter, aAny);
 }
 
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 341765d..8992520 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -244,7 +244,7 @@ void XMLIndexTOCContext::StartElement(
         }
 
         Any aAny;
-        aAny.setValue( &bProtected, ::getBooleanCppuType() );
+        aAny.setValue( &bProtected, cppu::UnoType<bool>::get() );
         xTOCPropertySet->setPropertyValue( sIsProtected, aAny );
 
         if (!sIndexName.isEmpty())
diff --git a/xmloff/source/text/XMLIndexTOCSourceContext.cxx b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
index d1ec00d..4ee9095 100644
--- a/xmloff/source/text/XMLIndexTOCSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCSourceContext.cxx
@@ -140,13 +140,13 @@ void XMLIndexTOCSourceContext::EndElement()
 {
     Any aAny;
 
-    aAny.setValue(&bUseMarks, ::getBooleanCppuType());
+    aAny.setValue(&bUseMarks, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromMarks, aAny);
 
-    aAny.setValue(&bUseOutline, ::getBooleanCppuType());
+    aAny.setValue(&bUseOutline, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromOutline, aAny);
 
-    aAny.setValue(&bUseParagraphStyles, ::getBooleanCppuType());
+    aAny.setValue(&bUseParagraphStyles, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromLevelParagraphStyles, aAny);
 
     aAny <<= (sal_Int16)nOutlineLevel;
diff --git a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
index 9fe6947..f1ad3f0 100644
--- a/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
+++ b/xmloff/source/text/XMLIndexTabStopEntryContext.cxx
@@ -133,7 +133,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues(
     // right aligned?
     pValues[nNextEntry].Name = rTemplateContext.sTabStopRightAligned;
     pValues[nNextEntry].Value.setValue( &bTabRightAligned,
-                                        ::getBooleanCppuType());
+                                        cppu::UnoType<bool>::get());
     nNextEntry++;
 
     // position
@@ -155,7 +155,7 @@ void XMLIndexTabStopEntryContext::FillPropertyValues(
     // tab character #i21237#
      pValues[nNextEntry].Name = "WithTab";
     pValues[nNextEntry].Value.setValue( &bWithTab,
-                                        ::getBooleanCppuType());
+                                        cppu::UnoType<bool>::get());
     nNextEntry++;
 
     // check whether we really filled all elements of the sequence
diff --git a/xmloff/source/text/XMLIndexTableSourceContext.cxx b/xmloff/source/text/XMLIndexTableSourceContext.cxx
index f1fa32e..ba66fd5 100644
--- a/xmloff/source/text/XMLIndexTableSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexTableSourceContext.cxx
@@ -131,7 +131,7 @@ void XMLIndexTableSourceContext::EndElement()
 {
     Any aAny;
 
-    aAny.setValue(&bUseCaption, ::getBooleanCppuType());
+    aAny.setValue(&bUseCaption, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromLabels, aAny);
 
     if (bSequenceOK)
diff --git a/xmloff/source/text/XMLIndexUserSourceContext.cxx b/xmloff/source/text/XMLIndexUserSourceContext.cxx
index f5772dc..214c2d9 100644
--- a/xmloff/source/text/XMLIndexUserSourceContext.cxx
+++ b/xmloff/source/text/XMLIndexUserSourceContext.cxx
@@ -156,25 +156,25 @@ void XMLIndexUserSourceContext::EndElement()
 {
     Any aAny;
 
-    aAny.setValue(&bUseObjects, ::getBooleanCppuType());
+    aAny.setValue(&bUseObjects, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromEmbeddedObjects, aAny);
 
-    aAny.setValue(&bUseGraphic, ::getBooleanCppuType());
+    aAny.setValue(&bUseGraphic, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromGraphicObjects, aAny);
 
-    aAny.setValue(&bUseLevelFromSource, ::getBooleanCppuType());
+    aAny.setValue(&bUseLevelFromSource, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sUseLevelFromSource, aAny);
 
-    aAny.setValue(&bUseMarks, ::getBooleanCppuType());
+    aAny.setValue(&bUseMarks, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromMarks, aAny);
 
-    aAny.setValue(&bUseTables, ::getBooleanCppuType());
+    aAny.setValue(&bUseTables, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromTables, aAny);
 
-    aAny.setValue(&bUseFrames, ::getBooleanCppuType());
+    aAny.setValue(&bUseFrames, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromTextFrames, aAny);
 
-    aAny.setValue(&bUseLevelParagraphStyles, ::getBooleanCppuType());
+    aAny.setValue(&bUseLevelParagraphStyles, cppu::UnoType<bool>::get());
     rIndexPropertySet->setPropertyValue(sCreateFromLevelParagraphStyles, aAny);
 
     if( !sIndexName.isEmpty() )
diff --git a/xmloff/source/text/XMLLineNumberingImportContext.cxx b/xmloff/source/text/XMLLineNumberingImportContext.cxx
index 0a02449..125e660 100644
--- a/xmloff/source/text/XMLLineNumberingImportContext.cxx
+++ b/xmloff/source/text/XMLLineNumberingImportContext.cxx
@@ -256,16 +256,16 @@ void XMLLineNumberingImportContext::CreateAndInsert(bool)
                 xLineNumbering->setPropertyValue(sSeparatorInterval, aAny);
             }
 
-            aAny.setValue(&bNumberLines, ::getBooleanCppuType());
+            aAny.setValue(&bNumberLines, cppu::UnoType<bool>::get());
             xLineNumbering->setPropertyValue(sIsOn, aAny);
 
-            aAny.setValue(&bCountEmptyLines, ::getBooleanCppuType());
+            aAny.setValue(&bCountEmptyLines, cppu::UnoType<bool>::get());
             xLineNumbering->setPropertyValue(sCountEmptyLines, aAny);
 
-            aAny.setValue(&bCountInFloatingFrames, ::getBooleanCppuType());
+            aAny.setValue(&bCountInFloatingFrames, cppu::UnoType<bool>::get());
             xLineNumbering->setPropertyValue(sCountLinesInFrames, aAny);
 
-            aAny.setValue(&bRestartNumbering, ::getBooleanCppuType());
+            aAny.setValue(&bRestartNumbering, cppu::UnoType<bool>::get());
             xLineNumbering->setPropertyValue(sRestartAtEachPage, aAny);
 
             sal_Int16 nNumType = NumberingType::ARABIC;
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 1ddce2b..3a705e6 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -133,13 +133,13 @@ void XMLSectionFootnoteConfigImport::StartElement(
     // OK, now we have all values and can fill the XMLPropertyState vector
     Any aAny;
 
-    aAny.setValue( &bNumOwn, ::getBooleanCppuType() );
+    aAny.setValue( &bNumOwn, cppu::UnoType<bool>::get() );
     sal_Int32 nIndex = rMapper->FindEntryIndex( bEndnote ?
         CTF_SECTION_ENDNOTE_NUM_OWN : CTF_SECTION_FOOTNOTE_NUM_OWN );
     XMLPropertyState aNumOwn( nIndex, aAny );
     rProperties.push_back( aNumOwn );
 
-    aAny.setValue( &bNumRestart, ::getBooleanCppuType() );
+    aAny.setValue( &bNumRestart, cppu::UnoType<bool>::get() );
     nIndex = rMapper->FindEntryIndex( bEndnote ?
         CTF_SECTION_ENDNOTE_NUM_RESTART : CTF_SECTION_FOOTNOTE_NUM_RESTART );
     XMLPropertyState aNumRestart( nIndex, aAny );
@@ -174,7 +174,7 @@ void XMLSectionFootnoteConfigImport::StartElement(
     XMLPropertyState aSuffixState( nIndex, aAny );
     rProperties.push_back( aSuffixState );
 
-    aAny.setValue( &bEnd, ::getBooleanCppuType() );
+    aAny.setValue( &bEnd, cppu::UnoType<bool>::get() );
     nIndex = rMapper->FindEntryIndex( bEndnote ?
         CTF_SECTION_ENDNOTE_END : CTF_SECTION_FOOTNOTE_END );
     XMLPropertyState aEndState( nIndex, aAny );
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index ea8ed95..2574fce 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -170,7 +170,7 @@ void XMLSectionImportContext::StartElement(
                 if (! bIsIndexHeader)
                 {
                     Any aAny;
-                    aAny.setValue( &bIsVisible, ::getBooleanCppuType() );
+                    aAny.setValue( &bIsVisible, cppu::UnoType<bool>::get() );
                     xPropSet->setPropertyValue( sIsVisible, aAny );
 
                     // #97450# hidden sections must be hidden on reload
@@ -179,7 +179,7 @@ void XMLSectionImportContext::StartElement(
                     if( bIsCurrentlyVisibleOK )
                     {
                         aAny.setValue( &bIsCurrentlyVisible,
-                                       ::getBooleanCppuType() );
+                                       cppu::UnoType<bool>::get() );
                         xPropSet->setPropertyValue( sIsCurrentlyVisible, aAny);
                     }
 
@@ -201,7 +201,7 @@ void XMLSectionImportContext::StartElement(
 
                 // protection
                 Any aAny;
-                aAny.setValue( &bProtect, ::getBooleanCppuType() );
+                aAny.setValue( &bProtect, cppu::UnoType<bool>::get() );
                 xPropSet->setPropertyValue( sIsProtected, aAny );
 
                 // insert marker, <paragraph>, marker; then insert
diff --git a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
index fc8aa97..cd68fae 100644
--- a/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
+++ b/xmloff/source/text/XMLSectionSourceDDEImportContext.cxx
@@ -148,7 +148,7 @@ void XMLSectionSourceDDEImportContext::StartElement(
         aValues[2] <<= sItem;
         aNames[2] = sDdeCommandElement;
 
-        aValues[3].setValue(&bAutomaticUpdate, ::getBooleanCppuType());
+        aValues[3].setValue(&bAutomaticUpdate, cppu::UnoType<bool>::get());
         aNames[3] = sIsAutomaticUpdate;
 
         Reference<XMultiPropertySet> rMultiPropSet(rSectionPropertySet,
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx b/xmloff/source/text/XMLTextColumnsContext.cxx
index a000fc6..e07aee0 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -450,7 +450,7 @@ void XMLTextColumnsContext::EndElement( )
         Any aAny;
         sal_Bool bOn = pColumnSep != 0;
 
-        aAny.setValue( &bOn, ::getBooleanCppuType() );
+        aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue( sSeparatorLineIsOn, aAny );
 
         if( pColumnSep )
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 58ed9b3..52fc140 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -334,7 +334,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
 
         if( xPropSetInfo->hasPropertyByName( sIsPixelContour ) )
         {
-            aAny.setValue( &bPixelWidth, ::getBooleanCppuType() );
+            aAny.setValue( &bPixelWidth, cppu::UnoType<bool>::get() );
             xPropSet->setPropertyValue( sIsPixelContour, aAny );
         }
 
@@ -342,7 +342,7 @@ XMLTextFrameContourContext_Impl::XMLTextFrameContourContext_Impl(
 
         if( xPropSetInfo->hasPropertyByName( sIsAutomaticContour ) )
         {
-            aAny.setValue( &bAuto, ::getBooleanCppuType() );
+            aAny.setValue( &bAuto, cppu::UnoType<bool>::get() );
             xPropSet->setPropertyValue( sIsAutomaticContour, aAny );
         }
     }
@@ -673,7 +673,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ )
     if( bSyncWidth || nWidth > 0 )
     {
         sal_Bool bTmp = bSyncWidth;
-        aAny.setValue( &bTmp, ::getBooleanCppuType() );
+        aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue( sIsSyncWidthToHeight, aAny );
     }
     if( xPropSetInfo->hasPropertyByName( sWidthType ) &&
@@ -699,7 +699,7 @@ void XMLTextFrameContext_Impl::Create( bool /*bHRefOrBase64*/ )
     if( bSyncHeight || nHeight > 0 )
     {
         sal_Bool bTmp = bSyncHeight;
-        aAny.setValue( &bTmp, ::getBooleanCppuType() );
+        aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue( sIsSyncHeightToWidth, aAny );
     }
     if( xPropSetInfo->hasPropertyByName( sSizeType ) &&
@@ -1305,7 +1305,7 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef,
 
     if (xPropSetInfo->hasPropertyByName(s_ServerMap))
     {
-        aAny.setValue( &bMap, ::getBooleanCppuType() );
+        aAny.setValue( &bMap, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue(s_ServerMap, aAny);
     }
 }
diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index f752e33..673c8ff 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -75,7 +75,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
                 {
                     // Don't share headers any longer
                     bShared = false;
-                    aAny.setValue( &bShared, ::getBooleanCppuType() );
+                    aAny.setValue( &bShared, cppu::UnoType<bool>::get() );
                     xPropSet->setPropertyValue( sShareContent, aAny );
                 }
             }
@@ -89,7 +89,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( SvXMLImport& rImport, sa
                 {
                     // Don't share first/right headers any longer
                     bSharedFirst = false;
-                    aAny.setValue( &bSharedFirst, ::getBooleanCppuType() );
+                    aAny.setValue( &bSharedFirst, cppu::UnoType<bool>::get() );
                     xPropSet->setPropertyValue( sShareContentFirst, aAny );
                 }
             }
@@ -137,7 +137,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
                 {
                     // Switch header on
                     bOn = sal_True;
-                    aAny.setValue( &bOn, ::getBooleanCppuType() );
+                    aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
                     xPropSet->setPropertyValue( sOn, aAny );
 
                     // The content has not to be removed, because the header
@@ -151,7 +151,7 @@ SvXMLImportContext *XMLTextHeaderFooterContext::CreateChildContext(
                 if( !bShared )
                 {
                     bShared = sal_True;
-                    aAny.setValue( &bShared, ::getBooleanCppuType() );
+                    aAny.setValue( &bShared, cppu::UnoType<bool>::get() );
                     xPropSet->setPropertyValue( sShareContent, aAny );
                 }
 
@@ -206,7 +206,7 @@ void XMLTextHeaderFooterContext::EndElement()
         // switch it off.
         sal_Bool bOn = sal_False;
         Any aAny;
-        aAny.setValue( &bOn, ::getBooleanCppuType() );
+        aAny.setValue( &bOn, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue( sOn, aAny );
     }
 }
diff --git a/xmloff/source/text/XMLTextShapeStyleContext.cxx b/xmloff/source/text/XMLTextShapeStyleContext.cxx
index a59f200..59351c5 100644
--- a/xmloff/source/text/XMLTextShapeStyleContext.cxx
+++ b/xmloff/source/text/XMLTextShapeStyleContext.cxx
@@ -215,7 +215,7 @@ void XMLTextShapeStyleContext::CreateAndInsert( bool bOverwrite )
     {
         Any aAny;
         sal_Bool bTmp = bAutoUpdate;
-        aAny.setValue( &bTmp, ::getBooleanCppuType() );
+        aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue( sIsAutoUpdate, aAny );
     }
 
diff --git a/xmloff/source/text/txtdropi.cxx b/xmloff/source/text/txtdropi.cxx
index 690b789..53edb1b 100644
--- a/xmloff/source/text/txtdropi.cxx
+++ b/xmloff/source/text/txtdropi.cxx
@@ -116,7 +116,7 @@ void XMLTextDropCapImportContext::ProcessAttrs(
 
     aProp.maValue <<= aFormat;
 
-    aWholeWordProp.maValue.setValue( &bWholeWord, ::getBooleanCppuType() );
+    aWholeWordProp.maValue.setValue( &bWholeWord, cppu::UnoType<bool>::get() );
 }
 
 XMLTextDropCapImportContext::XMLTextDropCapImportContext(
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index bdba18f..2a22699 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -714,7 +714,7 @@ void XMLSenderFieldImportContext::PrepareField(
     rPropSet->setPropertyValue(sPropertyFieldSubType, aAny);
 
     // set fixed
-    aAny.setValue( &bFixed, ::getBooleanCppuType() );
+    aAny.setValue( &bFixed, cppu::UnoType<bool>::get() );
     rPropSet->setPropertyValue(sPropertyFixed, aAny);
 
     // set content if fixed
@@ -772,10 +772,10 @@ void XMLAuthorFieldImportContext::PrepareField(
 {
     // set members
     Any aAny;
-    aAny.setValue( &bAuthorFullName, ::getBooleanCppuType() );
+    aAny.setValue( &bAuthorFullName, cppu::UnoType<bool>::get() );
     rPropSet->setPropertyValue(sPropertyAuthorFullName, aAny);
 
-    aAny.setValue( &bFixed, ::getBooleanCppuType() );
+    aAny.setValue( &bFixed, cppu::UnoType<bool>::get() );
     rPropSet->setPropertyValue(sPropertyFixed, aAny);
 
     // set content if fixed
@@ -1148,11 +1148,11 @@ void XMLTimeFieldImportContext::PrepareField(
 
     if (xPropertySetInfo->hasPropertyByName(sPropertyFixed))
     {
-        aAny.setValue( &bFixed, ::getBooleanCppuType() );
+        aAny.setValue( &bFixed, cppu::UnoType<bool>::get() );
         rPropertySet->setPropertyValue(sPropertyFixed, aAny);
     }
 
-    aAny.setValue( &bIsDate, ::getBooleanCppuType() );
+    aAny.setValue( &bIsDate, cppu::UnoType<bool>::get() );
     rPropertySet->setPropertyValue(sPropertyIsDate, aAny);
 
     if (xPropertySetInfo->hasPropertyByName(sPropertyAdjust))
@@ -1198,7 +1198,7 @@ void XMLTimeFieldImportContext::PrepareField(
         if( xPropertySetInfo->hasPropertyByName( sPropertyIsFixedLanguage ) )
         {
             sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
-            aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+            aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
             rPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
         }
     }
@@ -1392,7 +1392,7 @@ void XMLDatabaseFieldImportContext::PrepareField(
 
     if( bUseDisplay && bDisplayOK )
     {
-        aAny.setValue( &bDisplay, ::getBooleanCppuType() );
+        aAny.setValue( &bDisplay, cppu::UnoType<bool>::get() );
         xPropertySet->setPropertyValue( sPropertyIsVisible, aAny );
     }
 }
@@ -1661,7 +1661,7 @@ void XMLSimpleDocInfoImportContext::PrepareField(
     if (xPropertySetInfo->hasPropertyByName(sPropertyFixed))
     {
         Any aAny;
-        aAny.setValue(&bFixed, ::getBooleanCppuType() );
+        aAny.setValue(&bFixed, cppu::UnoType<bool>::get() );
         rPropertySet->setPropertyValue(sPropertyFixed, aAny);
 
         // set Content and CurrentPresentation (if fixed)
@@ -1893,7 +1893,7 @@ void XMLDateTimeDocInfoImportContext::PrepareField(
 
     if (bHasDateTime)
     {
-        aAny.setValue( &bIsDate, ::getBooleanCppuType());
+        aAny.setValue( &bIsDate, cppu::UnoType<bool>::get());
         xPropertySet->setPropertyValue(sPropertyIsDate, aAny);
     }
 
@@ -1906,7 +1906,7 @@ void XMLDateTimeDocInfoImportContext::PrepareField(
                 hasPropertyByName( sPropertyIsFixedLanguage ) )
         {
             sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
-            aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+            aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
             xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
         }
     }
@@ -1993,7 +1993,7 @@ void XMLUserDocInfoImportContext::PrepareField(
         if( xPropertySetInfo->hasPropertyByName( sPropertyIsFixedLanguage ) )
         {
             sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
-            aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+            aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
             xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
         }
     }
@@ -2055,7 +2055,7 @@ void XMLHiddenParagraphImportContext::PrepareField(
     aAny <<= sCondition;
     xPropertySet->setPropertyValue(sPropertyCondition, aAny);
 
-    aAny.setValue( &bIsHidden, ::getBooleanCppuType() );
+    aAny.setValue( &bIsHidden, cppu::UnoType<bool>::get() );
     xPropertySet->setPropertyValue(sPropertyIsHidden, aAny);
 }
 
@@ -2140,7 +2140,7 @@ void XMLConditionalTextImportContext::PrepareField(
     aAny <<= sTrueContent;
     xPropertySet->setPropertyValue(sPropertyTrueContent, aAny);
 
-    aAny.setValue( &bCurrentValue, ::getBooleanCppuType() );
+    aAny.setValue( &bCurrentValue, cppu::UnoType<bool>::get() );
     xPropertySet->setPropertyValue(sPropertyIsConditionTrue, aAny);
 
     aAny <<= GetContent();
@@ -2218,7 +2218,7 @@ void XMLHiddenTextImportContext::PrepareField(
     aAny <<= sString;
     xPropertySet->setPropertyValue(sPropertyContent, aAny);
 
-    aAny.setValue( &bIsHidden, ::getBooleanCppuType() );
+    aAny.setValue( &bIsHidden, cppu::UnoType<bool>::get() );
     xPropertySet->setPropertyValue(sPropertyIsHidden, aAny);
 }
 
@@ -2670,7 +2670,7 @@ void XMLPageVarSetFieldImportContext::PrepareField(
 {
     Any aAny;
 
-    aAny.setValue(&bActive, ::getBooleanCppuType());
+    aAny.setValue(&bActive, cppu::UnoType<bool>::get());
     xPropertySet->setPropertyValue(sPropertyOn, aAny);
 
     aAny <<= nAdjust;
@@ -3132,7 +3132,7 @@ void XMLDdeFieldDeclImportContext::StartElement(
                         xPropSet->setPropertyValue(sPropertyDDECommandElement,
                                                    aAny);
 
-                        aAny.setValue(&bUpdate, ::getBooleanCppuType());
+                        aAny.setValue(&bUpdate, cppu::UnoType<bool>::get());
                         xPropSet->setPropertyValue(sPropertyIsAutomaticUpdate,
                                                    aAny);
                     }
@@ -3876,7 +3876,7 @@ void XMLScriptImportContext::PrepareField(
     xPropertySet->setPropertyValue(sPropertyContent, aAny);
 
     // URL or script text? We use URL if we have an href-attribute
-    aAny.setValue(&bContentOK, ::getBooleanCppuType());
+    aAny.setValue(&bContentOK, cppu::UnoType<bool>::get());
     xPropertySet->setPropertyValue(sPropertyURLContent, aAny);
 
     aAny <<= sScriptType;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 025bb0b..a3be715 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -374,7 +374,7 @@ void FieldParamExporter::Export()
 {
     const Type aStringType = ::cppu::UnoType<OUString>::get();
     const Type aBoolType = cppu::UnoType<sal_Bool>::get();
-    const Type aSeqType = ::getCppuType((Sequence<OUString>*)0);
+    const Type aSeqType = cppu::UnoType<Sequence<OUString>>::get();
     const Type aIntType = ::cppu::UnoType<sal_Int32>::get();
     Sequence<OUString> vParameters(m_xFieldParams->getElementNames());
     for(const OUString* pCurrent = vParameters.begin(); pCurrent != vParameters.end(); ++pCurrent)
diff --git a/xmloff/source/text/txtprhdl.cxx b/xmloff/source/text/txtprhdl.cxx
index 35db468..34d51f3 100644
--- a/xmloff/source/text/txtprhdl.cxx
+++ b/xmloff/source/text/txtprhdl.cxx
@@ -341,7 +341,7 @@ bool XMLOpaquePropHdl_Impl::importXML(
         bRet = false;
 
     if( bRet )
-        rValue.setValue( &bVal, ::getBooleanCppuType() );
+        rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
 
     return bRet;
 }
@@ -391,7 +391,7 @@ bool XMLContourModePropHdl_Impl::importXML(
         bRet = false;
 
     if( bRet )
-        rValue.setValue( &bVal, ::getBooleanCppuType() );
+        rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
 
     return bRet;
 }
@@ -444,7 +444,7 @@ bool XMLParagraphOnlyPropHdl_Impl::importXML(
     }
 
     if( bRet )
-        rValue.setValue( &bVal, ::getBooleanCppuType() );
+        rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
 
     return bRet;
 }
@@ -570,7 +570,7 @@ bool XMLFrameProtectPropHdl_Impl::importXML(
     }
 
     if( bRet )
-        rValue.setValue( &bVal, ::getBooleanCppuType() );
+        rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
 
     return bRet;
 }
@@ -747,7 +747,7 @@ bool XMLHoriMirrorPropHdl_Impl::importXML(
     if( bRet )
     {
         sal_Bool bTmp = nHoriMirror != 0;
-        rValue.setValue( &bTmp, ::getBooleanCppuType() );
+        rValue.setValue( &bTmp, cppu::UnoType<bool>::get() );
     }
 
     return bRet;
@@ -813,7 +813,7 @@ bool XMLGrfMirrorPropHdl_Impl::importXML(
     }
 
     if( bRet )
-        rValue.setValue( &bVal, ::getBooleanCppuType() );
+        rValue.setValue( &bVal, cppu::UnoType<bool>::get() );
 
     return bRet;
 }
@@ -1088,7 +1088,7 @@ bool XMLTextSyncWidthHeightPropHdl_Impl::importXML(
         const SvXMLUnitConverter& ) const
 {
     sal_Bool bValue = (rStrImpValue == sValue );
-    rValue.setValue( &bValue, ::getBooleanCppuType() );
+    rValue.setValue( &bValue, cppu::UnoType<bool>::get() );
 
     return true;
 }
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 2d25f61..9779fe6 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -218,7 +218,7 @@ void XMLTextStyleContext::CreateAndInsert( bool bOverwrite )
     {
         Any aAny;
         sal_Bool bTmp = bAutoUpdate;
-        aAny.setValue( &bTmp, ::getBooleanCppuType() );
+        aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
         xPropSet->setPropertyValue( sIsAutoUpdate, aAny );
     }
 
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index 89f4047..adc415f 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -248,7 +248,7 @@ void XMLVarFieldImportContext::PrepareField(
     {
         Any aAny;
         sal_Bool bTmp = ! (bDisplayNone && bDisplayOK);
-        aAny.setValue( &bTmp, ::getBooleanCppuType());
+        aAny.setValue( &bTmp, cppu::UnoType<bool>::get());
         xPropertySet->setPropertyValue(sPropertyIsVisible, aAny);
     }
 
@@ -266,7 +266,7 @@ void XMLVarFieldImportContext::PrepareField(
     {
         Any aAny;
         sal_Bool bTmp = bDisplayFormula && bDisplayOK;
-        aAny.setValue( &bTmp, ::getBooleanCppuType());
+        aAny.setValue( &bTmp, cppu::UnoType<bool>::get());
         xPropertySet->setPropertyValue(sPropertyIsDisplayFormula, aAny);
     }
 
@@ -513,7 +513,7 @@ void XMLVariableInputFieldImportContext::PrepareField(
     // set type (input field)
     Any aAny;
     sal_Bool bTrue = sal_True;
-    aAny.setValue( &bTrue, ::getBooleanCppuType() );
+    aAny.setValue( &bTrue, cppu::UnoType<bool>::get() );
     xPropertySet->setPropertyValue(sPropertyIsInput, aAny);
 
     // set type
@@ -743,7 +743,7 @@ void XMLTableFormulaImportContext::PrepareField(
     Any aAny;
 
     // set 'show formula' and presentation
-    aAny.setValue( &bIsShowFormula, ::getBooleanCppuType() );
+    aAny.setValue( &bIsShowFormula, cppu::UnoType<bool>::get() );
     xPropertySet->setPropertyValue( sPropertyIsShowFormula, aAny );
 
     aAny <<= GetContent();
@@ -924,7 +924,7 @@ XMLVariableDeclImportContext::XMLVariableDeclImportContext(
             case VarTypeUserField:
             {
                 sal_Bool bTmp = !aValueHelper.IsStringValue();
-                aAny.setValue(&bTmp, ::getBooleanCppuType());
+                aAny.setValue(&bTmp, cppu::UnoType<bool>::get());
                 xFieldMaster->setPropertyValue(sPropertyIsExpression, aAny);
                 aValueHelper.PrepareField(xFieldMaster);
                 break;
@@ -1185,7 +1185,7 @@ void XMLDatabaseDisplayImportContext::EndElement()
 
                         // prepare field: format from database?
                         sal_Bool bTmp = !aValueHelper.IsFormatOK();
-                        aAny.setValue( &bTmp, ::getBooleanCppuType() );
+                        aAny.setValue( &bTmp, cppu::UnoType<bool>::get() );
                         xField->setPropertyValue(sPropertyDatabaseFormat,aAny);
 
                         // value, value-type and format done by value helper
@@ -1194,7 +1194,7 @@ void XMLDatabaseDisplayImportContext::EndElement()
                         // visibility
                         if( bDisplayOK )
                         {
-                            aAny.setValue( &bDisplay, ::getBooleanCppuType() );
+                            aAny.setValue( &bDisplay, cppu::UnoType<bool>::get() );
                             xField->setPropertyValue(sPropertyIsVisible, aAny);
                         }
 
@@ -1435,7 +1435,7 @@ void XMLValueImportHelper::PrepareField(
                 hasPropertyByName( sPropertyIsFixedLanguage ) )
         {
             sal_Bool bIsFixedLanguage = ! bIsDefaultLanguage;
-            aAny.setValue( &bIsFixedLanguage, ::getBooleanCppuType() );
+            aAny.setValue( &bIsFixedLanguage, cppu::UnoType<bool>::get() );
             xPropertySet->setPropertyValue( sPropertyIsFixedLanguage, aAny );
         }
     }
commit 2b1d22e1ff6ea5ef7a53783617a45309d7426f07
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:29 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: I08f4e8270061b90b77a976d4ead7462a02fce845

diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index e11812f0..09090e2 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -79,7 +79,7 @@ namespace treeview {
         getElementType(  )
             throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE
         {
-            return getCppuVoidType();
+            return cppu::UnoType<cppu::UnoVoidType>::get();
         }
 
         virtual sal_Bool SAL_CALL hasElements()
diff --git a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
index 4ae7455..3314b83 100644
--- a/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
+++ b/xmlhelp/source/cxxhelp/provider/contentcaps.cxx
@@ -56,28 +56,28 @@ uno::Sequence< beans::Property > Content::getProperties(
         beans::Property(
             "IsReadOnly",
             -1,
-            getCppuBooleanType(),
+            cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
             "IsErrorDocument",
             -1,
-            getCppuBooleanType(),
+            cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
             "IsDocument",
             -1,
-            getCppuBooleanType(),
+            cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
         beans::Property(
             "IsFolder",
             -1,
-            getCppuBooleanType(),
+            cppu::UnoType<bool>::get(),
             beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
     props[idx++] =
@@ -108,35 +108,35 @@ uno::Sequence< beans::Property > Content::getProperties(
             beans::Property(
                 "KeywordList",
                 -1,
-                getCppuType( static_cast< const uno::Sequence< OUString >* >( 0 ) ),
+                cppu::UnoType<uno::Sequence< OUString >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
                 "KeywordRef",
                 -1,
-                getCppuType( static_cast< const uno::Sequence< uno::Sequence< OUString > >* >( 0 ) ),
+                cppu::UnoType<uno::Sequence< uno::Sequence< OUString > >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
                 "KeywordTitleForRef",
                 -1,
-                getCppuType( static_cast< const uno::Sequence< uno::Sequence< OUString > >* >( 0 ) ),
+                cppu::UnoType<uno::Sequence< uno::Sequence< OUString > >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
                 "KeywordAnchorForRef",
                 -1,
-                getCppuType( static_cast< const uno::Sequence< uno::Sequence< OUString > >* >( 0 ) ),
+                cppu::UnoType<uno::Sequence< uno::Sequence< OUString > >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
 
         props[idx++] =
             beans::Property(
                 "SearchScopes",
                 -1,
-                getCppuType( static_cast< const uno::Sequence< OUString >* >( 0 ) ),
+                cppu::UnoType<uno::Sequence< OUString >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY );
     }
 
@@ -167,22 +167,22 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands(
         ucb::CommandInfo(
             "getCommandInfo",
             -1,
-            getCppuVoidType()
+            cppu::UnoType<cppu::UnoVoidType>::get()
         ),
         ucb::CommandInfo(
             "getPropertySetInfo",
             -1,
-            getCppuVoidType()
+            cppu::UnoType<cppu::UnoVoidType>::get()
         ),
         ucb::CommandInfo(
             "getPropertyValues",
             -1,
-            getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) )
+            cppu::UnoType<uno::Sequence< beans::Property >>::get()
         ),
         ucb::CommandInfo(
             "setPropertyValues",
             -1,
-            getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) )
+            cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get()
         ),
         ucb::CommandInfo(
             "open",
commit 915dc38b7cc956066736d7f1b3287e4fbd2efca6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:25 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: I718cbc10c992b0515d3c4e2a62e38a6331a288d0

diff --git a/winaccessibility/source/UAccCOM/AccEditableText.cxx b/winaccessibility/source/UAccCOM/AccEditableText.cxx
index 701b044..f5d0d8e 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.cxx
+++ b/winaccessibility/source/UAccCOM/AccEditableText.cxx
@@ -417,7 +417,7 @@ void CAccEditableText::get_AnyFromOLECHAR(const ::rtl::OUString &ouName, const :
         }
 
         // Assign to Any object.
-        rAny.setValue(&seqTabStop, getCppuType((Sequence< ::com::sun::star::style::TabStop >*)0));
+        rAny.setValue(&seqTabStop, cppu::UnoType<Sequence< ::com::sun::star::style::TabStop >>::get());
     }
     else if(ouName.equals(L"ParaLineSpacing") )
     {
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx
index b6979a3..a6bdc90 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -2805,7 +2805,7 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
         }
     case TypeClass_SEQUENCE:
         {
-            if(pAny.getValueType() == getCppuType( (Sequence< ::rtl::OUString > *)0 ) )
+            if(pAny.getValueType() == cppu::UnoType<Sequence< ::rtl::OUString >>::get())
             {
                 Sequence < ::rtl::OUString > val;
                 pAny >>= val;
@@ -2820,7 +2820,7 @@ void CMAccessible::get_OLECHARFromAny(Any& pAny, OLECHAR* pChar)
                 }
                 wcscpy(pChar, pString.getStr());
             }
-            else if (pAny.getValueType() == getCppuType( (Sequence< ::com::sun::star::style::TabStop >* )0 ) )
+            else if (pAny.getValueType() == cppu::UnoType<Sequence< ::com::sun::star::style::TabStop >>::get())
             {
                 Sequence < ::com::sun::star::style::TabStop > val;
                 pAny >>= val;
diff --git a/winaccessibility/source/service/AccObject.cxx b/winaccessibility/source/service/AccObject.cxx
index fb4a864..17d35bd 100644
--- a/winaccessibility/source/service/AccObject.cxx
+++ b/winaccessibility/source/service/AccObject.cxx
@@ -440,7 +440,7 @@ void  AccObject::SetValue( Any pAny )
         pAny >>= strValue ;
 
     }
-    else if(pAny.getValueType() == getCppuType( (Sequence< ::rtl::OUString > *)0 ) )
+    else if(pAny.getValueType() == cppu::UnoType<Sequence< ::rtl::OUString >>::get())
     {
         Sequence< ::rtl::OUString > val;
         if (pAny >>= val)
commit 6dbcb1a3d1abd2c7909fe0d447e434657d9a5187
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:18 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: I3269d005634c66929e092d6a8fb33d71819b6971

diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 26e8885..60804fe 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -53,7 +53,7 @@ namespace // private
   {
     size_t len = aFlavor.MimeType.getLength();
     Type dtype = aFlavor.DataType;
-    return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || (dtype == cppu::UnoType<OUString>::get())));
+    return ((len > 0) && ((dtype == cppu::UnoType<Sequence<sal_Int8>>::get()) || (dtype == cppu::UnoType<OUString>::get())));
   }
 
   OUString NSStringToOUString( const NSString* cfString)
@@ -132,7 +132,7 @@ namespace // private
 
   inline bool isByteSequenceType(const Type& theType)
   {
-    return (theType == getCppuType((Sequence<sal_Int8>*)0));
+    return (theType == cppu::UnoType<Sequence<sal_Int8>>::get());
   }
 
   inline bool isOUStringType(const Type& theType)
@@ -486,7 +486,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat
         {
           oOOFlavor.MimeType = OUString::createFromAscii(flavorMap[i].OOoFlavor);
           oOOFlavor.HumanPresentableName = OUString::createFromAscii(flavorMap[i].HumanPresentableName);
-          oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? cppu::UnoType<OUString>::get() : getCppuType((Sequence<sal_Int8>*)0);
+          oOOFlavor.DataType = flavorMap[i].DataTypeOUString ? cppu::UnoType<OUString>::get() : cppu::UnoType<Sequence<sal_Int8>>::get();
           return oOOFlavor;
         }
     } // for
@@ -498,7 +498,7 @@ DataFlavor DataFlavorMapper::systemToOpenOfficeFlavor( const NSString* systemDat
     {
         oOOFlavor.MimeType = aTryFlavor;
         oOOFlavor.HumanPresentableName.clear();
-        oOOFlavor.DataType = getCppuType((Sequence<sal_Int8>*)0);
+        oOOFlavor.DataType = cppu::UnoType<Sequence<sal_Int8>>::get();
     }
 
     return oOOFlavor;
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index a6721a6..28843b2 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -375,13 +375,13 @@ void SAL_CALL DropTarget::initialize(const Sequence< Any >& aArguments)
 void SAL_CALL DropTarget::addDropTargetListener(const uno::Reference<XDropTargetListener>& dtl)
     throw(RuntimeException, std::exception)
 {
-    rBHelper.addListener(::getCppuType(&dtl), dtl);
+    rBHelper.addListener(cppu::UnoType<decltype(dtl)>::get(), dtl);
 }
 
 void SAL_CALL DropTarget::removeDropTargetListener(const uno::Reference<XDropTargetListener>& dtl)
     throw(RuntimeException, std::exception)
 {
-    rBHelper.removeListener(::getCppuType(&dtl), dtl);
+    rBHelper.removeListener(cppu::UnoType<decltype(dtl)>::get(), dtl);
 }
 
 sal_Bool SAL_CALL DropTarget::isActive(  ) throw(RuntimeException, std::exception)
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index 4b235de..05eebfc 100644
--- a/vcl/osx/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
@@ -39,7 +39,7 @@ namespace // private
     {
       size_t len = aFlavor.MimeType.getLength();
       Type dtype = aFlavor.DataType;
-      return ((len > 0) && ((dtype == getCppuType((Sequence<sal_Int8>*)0)) || (dtype == cppu::UnoType<OUString>::get())));
+      return ((len > 0) && ((dtype == cppu::UnoType<Sequence<sal_Int8>>::get()) || (dtype == cppu::UnoType<OUString>::get())));
     }
 
 } // namespace private
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 795930f..1dfac09 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -618,10 +618,10 @@ bool SelectionManager::convertData(
             if( aFlavor.MimeType.getToken( 0, ';', nIndex ) == "charset=utf-16" )
                 aFlavor.DataType = cppu::UnoType<OUString>::get();
             else
-                aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
+                aFlavor.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
         }
         else
-            aFlavor.DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
+            aFlavor.DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
 
         if( xTransferable->isDataFlavorSupported( aFlavor ) )
         {
@@ -633,7 +633,7 @@ bool SelectionManager::convertData(
                 rData = Sequence< sal_Int8 >( reinterpret_cast<sal_Int8 const *>(aString.getStr()), aString.getLength() * sizeof( sal_Unicode ) );
                 bSuccess = true;
             }
-            else if( aValue.getValueType() == getCppuType( (Sequence< sal_Int8 >*)0 ) )
+            else if( aValue.getValueType() == cppu::UnoType<Sequence< sal_Int8 >>::get() )
             {
                 aValue >>= rData;
                 bSuccess = true;
@@ -1317,7 +1317,7 @@ bool SelectionManager::getPasteDataTypes( Atom selection, Sequence< DataFlavor >
             {
                 int nFormat;
                 pFlavors->MimeType = convertTypeFromNative( *pAtoms, selection, nFormat );
-                pFlavors->DataType = getCppuType( (Sequence< sal_Int8 >*)0 );
+                pFlavors->DataType = cppu::UnoType<Sequence< sal_Int8 >>::get();
                 sal_Int32 nIndex = 0;
                 if( pFlavors->MimeType.getToken( 0, ';', nIndex ) == "text/plain" )
                 {
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index ccc6fb5..e2f427c 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -92,7 +92,7 @@ Sequence< DataFlavor > SAL_CALL X11Transferable::getTransferDataFlavors()
 sal_Bool SAL_CALL X11Transferable::isDataFlavorSupported( const DataFlavor& aFlavor )
     throw(RuntimeException, std::exception)
 {
-    if( aFlavor.DataType != getCppuType( (Sequence< sal_Int8 >*)0 ) )
+    if( aFlavor.DataType != cppu::UnoType<Sequence< sal_Int8 >>::get() )
     {
         if( ! aFlavor.MimeType.equalsIgnoreAsciiCase( "text/plain;charset=utf-16" ) &&
             aFlavor.DataType == cppu::UnoType<OUString>::get() )
commit 0ca607e0674d35dec1412ed470d213a5097d33f0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:13 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: I5be2bed2203cd3807d3d9659e09e5f60f7a3257c

diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx
index bce5b53..d7837d2 100644
--- a/vbahelper/source/vbahelper/vbashapes.cxx
+++ b/vbahelper/source/vbahelper/vbashapes.cxx
@@ -134,7 +134,7 @@ ScVbaShapes::getShapesByArrayIndices( const uno::Any& Index  ) throw (uno::Runti
 
     uno::Reference< script::XTypeConverter > xConverter = getTypeConverter(mxContext);
     uno::Any aConverted;
-    aConverted = xConverter->convertTo( Index, getCppuType((uno::Sequence< uno::Any >*)0) );
+    aConverted = xConverter->convertTo( Index, cppu::UnoType<uno::Sequence< uno::Any >>::get() );
 
     uno::Sequence< uno::Any > sIndices;
     aConverted >>= sIndices;
commit 63d4636da8c0bb890016baf22702d944d72c6fd1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:43:09 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: I6b0974024e61e02639106d4ca3abcdcdb8e6fa87

diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 46489d7..f445565 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -298,7 +298,7 @@ void ConfigItem::impl_unpackLocalizedProperties(    const   Sequence< OUString >
     for( nSourceCounter=0; nSourceCounter<nSourceSize; ++nSourceCounter )
     {
         // If item a special localized one ... split it and insert his parts to output lists ...
-        if( lInValues[nSourceCounter].getValueType() == ::getCppuType( (const Sequence< PropertyValue >*)NULL ) )
+        if( lInValues[nSourceCounter].getValueType() == cppu::UnoType<Sequence<PropertyValue>>::get() )
         {
             lInValues[nSourceCounter] >>= lProperties;
             nPropertiesSize = lProperties.getLength();
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index cb46c6d..e5b0d4d 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -290,7 +290,7 @@ bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (
 Type SAL_CALL GlobalEventConfig_Impl::getElementType(  ) throw (RuntimeException)
 {
     //DF definitely not sure about this??
-    return ::getCppuType((const Sequence<beans::PropertyValue>*)0);
+    return cppu::UnoType<Sequence<beans::PropertyValue>>::get();
 }
 
 bool SAL_CALL GlobalEventConfig_Impl::hasElements(  ) throw (RuntimeException)
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index da64f94..34b0fef 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -101,7 +101,7 @@ void    SvtAppFilterOptions_Impl::ImplCommit()
     Sequence<Any> aValues(aNames.getLength());
     Any* pValues = aValues.getArray();
 
-    const Type& rType = ::getBooleanCppuType();
+    const Type& rType = cppu::UnoType<bool>::get();
     pValues[0].setValue(&bLoadVBA, rType);
     pValues[1].setValue(&bSaveVBA, rType);
 
@@ -386,7 +386,7 @@ void SvtFilterOptions::ImplCommit()
     Sequence<Any> aValues(aNames.getLength());
     Any* pValues = aValues.getArray();
 
-    const Type& rType = ::getBooleanCppuType();
+    const Type& rType = cppu::UnoType<bool>::get();
     for(int nProp = 0; nProp < aNames.getLength(); nProp++)
     {
         sal_uLong nFlag = lcl_GetFlag(nProp);
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index e86c8dd..0849409 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -672,7 +672,7 @@ bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyN
     osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get());
 
     bool bRet = false;
-    const uno::Type &rBOOL     = ::getBooleanCppuType();
+    const uno::Type &rBOOL     = cppu::UnoType<bool>::get();
     const uno::Type &rINT16    = cppu::UnoType<sal_Int16>::get();
     const uno::Type &rINT32    = cppu::UnoType<sal_Int32>::get();
 
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index bb6f1d5..f2b7e42 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -161,7 +161,7 @@ void SfxMiscCfg::ImplCommit()
     Sequence<Any> aValues(rNames.getLength());
     Any* pValues = aValues.getArray();
 
-    const Type& rType = ::getBooleanCppuType();
+    const Type& rType = cppu::UnoType<bool>::get();
     for(int nProp = 0; nProp < rNames.getLength(); nProp++)
     {
         switch(nProp)
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 47a190f..f0b4a32 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -791,7 +791,7 @@ void SvtLoadOptions_Impl::ImplCommit()
     Sequence< OUString > aNames(1);
     aNames[0] = cUserDefinedSettings;
     Sequence< Any > aValues( 1 );
-    aValues[0].setValue(&bLoadUserDefinedSettings, ::getBooleanCppuType());
+    aValues[0].setValue(&bLoadUserDefinedSettings, cppu::UnoType<bool>::get());
     PutProperties( aNames, aValues );
 }
 
commit 15bdb0ae87fb7514d224657ce74e92bdad8f9c00
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:42:56 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: I0ecb96d6f26c827640f3329c81884001f860090d

diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index f97d2e3..8bdd20d 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -32,8 +32,8 @@
 
 
 
-#define CPPU_TYPE( T )      getCppuType( static_cast< T * >( 0 ) )
-#define CPPU_TYPE_REF( T )  CPPU_TYPE( com::sun::star::uno::Reference< T > )
+#define CPPU_TYPE( T )      cppu::UnoType<T>::get()
+#define CPPU_TYPE_REF( T )  CPPU_TYPE( T )
 
 // XTypeProvider impl. internals
 
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index d962af6..1732e70 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.cxx
@@ -226,7 +226,7 @@ class PropertyValues : public PropertyValuesVector {};
     GETVALUE_IMPL_TYPE( _type_,                                               \
                         _type_name_,                                          \
                         _member_name_,                                        \
-                        getCppuType( static_cast< const _type_ * >( 0 ) ) )
+                        cppu::UnoType<_type_>::get() )
 
 #define SETVALUE_IMPL( _prop_name_, _type_name_, _member_name_, _value_ )     \
                                                                               \
@@ -333,7 +333,7 @@ sal_Bool SAL_CALL PropertyValueSet::getBoolean( sal_Int32 columnIndex )
     throw( SQLException, RuntimeException, std::exception )
 {
     GETVALUE_IMPL_TYPE(
-            bool, BOOLEAN_VALUE_SET, bBoolean, getCppuBooleanType() );
+            bool, BOOLEAN_VALUE_SET, bBoolean, cppu::UnoType<bool>::get() );
 }
 
 
diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 3a94891..231585c 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -51,7 +51,7 @@ static const uno::Type& sal_Int32_getCppuType()
 
 static const uno::Type& sal_Bool_getCppuType()
 {
-    return getCppuBooleanType();
+    return cppu::UnoType<bool>::get();
 }
 
 static const PropertyInfo aPropertyTable[] =
diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index 0b389eb..30a1422 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.cxx
@@ -405,7 +405,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
         return DataType::SQLNULL;
 
     if ( m_aProps.getConstArray()[ column - 1 ].Type
-            == getCppuVoidType() )
+            == cppu::UnoType<cppu::UnoVoidType>::get() )
     {
         // No type given. Try UCB's Properties Manager...
 
@@ -458,7 +458,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
 
     if ( rType == cppu::UnoType<OUString>::get() )
         nType = DataType::VARCHAR;  // XRow::getString
-    else if ( rType == getCppuBooleanType() )
+    else if ( rType == cppu::UnoType<bool>::get() )
         nType = DataType::BIT;      // XRow::getBoolean
     else if ( rType == cppu::UnoType<sal_Int32>::get() )
         nType = DataType::INTEGER;  // XRow::getInt
@@ -472,7 +472,7 @@ sal_Int32 SAL_CALL ResultSetMetaData::getColumnType( sal_Int32 column )
         nType = DataType::REAL;     // XRow::getFloat
     else if ( rType == cppu::UnoType<double>::get() )
         nType = DataType::DOUBLE;   // XRow::getDouble
-    else if ( rType == getCppuType( static_cast< const Sequence< sal_Int8 > * >( 0 ) ) )
+    else if ( rType == cppu::UnoType<Sequence<sal_Int8>>::get() )
         nType = DataType::VARBINARY;// XRow::getBytes
     else if ( rType == cppu::UnoType<Date>::get() )
         nType = DataType::DATE;     // XRow::getDate
commit 018e85387e1ed62ab8188ad4cb0728ee2a0a797c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 1 08:42:49 2015 +0200

    Replace remaining getCppuType et al with cppu::UnoType
    
    Change-Id: I8d1a4fda1cdd679f20de37271f7b832da4fb0c9a

diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index c1d6c5f..dfa021a 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -95,8 +95,7 @@ template<typename T> T CachedContentResultSet::rowOriginGet(
             {
                 Any aConvAny = xConverter->convertTo(
                     rValue,
-                    getCppuType( static_cast<
-                                 const T * >( 0 ) ) );
+                    cppu::UnoType<T>::get() );
                 m_bLastCachedReadWasNull = !( aConvAny >>= aRet );
             }
             catch (const IllegalArgumentException&)
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 5c309af..670325f 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -236,7 +236,7 @@ CommandProcessorInfo::CommandProcessorInfo()
         = ucb::CommandInfo(
             OUString( GETCOMMANDINFO_NAME ), // Name
             GETCOMMANDINFO_HANDLE, // Handle
-            getCppuVoidType() ); // ArgType
+            cppu::UnoType<cppu::UnoVoidType>::get() ); // ArgType
     (*m_pInfo)[ 1 ]
         = ucb::CommandInfo(
             OUString( GLOBALTRANSFER_NAME ), // Name
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 87828a8..ae2ae2a 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -90,7 +90,7 @@ static const com::sun::star::uno::Type& enum_getCppuType()
 
 static const com::sun::star::uno::Type& sal_Bool_getCppuType()
 {
-    return getCppuBooleanType();
+    return cppu::UnoType<bool>::get();
 }
 
 static const com::sun::star::uno::Type& byte_getCppuType()
@@ -100,42 +100,42 @@ static const com::sun::star::uno::Type& byte_getCppuType()
 
 static const com::sun::star::uno::Type& Sequence_CrossReference_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::uno::Sequence<
-                        com::sun::star::ucb::CrossReference > * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::uno::Sequence<
+                        com::sun::star::ucb::CrossReference >>::get();
 }
 
 static const com::sun::star::uno::Type& DateTime_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::util::DateTime * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::util::DateTime>::get();
 }
 
 static const com::sun::star::uno::Type& Sequence_byte_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::uno::Sequence< sal_Int8 > * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::uno::Sequence< sal_Int8 >>::get();
 }
 
 static const com::sun::star::uno::Type& Sequence_DocumentHeaderField_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::uno::Sequence<
-                        com::sun::star::ucb::DocumentHeaderField > * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::uno::Sequence<
+                        com::sun::star::ucb::DocumentHeaderField >>::get();
 }
 
 static const com::sun::star::uno::Type& XDataContainer_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::uno::Reference<
-            com::sun::star::ucb::XDataContainer > * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::uno::Reference<
+            com::sun::star::ucb::XDataContainer >>::get();
 }
 
 static const com::sun::star::uno::Type& Sequence_RecipientInfo_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::uno::Sequence<
-                        com::sun::star::ucb::RecipientInfo > * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::uno::Sequence<
+                        com::sun::star::ucb::RecipientInfo >>::get();
 }
 
 static const com::sun::star::uno::Type& RuleSet_getCppuType()
@@ -145,16 +145,16 @@ static const com::sun::star::uno::Type& RuleSet_getCppuType()
 
 static const com::sun::star::uno::Type& Sequence_SendInfo_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::uno::Sequence<
-                        com::sun::star::ucb::SendInfo > * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::uno::Sequence<
+                        com::sun::star::ucb::SendInfo >>::get();
 }
 
 static const com::sun::star::uno::Type& Sequence_SendMediaTypes_getCppuType()
 {
-    return getCppuType(
-        static_cast< com::sun::star::uno::Sequence<
-                        com::sun::star::ucb::SendMediaTypes > * >( 0 ) );
+    return cppu::UnoType<
+        com::sun::star::uno::Sequence<
+                        com::sun::star::ucb::SendMediaTypes >>::get();
 }
 
 
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index bd42b27..5e4c81e 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -1957,7 +1957,7 @@ SRSPropertySetInfo::SRSPropertySetInfo()
 
     maProps[1].Name = "IsRowCountFinal";
     maProps[1].Handle = -1;
-    maProps[1].Type = ::getBooleanCppuType();
+    maProps[1].Type = cppu::UnoType<bool>::get();
     maProps[1].Attributes = -1;
 }
 
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index 1fc045a5..adcd6b4 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -1508,10 +1508,10 @@ namespace cmis
         static const beans::Property aGenericProperties[] =
         {
             beans::Property( OUString( "IsDocument" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "IsFolder" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "Title" ),
                 -1, cppu::UnoType<OUString>::get(),
@@ -1523,7 +1523,7 @@ namespace cmis
                 -1, cppu::UnoType<OUString>::get(),
                 beans::PropertyAttribute::BOUND ),
             beans::Property( OUString( "IsReadOnly" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "DateCreated" ),
                 -1, cppu::UnoType<util::DateTime>::get(),
@@ -1535,25 +1535,25 @@ namespace cmis
                 -1, cppu::UnoType<sal_Int64>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "CreatableContentsInfo" ),
-                -1, getCppuType( static_cast< const uno::Sequence< ucb::ContentInfo > * >( 0 ) ),
+                -1, cppu::UnoType<uno::Sequence< ucb::ContentInfo >>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "MediaType" ),
                 -1, cppu::UnoType<OUString>::get(),
                 beans::PropertyAttribute::BOUND ),
             beans::Property( OUString( "CmisProperties" ),
-                -1, getCppuType( static_cast< const uno::Sequence< document::CmisProperty> * >( 0 ) ),
+                -1, cppu::UnoType<uno::Sequence< document::CmisProperty>>::get(),
                 beans::PropertyAttribute::BOUND ),
             beans::Property( OUString( "IsVersionable" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "CanCheckOut" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "CanCancelCheckOut" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "CanCheckIn" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
         };
 
@@ -1569,21 +1569,21 @@ namespace cmis
             // Required commands
             ucb::CommandInfo
             ( OUString( "getCommandInfo" ),
-              -1, getCppuVoidType() ),
+              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertySetInfo" ),
-              -1, getCppuVoidType() ),
+              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertyValues" ),
-              -1, getCppuType( static_cast<uno::Sequence< beans::Property > * >( 0 ) ) ),
+              -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
             ucb::CommandInfo
             ( OUString( "setPropertyValues" ),
-              -1, getCppuType( static_cast<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
+              -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ),
 
             // Optional standard commands
             ucb::CommandInfo
             ( OUString( "delete" ),
-              -1, getCppuBooleanType() ),
+              -1, cppu::UnoType<bool>::get() ),
             ucb::CommandInfo
             ( OUString( "insert" ),
               -1, cppu::UnoType<ucb::InsertCommandArgument2>::get() ),
@@ -1592,14 +1592,14 @@ namespace cmis
               -1, cppu::UnoType<ucb::OpenCommandArgument2>::get() ),
 
             // Mandatory CMIS-only commands
-            ucb::CommandInfo ( OUString( "checkout" ), -1, getCppuVoidType() ),
-            ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, getCppuVoidType() ),
+            ucb::CommandInfo ( OUString( "checkout" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
+            ucb::CommandInfo ( OUString( "cancelCheckout" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
             ucb::CommandInfo ( OUString( "checkIn" ), -1,
                     cppu::UnoType<ucb::TransferInfo>::get() ),
-            ucb::CommandInfo ( OUString( "updateProperties" ), -1, getCppuVoidType() ),
+            ucb::CommandInfo ( OUString( "updateProperties" ), -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
             ucb::CommandInfo
             ( OUString( "getAllVersions" ),
-              -1, getCppuType( static_cast<uno::Sequence< document::CmisVersion > * >( 0 ) ) ),
+              -1, cppu::UnoType<uno::Sequence< document::CmisVersion >>::get() ),
 
 
             // Folder Only, omitted if not a folder
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index f140a15..bccca5a 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -243,16 +243,16 @@ namespace cmis
         static const beans::Property aGenericProperties[] =
         {
             beans::Property( OUString( "IsDocument" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "IsFolder" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
             beans::Property( OUString( "Title" ),
                 -1, cppu::UnoType<OUString>::get(),
                 beans::PropertyAttribute::BOUND ),
             beans::Property( OUString( "IsReadOnly" ),
-                -1, getCppuBooleanType(),
+                -1, cppu::UnoType<bool>::get(),
                 beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ),
         };
 
@@ -268,16 +268,16 @@ namespace cmis
             // Required commands
             ucb::CommandInfo
             ( OUString( "getCommandInfo" ),
-              -1, getCppuVoidType() ),
+              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertySetInfo" ),
-              -1, getCppuVoidType() ),
+              -1, cppu::UnoType<cppu::UnoVoidType>::get() ),
             ucb::CommandInfo
             ( OUString( "getPropertyValues" ),
-              -1, getCppuType( static_cast<uno::Sequence< beans::Property > * >( 0 ) ) ),
+              -1, cppu::UnoType<uno::Sequence< beans::Property >>::get() ),
             ucb::CommandInfo
             ( OUString( "setPropertyValues" ),
-              -1, getCppuType( static_cast<uno::Sequence< beans::PropertyValue > * >( 0 ) ) ),
+              -1, cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get() ),
 
             // Optional standard commands
             ucb::CommandInfo
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index 96d05e1..59a827d 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -445,12 +445,12 @@ namespace ucb { namespace ucp { namespace ext
                 i_rTitle );
             xRow->appendBoolean( Property( OUString("IsDocument"),
                           -1,
-                          getCppuBooleanType(),
+                          cppu::UnoType<bool>::get(),
                           PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
                 false );
             xRow->appendBoolean( Property( OUString("IsFolder"),
                           -1,
-                          getCppuBooleanType(),
+                          cppu::UnoType<bool>::get(),
                           PropertyAttribute::BOUND | PropertyAttribute::READONLY ),
                 true );
         }
@@ -554,24 +554,22 @@ namespace ucb { namespace ucp { namespace ext
             CommandInfo(
                 OUString(  "getCommandInfo"  ),
                 -1,
-                getCppuVoidType()
+                cppu::UnoType<cppu::UnoVoidType>::get()
             ),
             CommandInfo(
                 OUString(  "getPropertySetInfo"  ),
                 -1,
-                getCppuVoidType()
+                cppu::UnoType<cppu::UnoVoidType>::get()
             ),
             CommandInfo(
                 OUString(  "getPropertyValues"  ),
                 -1,
-                getCppuType(
-                    static_cast< Sequence< Property > * >( 0 ) )
+                cppu::UnoType<Sequence< Property >>::get()
             ),
             CommandInfo(
                 OUString(  "setPropertyValues"  ),
                 -1,
-                getCppuType(

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list