[Libreoffice-commits] core.git: sd/source svx/source sw/source
Julien Nabet
serval2412 at yahoo.fr
Thu May 8 09:13:37 PDT 2014
sd/source/core/stlsheet.cxx | 6
sd/source/core/text/textapi.cxx | 2
sd/source/filter/xml/sdxmlwrp.cxx | 14 -
sd/source/ui/animations/CustomAnimationDialog.cxx | 2
sd/source/ui/slideshow/slideshow.cxx | 8
sd/source/ui/unoidl/DrawController.cxx | 8
sd/source/ui/unoidl/UnoDocumentSettings.cxx | 32 +--
sd/source/ui/unoidl/randomnode.cxx | 2
sd/source/ui/unoidl/unolayer.cxx | 6
sd/source/ui/unoidl/unomodel.cxx | 4
sd/source/ui/unoidl/unoobj.cxx | 20 +-
sd/source/ui/unoidl/unopage.cxx | 124 ++++++-------
sd/source/ui/unoidl/unopback.cxx | 6
svx/source/table/cell.cxx | 10 -
svx/source/table/tablecolumn.cxx | 4
svx/source/table/tablerow.cxx | 4
svx/source/unodraw/UnoNamespaceMap.cxx | 2
svx/source/unodraw/XPropertyTable.cxx | 4
svx/source/unodraw/unobtabl.cxx | 2
svx/source/unodraw/unoctabl.cxx | 2
svx/source/unodraw/unopool.cxx | 2
svx/source/unodraw/unoprov.cxx | 198 +++++++++++-----------
svx/source/unodraw/unoshape.cxx | 2
svx/source/xml/xmlxtimp.cxx | 4
sw/source/core/fields/textapi.cxx | 2
sw/source/core/txtnode/fmtatr2.cxx | 2
sw/source/core/uibase/dbui/mailmergehelper.cxx | 2
sw/source/core/unocore/unocoll.cxx | 2
sw/source/core/unocore/unoframe.cxx | 2
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unosett.cxx | 98 +++++-----
sw/source/core/unocore/unostyle.cxx | 6
sw/source/filter/html/htmlforw.cxx | 52 ++---
sw/source/filter/xml/swxml.cxx | 6
sw/source/filter/xml/wrtxml.cxx | 6
sw/source/ui/vba/vbapalette.cxx | 2
36 files changed, 325 insertions(+), 325 deletions(-)
New commits:
commit 76e8779787afef2e1e2b04adc8eaffe0b4d1f897
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu May 8 18:12:01 2014 +0200
Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part6
Change-Id: Ib523206d67ad13416557be1b37a58ba7a9791ca5
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 7dd6df6..5f4a7eb 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -78,9 +78,9 @@ static SvxItemPropertySet& GetStylePropertySet()
{
static const SfxItemPropertyMapEntry aFullPropertyMap_Impl[] =
{
- { OUString("Family"), WID_STYLE_FAMILY, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
+ { OUString("Family"), WID_STYLE_FAMILY, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, cppu::UnoType<XNameContainer>::get(), 0, 0},
- { OUString("DisplayName"), WID_STYLE_DISPNAME, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0},
+ { OUString("DisplayName"), WID_STYLE_DISPNAME, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0},
{ OUString("Hidden"), WID_STYLE_HIDDEN, ::getCppuType((bool*)0), 0, 0},
SVX_UNOEDIT_NUMBERING_PROPERTIE,
@@ -1175,7 +1175,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro
if( pEntry->aType != aAny.getValueType() )
{
// since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
- if( ( pEntry->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
+ if( ( pEntry->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
{
sal_Int32 nValue = 0;
aAny >>= nValue;
diff --git a/sd/source/core/text/textapi.cxx b/sd/source/core/text/textapi.cxx
index 238172b..0eedb57 100644
--- a/sd/source/core/text/textapi.cxx
+++ b/sd/source/core/text/textapi.cxx
@@ -121,7 +121,7 @@ const SvxItemPropertySet* ImplGetSdTextPortionPropertyMap()
SVX_UNOEDIT_OUTLINER_PROPERTIES,
SVX_UNOEDIT_PARA_PROPERTIES,
{OUString("TextField"), EE_FEATURE_FIELD, ::getCppuType((const Reference< XTextField >*)0), PropertyAttribute::READONLY, 0 },
- {OUString("TextPortionType"), WID_PORTIONTYPE, ::getCppuType((const OUString*)0), PropertyAttribute::READONLY, 0 },
+ {OUString("TextPortionType"), WID_PORTIONTYPE, ::cppu::UnoType<OUString>::get(), PropertyAttribute::READONLY, 0 },
{OUString("TextUserDefinedAttributes"), EE_CHAR_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0},
{OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const Reference< XNameContainer >*)0) , 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 7b77d2c..401b902 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -441,9 +441,9 @@ bool SdXMLFilter::Import( ErrCode& nError )
PropertyMapEntry const aImportInfoMap[] =
{
// necessary properties for XML progress bar at load time
- { OUString("ProgressRange"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("ProgressMax"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("ProgressCurrent"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("Preview"), 0, ::getCppuType((const sal_Bool*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PageLayouts"), 0, ::getCppuType((const uno::Reference< container::XNameAccess >*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("PrivateData"), 0,
@@ -819,12 +819,12 @@ bool SdXMLFilter::Export()
/** property map for export info set */
PropertyMapEntry const aExportInfoMap[] =
{
- { OUString("ProgressRange"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("ProgressMax"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("ProgressCurrent"), 0, ::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressRange"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressMax"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("ProgressCurrent"), 0, ::cppu::UnoType<sal_Int32>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("UsePrettyPrinting"),0, ::getBooleanCppuType(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
- { OUString("PageLayoutNames"), 0, ::getCppuType((const OUString*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
+ { OUString("PageLayoutNames"), 0, ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("BaseURI"), 0,
::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 420fb4b..3335a17 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1800,7 +1800,7 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent,
if( pSet->getPropertyState( nHandleRepeat ) != STLPropertyState_AMBIGUOUS )
{
Any aRepeatCount( pSet->getPropertyValue( nHandleRepeat ) );
- if( (aRepeatCount.getValueType() == ::getCppuType((const double*)0)) || !aRepeatCount.hasValue() )
+ if( (aRepeatCount.getValueType() == ::cppu::UnoType<double>::get()) || !aRepeatCount.hasValue() )
{
double fRepeat = 0.0;
if( aRepeatCount.hasValue() )
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index aa81b00..89c35ef 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -111,9 +111,9 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
static const SfxItemPropertyMapEntry aPresentationPropertyMap_Impl[] =
{
{ OUString("AllowAnimations"), ATTR_PRESENT_ANIMATION_ALLOWED, ::getBooleanCppuType(), 0, 0 },
- { OUString("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("Display"), ATTR_PRESENT_DISPLAY, ::getCppuType((const sal_Int32*)0), 0, 0 },
- { OUString("FirstPage"), ATTR_PRESENT_DIANAME, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString("CustomShow"), ATTR_PRESENT_CUSTOMSHOW, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("Display"), ATTR_PRESENT_DISPLAY, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("FirstPage"), ATTR_PRESENT_DIANAME, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("IsAlwaysOnTop"), ATTR_PRESENT_ALWAYS_ON_TOP, ::getBooleanCppuType(), 0, 0 },
{ OUString("IsAutomatic"), ATTR_PRESENT_MANUEL, ::getBooleanCppuType(), 0, 0 },
{ OUString("IsEndless"), ATTR_PRESENT_ENDLESS, ::getBooleanCppuType(), 0, 0 },
@@ -122,7 +122,7 @@ const SfxItemPropertyMapEntry* ImplGetPresentationPropertyMap()
{ OUString("IsMouseVisible"), ATTR_PRESENT_MOUSE, ::getBooleanCppuType(), 0, 0 },
{ OUString("IsShowLogo"), ATTR_PRESENT_SHOW_PAUSELOGO, ::getBooleanCppuType(), 0, 0 },
{ OUString("IsTransitionOnClick"), ATTR_PRESENT_CHANGE_PAGE, ::getBooleanCppuType(), 0, 0 },
- { OUString("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, ::getCppuType((const sal_Int32*)0), 0, 0 },
+ { OUString("Pause"), ATTR_PRESENT_PAUSE_TIMEOUT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString("StartWithNavigator"), ATTR_PRESENT_NAVIGATOR, ::getBooleanCppuType(), 0, 0 },
{ OUString("UsePen"), ATTR_PRESENT_PEN, ::getBooleanCppuType(), 0, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index a4cd1c4..78f7bb5 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -732,12 +732,12 @@ void DrawController::FillPropertyTable (
rProperties.push_back(
beans::Property("ZoomValue",
PROPERTY_ZOOMVALUE,
- ::getCppuType((const sal_Int16*)0),
+ ::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property("ZoomType",
PROPERTY_ZOOMTYPE,
- ::getCppuType((const sal_Int16*)0),
+ ::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property("ViewOffset",
@@ -753,12 +753,12 @@ void DrawController::FillPropertyTable (
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("UpdateAcc") ),
PROPERTY_UPDATEACC,
- ::getCppuType((const sal_Int16*)0),
+ ::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND ));
rProperties.push_back(
beans::Property( OUString( RTL_CONSTASCII_USTRINGPARAM("PageChange") ),
PROPERTY_PAGE_CHANGE,
- ::getCppuType((const sal_Int16*)0),
+ ::cppu::UnoType<sal_Int16>::get(),
beans::PropertyAttribute::BOUND ));
}
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index b8fbd1b..f84a973 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -154,23 +154,23 @@ enum SdDocumentSettingsPropertyHandles
{ OUString("IsPrintNotes"), HANDLE_PRINTNOTES, ::getBooleanCppuType(), 0, MID_PRINTER },
{ OUString("IsPrintHandout"), HANDLE_PRINTHANDOUT, ::getBooleanCppuType(), 0, MID_PRINTER },
{ OUString("IsPrintOutline"), HANDLE_PRINTOUTLINE, ::getBooleanCppuType(), 0, MID_PRINTER },
- { OUString("SlidesPerHandout"), HANDLE_SLIDESPERHANDOUT, ::getCppuType((const sal_Int16*)0), 0, MID_PRINTER },
+ { OUString("SlidesPerHandout"), HANDLE_SLIDESPERHANDOUT, ::cppu::UnoType<sal_Int16>::get(), 0, MID_PRINTER },
{ OUString("HandoutsHorizontal"), HANDLE_HANDOUTHORIZONTAL, ::getBooleanCppuType(), 0, MID_PRINTER },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
static PropertyMapEntry const aDrawSettingsInfoMap[] =
{
- { OUString("MeasureUnit"), HANDLE_MEASUREUNIT, ::getCppuType((const sal_Int16*)0), 0, 0 },
- { OUString("ScaleNumerator"), HANDLE_SCALE_NUM, ::getCppuType((const sal_Int32*)0), 0, 0 },
- { OUString("ScaleDenominator"), HANDLE_SCALE_DOM, ::getCppuType((const sal_Int32*)0), 0, 0 },
+ { OUString("MeasureUnit"), HANDLE_MEASUREUNIT, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { OUString("ScaleNumerator"), HANDLE_SCALE_NUM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("ScaleDenominator"), HANDLE_SCALE_DOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
static PropertyMapEntry const aCommonSettingsInfoMap[] =
{
- { OUString("DefaultTabStop"), HANDLE_TABSTOP, ::getCppuType((const sal_Int32*)0), 0, 0 },
- { OUString("PrinterName"), HANDLE_PRINTERNAME, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString("DefaultTabStop"), HANDLE_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("PrinterName"), HANDLE_PRINTERNAME, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("PrinterSetup"), HANDLE_PRINTERJOB, ::getCppuType((const uno::Sequence < sal_Int8 > *)0), 0, MID_PRINTER },
{ OUString("IsPrintPageName"), HANDLE_PRINTPAGENAME, ::getBooleanCppuType(), 0, MID_PRINTER },
@@ -182,23 +182,23 @@ enum SdDocumentSettingsPropertyHandles
{ OUString("IsPrintBooklet"), HANDLE_PRINTBOOKLET, ::getBooleanCppuType(), 0, MID_PRINTER },
{ OUString("IsPrintBookletFront"), HANDLE_PRINTBOOKLETFRONT, ::getBooleanCppuType(), 0, MID_PRINTER },
{ OUString("IsPrintBookletBack"), HANDLE_PRINTBOOKLETBACK, ::getBooleanCppuType(), 0, MID_PRINTER },
- { OUString("PrintQuality"), HANDLE_PRINTQUALITY, ::getCppuType((const sal_Int32*)0), 0, MID_PRINTER },
- { OUString("ColorTableURL"), HANDLE_COLORTABLEURL, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("DashTableURL"), HANDLE_DASHTABLEURL, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("LineEndTableURL"), HANDLE_LINEENDTABLEURL, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("HatchTableURL"), HANDLE_HATCHTABLEURL, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString("PrintQuality"), HANDLE_PRINTQUALITY, ::cppu::UnoType<sal_Int32>::get(), 0, MID_PRINTER },
+ { OUString("ColorTableURL"), HANDLE_COLORTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("DashTableURL"), HANDLE_DASHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("LineEndTableURL"), HANDLE_LINEENDTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("HatchTableURL"), HANDLE_HATCHTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("GradientTableURL"), HANDLE_GRADIENTTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("BitmapTableURL"), HANDLE_BITMAPTABLEURL, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("ForbiddenCharacters"), HANDLE_FORBIDDENCHARS, ::getCppuType((const Reference< XForbiddenCharacters >*)0), 0, 0 },
{ OUString("ApplyUserData"), HANDLE_APPLYUSERDATA, ::getBooleanCppuType(), 0, 0 },
- { OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::getCppuType((const sal_Int32*)0), 0, 0 },
+ { OUString("PageNumberFormat"), HANDLE_PAGENUMFMT, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
{ OUString("ParagraphSummation"), HANDLE_PARAGRAPHSUMMATION, ::getBooleanCppuType(), 0, 0 },
- { OUString("CharacterCompressionType"),HANDLE_CHARCOMPRESS, ::getCppuType((sal_Int16*)0), 0, 0 },
+ { OUString("CharacterCompressionType"),HANDLE_CHARCOMPRESS, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("IsKernAsianPunctuation"),HANDLE_ASIANPUNCT, ::getBooleanCppuType(), 0, 0 },
{ OUString("UpdateFromTemplate"), HANDLE_UPDATEFROMTEMPLATE, ::getBooleanCppuType(), 0, 0 },
- { OUString("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString("PrinterIndependentLayout"),HANDLE_PRINTER_INDEPENDENT_LAYOUT,::cppu::UnoType<sal_Int16>::get(), 0, 0 },
// --> #i33095#
{ OUString("LoadReadonly"), HANDLE_LOAD_READONLY, ::getBooleanCppuType(), 0, 0 },
{ OUString("SaveVersionOnClose"), HANDLE_SAVE_VERSION, ::getBooleanCppuType(), 0, 0 },
diff --git a/sd/source/ui/unoidl/randomnode.cxx b/sd/source/ui/unoidl/randomnode.cxx
index 40a1ebc..46b0098 100644
--- a/sd/source/ui/unoidl/randomnode.cxx
+++ b/sd/source/ui/unoidl/randomnode.cxx
@@ -242,7 +242,7 @@ void SAL_CALL RandomAnimationNode::initialize( const Sequence< Any >& aArguments
if( aArguments.getLength() != 1 )
throw IllegalArgumentException();
- if( aArguments[0].getValueType() == ::getCppuType((const sal_Int16*)0) )
+ if( aArguments[0].getValueType() == ::cppu::UnoType<sal_Int16>::get() )
{
aArguments[0] >>= mnPresetClass;
}
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index 405251d..118ec3f 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -69,9 +69,9 @@ const SvxItemPropertySet* ImplGetSdLayerPropertySet()
{ OUString(UNO_NAME_LAYER_LOCKED), WID_LAYER_LOCKED, ::getBooleanCppuType(), 0, 0 },
{ OUString(UNO_NAME_LAYER_PRINTABLE), WID_LAYER_PRINTABLE,::getBooleanCppuType(), 0, 0 },
{ OUString(UNO_NAME_LAYER_VISIBLE), WID_LAYER_VISIBLE, ::getBooleanCppuType(), 0, 0 },
- { OUString(UNO_NAME_LAYER_NAME), WID_LAYER_NAME, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("Title"), WID_LAYER_TITLE, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("Description"), WID_LAYER_DESC, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString(UNO_NAME_LAYER_NAME), WID_LAYER_NAME, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("Title"), WID_LAYER_TITLE, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("Description"), WID_LAYER_DESC, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
static SvxItemPropertySet aSDLayerPropertySet_Impl( aSdLayerPropertyMap_Impl, SdrObject::GetGlobalDrawObjectItemPool() );
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 5ef64b3..c0e45a4 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -184,9 +184,9 @@ const SvxItemPropertySet* ImplGetDrawModelPropertySet()
{
{ OUString("BuildId"), WID_MODEL_BUILDID, ::getCppuType(static_cast< const OUString * >(0)), 0, 0},
{ OUString(sUNO_Prop_CharLocale), WID_MODEL_LANGUAGE, ::getCppuType((const lang::Locale*)0), 0, 0},
- { OUString(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString(sUNO_Prop_TabStop), WID_MODEL_TABSTOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(sUNO_Prop_VisibleArea), WID_MODEL_VISAREA, ::getCppuType((const awt::Rectangle*)0), 0, 0},
- { OUString(sUNO_Prop_MapUnit), WID_MODEL_MAPUNIT, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0},
+ { OUString(sUNO_Prop_MapUnit), WID_MODEL_MAPUNIT, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString(sUNO_Prop_ForbiddenCharacters), WID_MODEL_FORBCHARS, ::getCppuType((const uno::Reference< i18n::XForbiddenCharacters > *)0), beans::PropertyAttribute::READONLY, 0},
{ OUString(sUNO_Prop_AutomContFocus), WID_MODEL_CONTFOCUS, ::getBooleanCppuType(), 0, 0},
{ OUString(sUNO_Prop_ApplyFrmDsgnMode), WID_MODEL_DSGNMODE, ::getBooleanCppuType(), 0, 0},
diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx
index 4062bc8..3a01a03 100644
--- a/sd/source/ui/unoidl/unoobj.cxx
+++ b/sd/source/ui/unoidl/unoobj.cxx
@@ -132,8 +132,8 @@ static SdTypesCache gImplTypesCache;
#define IMPRESS_MAP_ENTRIES \
{ OUString(UNO_NAME_OBJ_LEGACYFRAGMENT),WID_LEGACYFRAGMENT, cppu::UnoType<drawing::XShape>::get(), 0, 0},\
{ OUString(UNO_NAME_OBJ_ANIMATIONPATH), WID_ANIMPATH, cppu::UnoType<drawing::XShape>::get(), 0, 0},\
- { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0},\
- { OUString(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, ::getCppuType((const sal_Int32*)0), 0, 0},\
+ { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},\
+ { OUString(UNO_NAME_OBJ_DIMCOLOR), WID_DIMCOLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\
{ OUString(UNO_NAME_OBJ_DIMHIDE), WID_DIMHIDE, ::getBooleanCppuType(), 0, 0},\
{ OUString(UNO_NAME_OBJ_DIMPREV), WID_DIMPREV, ::getBooleanCppuType(), 0, 0},\
{ OUString(UNO_NAME_OBJ_EFFECT), WID_EFFECT, ::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\
@@ -142,17 +142,17 @@ static SdTypesCache gImplTypesCache;
{ OUString(UNO_NAME_OBJ_MASTERDEPENDENT),WID_MASTERDEPEND, ::getBooleanCppuType(), 0, 0},\
{ OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::getCppuType((const presentation::ClickAction*)0), 0, 0},\
{ OUString(UNO_NAME_OBJ_PLAYFULL), WID_PLAYFULL, ::getBooleanCppuType(), 0, 0},\
- { OUString(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, ::getCppuType((const sal_Int32*)0), 0, 0},\
+ { OUString(UNO_NAME_OBJ_PRESORDER), WID_PRESORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\
{ OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
- { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, ::getCppuType((const OUString*)0), 0, 0},\
+ { OUString(UNO_NAME_OBJ_SOUNDFILE), WID_SOUNDFILE, ::cppu::UnoType<OUString>::get(), 0, 0},\
{ OUString(UNO_NAME_OBJ_SOUNDON), WID_SOUNDON, ::getBooleanCppuType(), 0, 0},\
{ OUString(UNO_NAME_OBJ_SPEED), WID_SPEED, ::getCppuType((const presentation::AnimationSpeed*)0), 0, 0},\
{ OUString(UNO_NAME_OBJ_TEXTEFFECT), WID_TEXTEFFECT, ::getCppuType((const presentation::AnimationEffect*)0), 0, 0},\
- { OUString(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, ::getCppuType((const sal_Int32*)0), 0, 0},\
- { OUString(UNO_NAME_OBJ_VERB), WID_VERB, ::getCppuType((const sal_Int32*)0), 0, 0},\
+ { OUString(UNO_NAME_OBJ_BLUESCREEN), WID_BLUESCREEN, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { OUString(UNO_NAME_OBJ_VERB), WID_VERB, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\
{ OUString("IsAnimation"), WID_ISANIMATION, ::getBooleanCppuType(), 0, 0},\
- { OUString("NavigationOrder"), WID_NAVORDER, ::getCppuType((const sal_Int32*)0), 0, 0},\
- { OUString("PlaceholderText"), WID_PLACEHOLDERTEXT, ::getCppuType((const OUString*)0), 0, 0},\
+ { OUString("NavigationOrder"), WID_NAVORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\
+ { OUString("PlaceholderText"), WID_PLACEHOLDERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},\
{ OUString(), 0, css::uno::Type(), 0, 0 }
@@ -178,10 +178,10 @@ static SdTypesCache gImplTypesCache;
}
#define DRAW_MAP_ENTRIES\
- { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0},\
+ { OUString(UNO_NAME_OBJ_BOOKMARK), WID_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},\
{ OUString(UNO_NAME_OBJ_CLICKACTION), WID_CLICKACTION, ::getCppuType((const presentation::ClickAction*)0),0, 0},\
{ OUString(UNO_NAME_OBJ_STYLE), WID_STYLE, cppu::UnoType<style::XStyle>::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},\
- { OUString("NavigationOrder"), WID_NAVORDER, ::getCppuType((const sal_Int32*)0), 0, 0},\
+ { OUString("NavigationOrder"), WID_NAVORDER, ::cppu::UnoType<sal_Int32>::get(), 0, 0},\
{ OUString(), 0, css::uno::Type(), 0, 0 }
static const SfxItemPropertyMapEntry* lcl_GetDraw_SdXShapePropertySimpleMap_Impl()
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 3aaa96c..be10c83 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -106,21 +106,21 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
static const SfxItemPropertyMapEntry aDrawPagePropertyMap_Impl[] =
{
{ OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), beans::PropertyAttribute::MAYBEVOID,0},
- { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_CHANGE), WID_PAGE_CHANGE, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_DURATION), WID_PAGE_DURATION, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_PAGE_EFFECT), WID_PAGE_EFFECT, ::getCppuType((const presentation::FadeEffect*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0},
+ { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0},
{ OUString(UNO_NAME_PAGE_SPEED), WID_PAGE_SPEED, ::getCppuType((const presentation::AnimationSpeed*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_VISIBLE), WID_PAGE_VISIBLE, ::getBooleanCppuType(), 0, 0},
@@ -128,49 +128,49 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
{ OUString(sUNO_Prop_IsBackgroundVisible), WID_PAGE_BACKVIS, ::getBooleanCppuType(), 0, 0},
{ OUString(sUNO_Prop_IsBackgroundObjectsVisible), WID_PAGE_BACKOBJVIS, ::getBooleanCppuType(), 0, 0},
{ OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
- { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0},
- { OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::getCppuType((const double*)0), 0, 0},
+ { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString("HighResDuration"), WID_PAGE_HIGHRESDURATION, ::cppu::UnoType<double>::get(), 0, 0},
{ OUString("IsBackgroundDark") , WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
{ OUString("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0},
- { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0},
+ { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0},
{ OUString("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0},
{ OUString("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0},
- { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0},
- { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString("TransitionType"), WID_TRANSITION_TYPE, ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString("TransitionSubtype"), WID_TRANSITION_SUBTYPE, ::getCppuType((const sal_Int16*)0), 0, 0},
+ { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString("TransitionType"), WID_TRANSITION_TYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { OUString("TransitionSubtype"), WID_TRANSITION_SUBTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString("TransitionDirection"), WID_TRANSITION_DIRECTION, ::getCppuType((const sal_Bool*)0), 0, 0},
- { OUString("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString("TransitionDuration"), WID_TRANSITION_DURATION, ::getCppuType((const double*)0), 0, 0},
+ { OUString("TransitionFadeColor"), WID_TRANSITION_FADE_COLOR, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString("TransitionDuration"), WID_TRANSITION_DURATION, ::cppu::UnoType<double>::get(), 0, 0},
{ OUString("LoopSound"), WID_LOOP_SOUND, ::getBooleanCppuType(), 0, 0},
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
#define DRAW_PAGE_NOTES_PROPERTIES \
- { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0}, \
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \
- { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \
- { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \
- { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},\
{ OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0}, \
- { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0), 0, 0}, \
+ { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0}, \
- { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0}, \
+ { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ OUString("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0}, \
{ OUString("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0}, \
{ OUString("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0}, \
- { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0}, \
- { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
+ { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0}, \
+ { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \
{ OUString(), 0, css::uno::Type(), 0, 0 }
@@ -186,20 +186,20 @@ const SvxItemPropertySet* ImplGetDrawPagePropertySet( bool bImpress, PageKind eP
};
#define GRAPHIC_PAGE_PROPERTIES \
- { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0}, \
- { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0}, \
- { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0}, \
- { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0}, \
+ { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0}, \
- { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0}, \
+ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0}, \
{ OUString(UNO_NAME_PAGE_PREVIEW), WID_PAGE_PREVIEW, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0}, \
{ OUString(UNO_NAME_PAGE_PREVIEWBITMAP), WID_PAGE_PREVIEWBITMAP, ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},\
{ OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0}, \
- { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::getCppuType((const OUString*)0), 0, 0}, \
+ { OUString(sUNO_Prop_BookmarkURL), WID_PAGE_BOOKMARK, ::cppu::UnoType<OUString>::get(), 0, 0}, \
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0}, \
{ OUString("NavigationOrder"), WID_NAVORDER, cppu::UnoType<css::container::XIndexAccess>::get(),0, 0}, \
{ OUString(), 0, css::uno::Type(), 0, 0 }
@@ -260,16 +260,16 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
static const SfxItemPropertyMapEntry aMasterPagePropertyMap_Impl[] =
{
{ OUString(UNO_NAME_PAGE_BACKGROUND), WID_PAGE_BACK, cppu::UnoType<beans::XPropertySet>::get(), 0, 0},
- { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), WID_PAGE_LDBITMAP, cppu::UnoType<awt::XBitmap>::get(), beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::getCppuType((const OUString*)0), beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYNAME), WID_PAGE_LDNAME, ::cppu::UnoType<OUString>::get(), beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0},
- { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("BackgroundFullSize"), WID_PAGE_BACKFULL, ::getBooleanCppuType(), 0, 0},
{ OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
@@ -278,26 +278,26 @@ const SvxItemPropertySet* ImplGetMasterPagePropertySet( PageKind ePageKind )
static const SfxItemPropertyMapEntry aHandoutMasterPagePropertyMap_Impl[] =
{
- { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString(UNO_NAME_PAGE_BOTTOM), WID_PAGE_BOTTOM, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_LEFT), WID_PAGE_LEFT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_RIGHT), WID_PAGE_RIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_TOP), WID_PAGE_TOP, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_HEIGHT), WID_PAGE_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(UNO_NAME_PAGE_ORIENTATION), WID_PAGE_ORIENT, ::getCppuType((const view::PaperOrientation*)0),0, 0},
- { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::getCppuType((const sal_Int16*)0), beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::getCppuType((const sal_Int16*)0), 0, 0},
+ { OUString(UNO_NAME_PAGE_NUMBER), WID_PAGE_NUMBER, ::cppu::UnoType<sal_Int16>::get(), beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_PAGE_WIDTH), WID_PAGE_WIDTH, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_PAGE_LAYOUT), WID_PAGE_LAYOUT, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString(sUNO_Prop_UserDefinedAttributes),WID_PAGE_USERATTRIBS, ::getCppuType((const Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ OUString("IsBackgroundDark"), WID_PAGE_ISDARK, ::getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0},
{ OUString("IsHeaderVisible"), WID_PAGE_HEADERVISIBLE, ::getBooleanCppuType(), 0, 0},
- { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::getCppuType((const OUString*)0), 0, 0},
+ { OUString("HeaderText"), WID_PAGE_HEADERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("IsFooterVisible"), WID_PAGE_FOOTERVISIBLE, ::getBooleanCppuType(), 0, 0},
- { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::getCppuType((const OUString*)0), 0, 0},
+ { OUString("FooterText"), WID_PAGE_FOOTERTEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("IsPageNumberVisible"), WID_PAGE_PAGENUMBERVISIBLE, ::getBooleanCppuType(), 0, 0},
{ OUString("IsDateTimeVisible"), WID_PAGE_DATETIMEVISIBLE, ::getBooleanCppuType(), 0, 0},
{ OUString("IsDateTimeFixed"), WID_PAGE_DATETIMEFIXED, ::getBooleanCppuType(), 0, 0},
- { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::getCppuType((const OUString*)0), 0, 0},
- { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString("DateTimeText"), WID_PAGE_DATETIMETEXT, ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString("DateTimeFormat"), WID_PAGE_DATETIMEFORMAT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index c78c7b1..9db6ca3 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -129,7 +129,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
{
setPropertyValue( aPropertyName, *pAny );
}
- else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) &&
+ else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) &&
( aIt->nMemberId == MID_NAME ) )
{
setPropertyValue( aPropertyName, *pAny );
@@ -143,7 +143,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
{
setPropertyValue( aPropertyName, *pAny );
}
- else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) &&
+ else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) &&
( aIt->nMemberId == MID_NAME ) )
{
setPropertyValue( aPropertyName, *pAny );
@@ -158,7 +158,7 @@ void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
{
setPropertyValue( aPropertyName, *pAny );
}
- else if ( ( pAny->getValueType() == ::getCppuType((const OUString*)0) ) &&
+ else if ( ( pAny->getValueType() == ::cppu::UnoType<OUString>::get() ) &&
( ( aIt->nMemberId == MID_NAME ) || ( aIt->nMemberId == MID_GRAFURL ) ) )
{
setPropertyValue( aPropertyName, *pAny );
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 51d0d65..8e904c2 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -76,10 +76,10 @@ static const SvxItemPropertySet* ImplGetSvxCellPropertySet()
{ OUString("Style"), OWN_ATTR_STYLE, cppu::UnoType< ::com::sun::star::style::XStyle >::get(), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString(UNO_NAME_TEXT_WRITINGMODE), SDRATTR_TEXTDIRECTION, ::getCppuType( (::com::sun::star::text::WritingMode*) 0 ), 0, 0},
{ OUString(UNO_NAME_TEXT_HORZADJUST), SDRATTR_TEXT_HORZADJUST, ::getCppuType((const ::com::sun::star::drawing::TextHorizontalAdjust*)0), 0, 0}, \
- { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
- { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM}, \
+ { OUString(UNO_NAME_TEXT_LEFTDIST), SDRATTR_TEXT_LEFTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
+ { OUString(UNO_NAME_TEXT_LOWERDIST), SDRATTR_TEXT_LOWERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
+ { OUString(UNO_NAME_TEXT_RIGHTDIST), SDRATTR_TEXT_RIGHTDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
+ { OUString(UNO_NAME_TEXT_UPPERDIST), SDRATTR_TEXT_UPPERDIST, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM}, \
{ OUString(UNO_NAME_TEXT_VERTADJUST), SDRATTR_TEXT_VERTADJUST, ::getCppuType((const ::com::sun::star::drawing::TextVerticalAdjust*)0), 0, 0},\
{ OUString(UNO_NAME_TEXT_WORDWRAP), SDRATTR_TEXT_WORDWRAP, ::getBooleanCppuType(), 0, 0}, \
@@ -988,7 +988,7 @@ Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMa
if( pMap->aType != aAny.getValueType() )
{
// since the sfx uint16 item now exports a sal_Int32, we may have to fix this here
- if( ( pMap->aType == ::getCppuType((const sal_Int16*)0)) && aAny.getValueType() == ::getCppuType((const sal_Int32*)0) )
+ if( ( pMap->aType == ::cppu::UnoType<sal_Int16>::get()) && aAny.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
{
sal_Int32 nValue = 0;
aAny >>= nValue;
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index e2ba846..2909f3e 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -255,7 +255,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
aProperties[0].Name = "Width";
aProperties[0].Handle = Property_Width;
- aProperties[0].Type = ::getCppuType((const sal_Int32*)0);
+ aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get();
aProperties[0].Attributes = 0;
aProperties[1].Name = "OptimalWidth";
@@ -275,7 +275,7 @@ rtl::Reference< FastPropertySetInfo > TableColumn::getStaticPropertySetInfo()
aProperties[4].Name = "Size";
aProperties[4].Handle = Property_Width;
- aProperties[4].Type = ::getCppuType((const sal_Int32*)0);
+ aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get();
aProperties[4].Attributes = 0;
aProperties[5].Name = "OptimalSize";
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 7434db6..c213e49 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -329,7 +329,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
aProperties[0].Name = "Height";
aProperties[0].Handle = Property_Height;
- aProperties[0].Type = ::getCppuType((const sal_Int32*)0);
+ aProperties[0].Type = ::cppu::UnoType<sal_Int32>::get();
aProperties[0].Attributes = 0;
aProperties[1].Name = "OptimalHeight";
@@ -349,7 +349,7 @@ rtl::Reference< FastPropertySetInfo > TableRow::getStaticPropertySetInfo()
aProperties[4].Name = "Size";
aProperties[4].Handle = Property_Height;
- aProperties[4].Type = ::getCppuType((const sal_Int32*)0);
+ aProperties[4].Type = ::cppu::UnoType<sal_Int32>::get();
aProperties[4].Attributes = 0;
aProperties[5].Name = "OptimalSize";
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 3ef2146..a048642 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -262,7 +262,7 @@ sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (Runtim
// XElementAccess
Type SAL_CALL NamespaceMap::getElementType() throw (RuntimeException, std::exception)
{
- return ::getCppuType( (const OUString*) 0 );
+ return ::cppu::UnoType<OUString>::get();
}
sal_Bool SAL_CALL NamespaceMap::hasElements() throw (RuntimeException, std::exception)
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 5970753..5d30c42 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -293,7 +293,7 @@ XPropertyEntry* SvxUnoXColorTable::getEntry( const OUString& rName, const uno::A
uno::Type SAL_CALL SvxUnoXColorTable::getElementType()
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const sal_Int32*)0);
+ return ::cppu::UnoType<sal_Int32>::get();
}
// XServiceInfo
@@ -678,7 +678,7 @@ XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno::
uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType()
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const OUString*)0);
+ return ::cppu::UnoType<OUString>::get();
}
// XServiceInfo
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index cd208a8..938d3cc 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -100,7 +100,7 @@ NameOrIndex* SvxUnoBitmapTable::createItem() const throw()
uno::Type SAL_CALL SvxUnoBitmapTable::getElementType( )
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType( (const OUString*)0 );
+ return ::cppu::UnoType<OUString>::get();
}
/**
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index bb910a4..759435c 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -169,7 +169,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::hasByName( const OUString& aName )
uno::Type SAL_CALL SvxUnoColorTable::getElementType()
throw( uno::RuntimeException, std::exception )
{
- return ::getCppuType((const sal_Int32*)0);
+ return ::cppu::UnoType<sal_Int32>::get();
}
sal_Bool SAL_CALL SvxUnoColorTable::hasElements()
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index ad3a3e5..5575e3e 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -139,7 +139,7 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
SvxUnoConvertToMM( eMapUnit, rValue );
}
// convert int32 to correct enum type if needed
- else if ( pEntry->maType.getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::getCppuType((const sal_Int32*)0) )
+ else if ( pEntry->maType.getTypeClass() == uno::TypeClass_ENUM && rValue.getValueType() == ::cppu::UnoType<sal_Int32>::get() )
{
sal_Int32 nEnum;
rValue >>= nEnum;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index db97e84..92bdcfb 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -457,17 +457,17 @@ SfxItemPropertyMapEntry const * ImplGetSvxOle2PropertyMap()
TEXT_PROPERTIES
FONTWORK_PROPERTIES
- { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("Model"), OWN_ATTR_OLEMODEL , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("EmbeddedObject"), OWN_ATTR_OLE_EMBEDDED_OBJECT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("EmbeddedObjectNoNewClient"),OWN_ATTR_OLE_EMBEDDED_OBJECT_NONEWCLIENT, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("OriginalSize"), OWN_ATTR_OLESIZE , ::getCppuType(( const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("CLSID"), OWN_ATTR_CLSID , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString("CLSID"), OWN_ATTR_CLSID , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("IsInternal"), OWN_ATTR_INTERNAL_OLE , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
{ OUString("Aspect"), OWN_ATTR_OLE_ASPECT , ::getCppuType((const sal_Int64*)0), 0, 0},
- { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 },
- { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_GRAPHOBJ_GRAPHIC), OWN_ATTR_VALUE_GRAPHIC , ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic>*)0), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -479,26 +479,26 @@ SfxItemPropertyMapEntry const * ImplGetSvxPluginPropertyMap()
{
static SfxItemPropertyMapEntry const aPluginPropertyMap_Impl[] =
{
- { OUString("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , ::getCppuType((const OUString*)0), 0, 0},
- { OUString("PluginURL"), OWN_ATTR_PLUGIN_URL , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString("PluginMimeType"), OWN_ATTR_PLUGIN_MIMETYPE , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString("PluginURL"), OWN_ATTR_PLUGIN_URL , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("PluginCommands"), OWN_ATTR_PLUGIN_COMMANDS , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 },
- { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
// #i68101#
- { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -510,29 +510,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxFramePropertyMap()
//TODO/LATER: new properties for ScrollingMode and DefaultBorder
static SfxItemPropertyMapEntry const aFramePropertyMap_Impl[] =
{
- { OUString("FrameURL"), OWN_ATTR_FRAME_URL , ::getCppuType((const OUString*)0), 0, 0},
- { OUString("FrameName"), OWN_ATTR_FRAME_NAME , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString("FrameURL"), OWN_ATTR_FRAME_URL , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString("FrameName"), OWN_ATTR_FRAME_NAME , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("FrameIsAutoScroll"), OWN_ATTR_FRAME_ISAUTOSCROLL , ::getBooleanCppuType() , ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ OUString("FrameIsBorder"), OWN_ATTR_FRAME_ISBORDER , ::getBooleanCppuType() , 0, 0},
- { OUString("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString("FrameMarginHeight"), OWN_ATTR_FRAME_MARGIN_HEIGHT, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString("FrameMarginWidth"), OWN_ATTR_FRAME_MARGIN_WIDTH , ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString("FrameMarginHeight"), OWN_ATTR_FRAME_MARGIN_HEIGHT, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 },
- { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
// #i68101#
- { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -543,29 +543,29 @@ SfxItemPropertyMapEntry const * ImplGetSvxAppletPropertyMap()
{
static SfxItemPropertyMapEntry const aAppletPropertyMap_Impl[] =
{
- { OUString("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , ::getCppuType(( const OUString*)0), 0, 0},
- { OUString("AppletName"), OWN_ATTR_APPLET_NAME , ::getCppuType(( const OUString*)0), 0, 0},
- { OUString("AppletCode"), OWN_ATTR_APPLET_CODE , ::getCppuType(( const OUString*)0), 0, 0},
+ { OUString("AppletCodeBase"), OWN_ATTR_APPLET_CODEBASE , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString("AppletName"), OWN_ATTR_APPLET_NAME , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString("AppletCode"), OWN_ATTR_APPLET_CODE , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("AppletCommands"), OWN_ATTR_APPLET_COMMANDS , ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0},
- { OUString("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , ::getCppuType(( const OUString*)0), 0, 0},
+ { OUString("AppletDocBase"), OWN_ATTR_APPLET_DOCBASE , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString("AppletIsScript"), OWN_ATTR_APPLET_ISSCRIPT , ::getBooleanCppuType(), 0, 0 },
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_OLE2_METAFILE), OWN_ATTR_METAFILE , ::getCppuType((::com::sun::star::uno::Sequence<sal_Int8>*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString("ThumbnailGraphicURL"), OWN_ATTR_THUMBNAIL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::getCppuType(( const OUString*)0), 0, 0 },
- { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::getCppuType(( const OUString*)0), 0, 0 },
+ { OUString(UNO_NAME_OLE2_PERSISTNAME), OWN_ATTR_PERSISTNAME , ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("LinkURL"), OWN_ATTR_OLE_LINKURL , ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("VisibleArea"), OWN_ATTR_OLE_VISAREA , ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), 0, 0},
// #i68101#
- { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -577,46 +577,46 @@ SfxItemPropertyMapEntry const * ImplGetSvxControlShapePropertyMap()
static SfxItemPropertyMapEntry const aControlPropertyMap_Impl[] =
{
// the following properties are mapped to the XControl Model of this shape
- { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), 0, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
- { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_FONTNAME), 0, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_FONTSTYLENAME), 0, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_FONTFAMILY), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_FONTCHARSET), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString(UNO_NAME_EDIT_CHAR_HEIGHT), 0, ::getCppuType((const float*)0), 0, 0 },
- { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_FONTPITCH), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString(UNO_NAME_EDIT_CHAR_POSTURE), 0, ::getCppuType((const ::com::sun::star::awt::FontSlant*)0),0, 0 },
{ OUString(UNO_NAME_EDIT_CHAR_WEIGHT), 0, ::getCppuType((const float*)0), 0, 0 },
- { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
- { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
- { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, ::getCppuType((const sal_Int32*)0), 0, 0 },
- { OUString("CharRelief"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
- { OUString("CharUnderlineColor"), 0, ::getCppuType((const sal_Int32*)0), 0, 0 },
- { OUString("CharKerning"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_STRIKEOUT), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { OUString(UNO_NAME_EDIT_CHAR_COLOR), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("CharRelief"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { OUString("CharUnderlineColor"), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("CharKerning"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("CharWordMode"), 0, ::getBooleanCppuType(), 0, 0 },
- { OUString(UNO_NAME_EDIT_PARA_ADJUST), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString(UNO_NAME_EDIT_PARA_ADJUST), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("TextVerticalAdjust"), 0, ::getCppuType((const TextVerticalAdjust*)0), MAYBEVOID, 0 },
- { OUString("ControlBackground"), 0, ::getCppuType((const sal_Int32*)0), 0, 0 },
- { OUString("ControlBorder"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
- { OUString("ControlBorderColor"), 0, ::getCppuType((const sal_Int32*)0), 0, 0 },
- { OUString("ControlSymbolColor"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
- { OUString("ImageScaleMode"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString("ControlBackground"), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("ControlBorder"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { OUString("ControlBorderColor"), 0, ::cppu::UnoType<sal_Int32>::get(), 0, 0 },
+ { OUString("ControlSymbolColor"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
+ { OUString("ImageScaleMode"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
- { OUString("ControlTextEmphasis"), 0, ::getCppuType((const sal_Int16*)0), 0, 0 },
+ { OUString("ControlTextEmphasis"), 0, ::cppu::UnoType<sal_Int16>::get(), 0, 0 },
{ OUString("ControlWritingMode"), 0, ::cppu::UnoType< sal_Int16 >::get(), 0, 0},
// the following properties are handled by SvxShape
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString("UserDefinedAttributes"), SDRATTR_XMLATTRIBUTES, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{OUString("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, ::getCppuType((const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >*)0) , 0, 0},
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
// #i68101#
- { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0},
// #i112587#
{ OUString(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , ::getBooleanCppuType(), 0, 0},
{ OUString("Visible"), SDRATTR_OBJVISIBLE , ::getBooleanCppuType(), 0, 0},
@@ -631,19 +631,19 @@ SfxItemPropertyMapEntry const * ImplGetSvxPageShapePropertyMap()
{
static SfxItemPropertyMapEntry const aPageShapePropertyMap_Impl[] =
{
- { OUString("PageNumber"), OWN_ATTR_PAGE_NUMBER , ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString("PageNumber"), OWN_ATTR_PAGE_NUMBER , ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("Transformation"), OWN_ATTR_TRANSFORMATION , ::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
- { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER , ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID , ::cppu::UnoType<sal_Int16>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_LAYERNAME),SDRATTR_LAYERNAME , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(UNO_NAME_LINKDISPLAYBITMAP), OWN_ATTR_LDBITMAP , ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
- { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::getCppuType(( const OUString*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
+ { OUString(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME , ::cppu::UnoType<OUString>::get(), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
{ OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT), SDRATTR_OBJMOVEPROTECT, ::getBooleanCppuType(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT), SDRATTR_OBJSIZEPROTECT, ::getBooleanCppuType(),0, 0},
{ OUString(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, ::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
// #i68101#
- { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::getCppuType((const OUString*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::getCppuType((const OUString*)0), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_TITLE), OWN_ATTR_MISC_OBJ_TITLE , ::cppu::UnoType<OUString>::get(), 0, 0},
+ { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION), OWN_ATTR_MISC_OBJ_DESCRIPTION , ::cppu::UnoType<OUString>::get(), 0, 0},
{ OUString(), 0, css::uno::Type(), 0, 0 }
};
@@ -655,15 +655,15 @@ SfxItemPropertyMapEntry const * ImplGetSvxCaptionPropertyMap()
static SfxItemPropertyMapEntry const aCaptionPropertyMap_Impl[] =
{
{ OUString("CaptionPoint"), OWN_ATTR_CAPTION_POINT, ::getCppuType((const com::sun::star::awt::Point*)0), 0, 0 },
- { OUString("CaptionType"), SDRATTR_CAPTIONTYPE, ::getCppuType((const sal_Int16*)0), 0, 0},
+ { OUString("CaptionType"), SDRATTR_CAPTIONTYPE, ::cppu::UnoType<sal_Int16>::get(), 0, 0},
{ OUString("CaptionIsFixedAngle"), SDRATTR_CAPTIONFIXEDANGLE, ::getBooleanCppuType(), 0, 0},
- { OUString("CaptionAngle"), SDRATTR_CAPTIONANGLE, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString("CaptionGap"), SDRATTR_CAPTIONGAP, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM},
- { OUString("CaptionEscapeDirection"), SDRATTR_CAPTIONESCDIR, ::getCppuType((const sal_Int32*)0), 0, 0},
+ { OUString("CaptionAngle"), SDRATTR_CAPTIONANGLE, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString("CaptionGap"), SDRATTR_CAPTIONGAP, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM},
+ { OUString("CaptionEscapeDirection"), SDRATTR_CAPTIONESCDIR, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
{ OUString("CaptionIsEscapeRelative"), SDRATTR_CAPTIONESCISREL, ::getBooleanCppuType(), 0, 0},
- { OUString("CaptionEscapeRelative"), SDRATTR_CAPTIONESCREL, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString("CaptionEscapeAbsolute"), SDRATTR_CAPTIONESCABS, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM},
- { OUString("CaptionLineLength"), SDRATTR_CAPTIONLINELEN, ::getCppuType((const sal_Int32*)0), 0, SFX_METRIC_ITEM},
+ { OUString("CaptionEscapeRelative"), SDRATTR_CAPTIONESCREL, ::cppu::UnoType<sal_Int32>::get(), 0, 0},
+ { OUString("CaptionEscapeAbsolute"), SDRATTR_CAPTIONESCABS, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM},
+ { OUString("CaptionLineLength"), SDRATTR_CAPTIONLINELEN, ::cppu::UnoType<sal_Int32>::get(), 0, SFX_METRIC_ITEM},
{ OUString("CaptionIsFitLineLength"), SDRATTR_CAPTIONFITLINELEN, ::getBooleanCppuType(), 0, 0},
EDGERADIUS_PROPERTIES
FILL_PROPERTIES
@@ -688,10 +688,10 @@ SfxItemPropertyMapEntry const * ImplGetSvxCustomShapePropertyMap()
{
static SfxItemPropertyMapEntry const aCustomShapePropertyMap_Impl[] =
{
- { OUString("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, ::getCppuType((const OUString*)0), 0, 0 },
- { OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, ::getCppuType((const OUString*)0), 0, 0 },
+ { OUString("CustomShapeEngine"), SDRATTR_CUSTOMSHAPE_ENGINE, ::cppu::UnoType<OUString>::get(), 0, 0 },
+ { OUString("CustomShapeData"), SDRATTR_CUSTOMSHAPE_DATA, ::cppu::UnoType<OUString>::get(), 0, 0 },
{ OUString("CustomShapeGeometry"), SDRATTR_CUSTOMSHAPE_GEOMETRY, ::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0), 0, 0 },
- { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, ::getCppuType((const OUString*)0), 0, 0},
+ { OUString("CustomShapeGraphicURL"), SDRATTR_CUSTOMSHAPE_REPLACEMENT_URL, ::cppu::UnoType<OUString>::get(), 0, 0},
CUSTOMSHAPE_PROPERTIES
FILL_PROPERTIES
LINE_PROPERTIES
@@ -712,27 +712,27 @@ SfxItemPropertyMapEntry const * ImplGetSvxMediaShapePropertyMap()
{
static SfxItemPropertyMapEntry const aMediaShapePropertyMap_Impl[] =
{
- { OUString(UNO_NAME_MISC_OBJ_ZORDER), OWN_ATTR_ZORDER, ::getCppuType((const sal_Int32*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERID), SDRATTR_LAYERID, ::getCppuType((const sal_Int16*)0), 0, 0},
- { OUString(UNO_NAME_MISC_OBJ_LAYERNAME), SDRATTR_LAYERNAME, ::getCppuType((const OUString*)0), 0, 0},
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list