summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/fields/docufld.cxx4
-rw-r--r--sw/source/core/layout/atrfrm.cxx2
-rw-r--r--sw/source/core/para/paratr.cxx4
-rw-r--r--sw/source/core/uibase/shells/drformsh.cxx2
-rw-r--r--sw/source/core/uibase/shells/textdrw.cxx2
-rw-r--r--sw/source/core/uibase/utlui/unotools.cxx2
-rw-r--r--sw/source/core/unocore/unosett.cxx4
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx8
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/ui/fldui/flddinf.cxx6
11 files changed, 21 insertions, 21 deletions
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 4bbd021c18f3..c3c47bc6895a 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -1820,7 +1820,7 @@ bool SwPostItField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
aSetDate.Day = aDateTime.GetDay();
aSetDate.Month = aDateTime.GetMonth();
aSetDate.Year = aDateTime.GetYear();
- rAny.setValue(&aSetDate, ::getCppuType((util::Date*)0));
+ rAny.setValue(&aSetDate, ::cppu::UnoType<util::Date>::get());
}
break;
case FIELD_PROP_DATE_TIME:
@@ -1868,7 +1868,7 @@ bool SwPostItField::PutValue( const uno::Any& rAny, sal_uInt16 nWhichId )
OSL_FAIL("Not implemented!");
break;
case FIELD_PROP_DATE:
- if( rAny.getValueType() == ::getCppuType((util::Date*)0) )
+ if( rAny.getValueType() == ::cppu::UnoType<util::Date>::get() )
{
util::Date aSetDate = *(util::Date*)rAny.getValue();
aDateTime = Date(aSetDate.Day, aSetDate.Month, aSetDate.Year);
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 4b38b4f7f06e..baaabf736bfb 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -223,7 +223,7 @@ bool SwFmtFrmSize::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
awt::Size aTmp;
aTmp.Height = convertTwipToMm100(m_aSize.Height());
aTmp.Width = convertTwipToMm100(m_aSize.Width());
- rVal.setValue(&aTmp, ::getCppuType((const awt::Size*)0));
+ rVal.setValue(&aTmp, ::cppu::UnoType<awt::Size>::get());
}
break;
case MID_FRMSIZE_REL_HEIGHT:
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 02fb48327617..88ec5406e816 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -135,7 +135,7 @@ bool SwFmtDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
aDrop.Lines = nLines ;
aDrop.Count = nChars ;
aDrop.Distance = convertTwipToMm100(nDistance);
- rVal.setValue(&aDrop, ::getCppuType((const style::DropCapFormat*)0));
+ rVal.setValue(&aDrop, ::cppu::UnoType<style::DropCapFormat>::get());
}
break;
case MID_DROPCAP_WHOLE_WORD:
@@ -185,7 +185,7 @@ bool SwFmtDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
case MID_DROPCAP_FORMAT:
{
- if(rVal.getValueType() == ::getCppuType((const style::DropCapFormat*)0))
+ if(rVal.getValueType() == ::cppu::UnoType<style::DropCapFormat>::get())
{
const style::DropCapFormat* pDrop = (const style::DropCapFormat*)rVal.getValue();
nLines = pDrop->Lines;
diff --git a/sw/source/core/uibase/shells/drformsh.cxx b/sw/source/core/uibase/shells/drformsh.cxx
index 1c39b6837c20..3892d620ce83 100644
--- a/sw/source/core/uibase/shells/drformsh.cxx
+++ b/sw/source/core/uibase/shells/drformsh.cxx
@@ -143,7 +143,7 @@ void SwDrawFormShell::Execute(SfxRequest &rReq)
}
form::FormButtonType eButtonType = form::FormButtonType_URL;
- aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0));
+ aTmp.setValue( &eButtonType, ::cppu::UnoType<form::FormButtonType>::get());
xPropSet->setPropertyValue( "ButtonType", aTmp );
}
}
diff --git a/sw/source/core/uibase/shells/textdrw.cxx b/sw/source/core/uibase/shells/textdrw.cxx
index d6931e32e151..ec30e19d1545 100644
--- a/sw/source/core/uibase/shells/textdrw.cxx
+++ b/sw/source/core/uibase/shells/textdrw.cxx
@@ -101,7 +101,7 @@ void SwBaseShell::InsertURLButton(const OUString& rURL, const OUString& rTarget,
}
form::FormButtonType eButtonType = form::FormButtonType_URL;
- aTmp.setValue( &eButtonType, ::getCppuType((const form::FormButtonType*)0));
+ aTmp.setValue( &eButtonType, ::cppu::UnoType<form::FormButtonType>::get());
xPropSet->setPropertyValue( "ButtonType", aTmp );
#if HAVE_FEATURE_AVMEDIA
diff --git a/sw/source/core/uibase/utlui/unotools.cxx b/sw/source/core/uibase/utlui/unotools.cxx
index 363017fd7fc2..8875d35b73a3 100644
--- a/sw/source/core/uibase/utlui/unotools.cxx
+++ b/sw/source/core/uibase/utlui/unotools.cxx
@@ -355,7 +355,7 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer )
aSize >>= aPSize;
//TODO: set page width to card width
aPSize.Width = 10000;
- aSize.setValue(&aPSize, ::getCppuType((awt::Size*)0));
+ aSize.setValue(&aPSize, ::cppu::UnoType<awt::Size>::get());
xPProp->setPropertyValue(UNO_NAME_SIZE, aSize);
uno::Any aZero; aZero <<= (sal_Int32)0;
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 790b4eaaf753..96cc9b7134d5 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1513,7 +1513,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
// #i101131#
// adjust conversion due to type mismatch between <Size> and <awt::Size>
awt::Size aAwtSize(convertTwipToMm100(aSize.Width()), convertTwipToMm100(aSize.Height()));
- pData = new PropValData((void*)&aAwtSize, UNO_NAME_GRAPHIC_SIZE, ::getCppuType((const awt::Size*)0));
+ pData = new PropValData((void*)&aAwtSize, UNO_NAME_GRAPHIC_SIZE, ::cppu::UnoType<awt::Size>::get());
aPropertyValues.push_back(pData);
const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation();
@@ -2013,7 +2013,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
assert( !pDocShell );
if(!pSetSize)
pSetSize = new Size;
- if(pData->aVal.getValueType() == ::getCppuType((awt::Size*)0))
+ if(pData->aVal.getValueType() == ::cppu::UnoType<awt::Size>::get())
{
awt::Size* pSize = (awt::Size*)pData->aVal.getValue();
pSize->Width = convertMm100ToTwip(pSize->Width);
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 3efec76032f9..fd90d1e0b16b 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -781,7 +781,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
aTmp = xPropSet->getPropertyValue(
OUString("ButtonType") );
if( aTmp.getValueType() ==
- ::getCppuType((const form::FormButtonType*)0) )
+ ::cppu::UnoType<form::FormButtonType>::get() )
eButtonType = *( form::FormButtonType*)aTmp.getValue();
switch( eButtonType )
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index be5926c5bc2d..0a19a7f226a2 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -561,13 +561,13 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
::getCppuType( (uno::Reference<XInterface> *)0 ),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BaseURI"), 0,
- ::getCppuType( (OUString *)0 ),
+ ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamRelPath"), 0,
- ::getCppuType( (OUString *)0 ),
+ ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamName"), 0,
- ::getCppuType( (OUString *)0 ),
+ ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
// properties for insert modes
{ OUString("StyleInsertModeFamilies"), 0,
@@ -594,7 +594,7 @@ sal_uLong XMLReader::Read( SwDoc &rDoc, const OUString& rBaseURL, SwPaM &rPaM, c
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BuildId"), 0,
- ::getCppuType( (OUString *)0 ),
+ ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
// Add property, which indicates, if a text document in OpenOffice.org
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 4ee2f71728f0..9fa3e9178a11 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -126,13 +126,13 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
::getCppuType((Sequence<sal_Int8>*)0),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("BaseURI"), 0,
- ::getCppuType( (OUString *)0 ),
+ ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamRelPath"), 0,
- ::getCppuType( (OUString *)0 ),
+ ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("StreamName"), 0,
- ::getCppuType( (OUString *)0 ),
+ ::cppu::UnoType<OUString>::get(),
beans::PropertyAttribute::MAYBEVOID, 0 },
{ OUString("AutoTextMode"), 0,
::getBooleanCppuType(),
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 08564a5960f2..5e18019f02e4 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -251,15 +251,15 @@ IMPL_LINK_NOARG(SwFldDokInfPage, SubTypeHdl)
{
uno::Any aVal = xCustomPropertySet->getPropertyValue( sName );
const uno::Type& rValueType = aVal.getValueType();
- if( rValueType == ::getCppuType( (util::DateTime*)0 ))
+ if( rValueType == ::cppu::UnoType<util::DateTime>::get())
{
nNewType = NUMBERFORMAT_DATETIME;
}
- else if( rValueType == ::getCppuType( (util::Date*)0 ))
+ else if( rValueType == ::cppu::UnoType<util::Date>::get())
{
nNewType = NUMBERFORMAT_DATE;
}
- else if( rValueType == ::getCppuType( (util::Time*)0 ))
+ else if( rValueType == ::cppu::UnoType<util::Time>::get())
{
nNewType = NUMBERFORMAT_TIME;
}
generated by cgit (git 2.34.1) at 2024-07-23 11:56:48 +0000