wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

Remove unnecessary setBOOL, makeBoolAny

Browse Source 
Change-Id: Id82c3f352fcc2d4dafad877517098cb6f5d046d4
This commit is contained in:
Stephan Bergmann
2016-05-03 11:20:51 +02:00
parent 4b3c211cfb
commit a05ab9ef5e
10 changed files with 28 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dbaccess/source/ui/browser/brwctrlr.cxx
View File

@ -1671,7 +1671,7 @@ void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, b
FormErrorHelper aError(this);
xFormSet->setPropertyValue(PROPERTY_FILTER, makeAny(_xParser->getFilter()));
xFormSet->setPropertyValue(PROPERTY_HAVING_CLAUSE, makeAny(_xParser->getHavingClause()));
xFormSet->setPropertyValue(PROPERTY_APPLYFILTER, ::comphelper::makeBoolAny(true));
xFormSet->setPropertyValue(PROPERTY_APPLYFILTER, css::uno::Any(true));
bSuccess = reloadForm(m_xLoadable);
}
@ -1683,7 +1683,7 @@ void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, b
{
xFormSet->setPropertyValue(PROPERTY_FILTER, makeAny(_rOldFilter));
xFormSet->setPropertyValue(PROPERTY_HAVING_CLAUSE, makeAny(_sOldHaving));
xFormSet->setPropertyValue(PROPERTY_APPLYFILTER, ::comphelper::makeBoolAny(_bOldFilterApplied));
xFormSet->setPropertyValue(PROPERTY_APPLYFILTER, css::uno::Any(_bOldFilterApplied));
try
{
@ -1834,8 +1834,8 @@ void SbaXDataBrowserController::ExecuteSearch()
// prohibit the synchronization of the grid's display with the cursor's position
Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY);
OSL_ENSURE(xModelSet.is(), "SbaXDataBrowserController::ExecuteSearch : no model set ?!");
xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(false));
xModelSet->setPropertyValue("AlwaysShowCursor", ::comphelper::makeBoolAny(true));
xModelSet->setPropertyValue("DisplayIsSynchron", css::uno::Any(false));
xModelSet->setPropertyValue("AlwaysShowCursor", css::uno::Any(true));
xModelSet->setPropertyValue("CursorColor", makeAny(sal_Int32(COL_LIGHTRED)));
Reference< css::util::XNumberFormatsSupplier > xNFS(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), true, getORB()));
@ -1859,8 +1859,8 @@ void SbaXDataBrowserController::ExecuteSearch()
}
// restore the grid's normal operating state
xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(true));
xModelSet->setPropertyValue("AlwaysShowCursor", ::comphelper::makeBoolAny(false));
xModelSet->setPropertyValue("DisplayIsSynchron", css::uno::Any(true));
xModelSet->setPropertyValue("AlwaysShowCursor", css::uno::Any(false));
xModelSet->setPropertyValue("CursorColor", Any());
}
@ -1912,7 +1912,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
{
Reference< XPropertySet > xActiveSet(getRowSet(), UNO_QUERY);
bool bApplied = ::comphelper::getBOOL(xActiveSet->getPropertyValue(PROPERTY_APPLYFILTER));
xActiveSet->setPropertyValue(PROPERTY_APPLYFILTER, ::comphelper::makeBoolAny(!bApplied));
xActiveSet->setPropertyValue(PROPERTY_APPLYFILTER, css::uno::Any(!bApplied));
reloadForm(m_xLoadable);
}
InvalidateFeature(ID_BROWSER_FILTERED);
@ -2376,7 +2376,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation
Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY);
OSL_ENSURE(xModelSet.is(), "SbaXDataBrowserController::OnFoundData : no model set ?!");
Any aOld = xModelSet->getPropertyValue("DisplayIsSynchron");
xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(true));
xModelSet->setPropertyValue("DisplayIsSynchron", css::uno::Any(true));
xModelSet->setPropertyValue("DisplayIsSynchron", aOld);
// and move to the field
@ -2420,7 +2420,7 @@ IMPL_LINK_TYPED(SbaXDataBrowserController, OnCanceledNotFound, FmFoundRecordInfo
Reference< XPropertySet > xModelSet(getControlModel(), UNO_QUERY);
OSL_ENSURE(xModelSet.is(), "SbaXDataBrowserController::OnCanceledNotFound : no model set ?!");
Any aOld = xModelSet->getPropertyValue("DisplayIsSynchron");
xModelSet->setPropertyValue("DisplayIsSynchron", ::comphelper::makeBoolAny(true));
xModelSet->setPropertyValue("DisplayIsSynchron", css::uno::Any(true));
xModelSet->setPropertyValue("DisplayIsSynchron", aOld);
}
catch( const Exception& )

20
forms/source/component/Grid.cxx
View File

@ -440,31 +440,31 @@ void OGridControlModel::getFastPropertyValue(Any& rValue, sal_Int32 nHandle ) co
rValue <<= m_sHelpURL;
break;
case PROPERTY_ID_DISPLAYSYNCHRON:
setBOOL(rValue, m_bDisplaySynchron);
rValue <<= m_bDisplaySynchron;
break;
case PROPERTY_ID_ALWAYSSHOWCURSOR:
setBOOL(rValue, m_bAlwaysShowCursor);
rValue <<= m_bAlwaysShowCursor;
break;
case PROPERTY_ID_CURSORCOLOR:
rValue = m_aCursorColor;
break;
case PROPERTY_ID_PRINTABLE:
setBOOL(rValue, m_bPrintable);
rValue <<= m_bPrintable;
break;
case PROPERTY_ID_TABSTOP:
rValue = m_aTabStop;
break;
case PROPERTY_ID_HASNAVIGATION:
setBOOL(rValue, m_bNavigation);
rValue <<= m_bNavigation;
break;
case PROPERTY_ID_RECORDMARKER:
setBOOL(rValue, m_bRecordMarker);
rValue <<= m_bRecordMarker;
break;
case PROPERTY_ID_ENABLED:
setBOOL(rValue, m_bEnable);
rValue <<= m_bEnable;
break;
case PROPERTY_ID_ENABLEVISIBLE:
setBOOL(rValue, m_bEnableVisible);
rValue <<= m_bEnableVisible;
break;
case PROPERTY_ID_BORDER:
rValue <<= (sal_Int16)m_nBorder;
@ -664,10 +664,10 @@ Any OGridControlModel::getPropertyDefaultByHandle( sal_Int32 nHandle ) const
case PROPERTY_ID_DISPLAYSYNCHRON:
case PROPERTY_ID_ENABLED:
case PROPERTY_ID_ENABLEVISIBLE:
aReturn = makeBoolAny(true);
aReturn <<= true;
break;
case PROPERTY_ID_ALWAYSSHOWCURSOR:
aReturn = makeBoolAny(false);
aReturn <<= false;
break;
case PROPERTY_ID_HELPURL:
case PROPERTY_ID_HELPTEXT:
@ -965,7 +965,7 @@ void OGridControlModel::read(const Reference<XObjectInputStream>& _rxInStream) t
m_bEnable = _rxInStream->readBoolean();
if (nAnyMask & TABSTOP)
{
m_aTabStop = makeBoolAny(_rxInStream->readBoolean() != 0);
m_aTabStop <<= (_rxInStream->readBoolean() != 0);
}
if (nVersion > 3)
m_bNavigation = _rxInStream->readBoolean();

4
forms/source/component/formcontrolfont.cxx
View File

@ -527,7 +527,7 @@ namespace frm
break;
case PROPERTY_ID_FONT_WORDLINEMODE:
aReturn = makeBoolAny(false);
aReturn <<= false;
break;
case PROPERTY_ID_FONT_NAME:
@ -544,7 +544,7 @@ namespace frm
break;
case PROPERTY_ID_FONT_KERNING:
aReturn = makeBoolAny(false);
aReturn <<= false;
break;
case PROPERTY_ID_FONT_PITCH:

9
include/comphelper/types.hxx
View File

@ -92,15 +92,6 @@ namespace comphelper
COMPHELPER_DLLPUBLIC sal_Int32 getEnumAsINT32(const css::uno::Any& _rAny) throw(css::lang::IllegalArgumentException);
//= replacement of some former UsrAny.setXXX methods - can be used with rvalues
inline void setBOOL(css::uno::Any& _rAny, bool _b)
{ _rAny.setValue(&_b, cppu::UnoType<bool>::get()); }
//= extension of ::cppu::makeAny()
inline css::uno::Any makeBoolAny(bool _b)
{ return css::uno::Any(&_b, cppu::UnoType<bool>::get()); }
} // namespace comphelper

2
sc/source/filter/inc/fapihelper.hxx
View File

@ -180,7 +180,7 @@ public:
/** Puts the passed Boolean value into the property set. */
inline void SetBoolProperty( const OUString& rPropName, bool bValue )
{ SetAnyProperty( rPropName, ::comphelper::makeBoolAny( bValue ) ); }
{ SetAnyProperty( rPropName, css::uno::Any( bValue ) ); }
/** Puts the passed string into the property set. */
inline void SetStringProperty( const OUString& rPropName, const OUString& rValue )

3
sc/source/ui/docshell/docsh8.cxx
View File

@ -205,8 +205,7 @@ bool ScDocShell::KillFile( const INetURLObject& rURL )
::ucbhelper::Content aCnt( rURL.GetMainURL(INetURLObject::NO_DECODE),
uno::Reference< css::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
aCnt.executeCommand( "delete",
comphelper::makeBoolAny( true ) );
aCnt.executeCommand( "delete", css::uno::Any( true ) );
}
catch( uno::Exception& )
{

2
sfx2/source/doc/oleprops.cxx
View File

@ -880,7 +880,7 @@ Any SfxOleSection::GetAnyValue( sal_Int32 nPropId ) const
else if( GetDoubleValue( fDouble, nPropId ) )
aValue <<= fDouble;
else if( GetBoolValue( bBool, nPropId ) )
::comphelper::setBOOL( aValue, bBool );
aValue <<= bBool;
else if( GetStringValue( aString, nPropId ) )
aValue <<= aString;
else if( GetFileTimeValue( aApiDateTime, nPropId ) )

2
svx/source/fmcomp/fmgridif.cxx
View File

@ -1343,7 +1343,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
case TypeClass_LONG : pReturnArray[i] <<= (sal_Int32)xFieldContent->getLong(); break;
case TypeClass_UNSIGNED_SHORT : pReturnArray[i] <<= (sal_uInt16)xFieldContent->getShort(); break;
case TypeClass_UNSIGNED_LONG : pReturnArray[i] <<= (sal_uInt32)xFieldContent->getLong(); break;
case TypeClass_BOOLEAN : ::comphelper::setBOOL(pReturnArray[i],xFieldContent->getBoolean()); break;
case TypeClass_BOOLEAN : pReturnArray[i] <<= xFieldContent->getBoolean(); break;
default:
{
throw IllegalArgumentException();

4
writerperfect/source/impress/KeynoteImportFilter.cxx
View File

@ -209,7 +209,7 @@ throw(css::uno::RuntimeException, std::exception)
lComponentDataNV.realloc(nCDSize + 1);
beans::NamedValue aValue;
aValue.Name = "IsPackage";
aValue.Value = comphelper::makeBoolAny(true);
aValue.Value <<= true;
lComponentDataNV[nCDSize] = aValue;
Descriptor[nComponentDataLocation].Value <<= lComponentDataNV;
}
@ -219,7 +219,7 @@ throw(css::uno::RuntimeException, std::exception)
lComponentDataPV.realloc(nCDSize + 1);
beans::PropertyValue aProp;
aProp.Name = "IsPackage";
aProp.Value = comphelper::makeBoolAny(true);
aProp.Value <<= true;
aProp.Handle = -1;
aProp.State = beans::PropertyState_DIRECT_VALUE;
lComponentDataPV[nCDSize] = aProp;

2
xmloff/source/style/PageMasterPropHdl.cxx
View File

@ -295,7 +295,7 @@ bool XMLPMPropHdl_Print::importXML(
}
while ( (nTokenIndex >= 0) && !bFound );
setBOOL( rValue, bFound );
rValue <<= bFound;
return true;
}