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

writerfilter: sal_Bool->bool

Browse Source 
Change-Id: I794dde724b2ec3011f72c712c073f70df39aed58
This commit is contained in:
Noel Grandin
2014-04-30 09:57:53 +02:00
parent 0376c6dc74
commit 19d35573fa
10 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
writerfilter/source/dmapper/CellColorHandler.cxx
View File

@@ -358,7 +358,7 @@ void CellColorHandler::disableInteropGrabBag()
m_aInteropGrabBag.clear(); m_aInteropGrabBag.clear();
} }
sal_Bool CellColorHandler::isInteropGrabBagEnabled() bool CellColorHandler::isInteropGrabBagEnabled()
{ {
return !(m_aInteropGrabBagName.isEmpty()); return !(m_aInteropGrabBagName.isEmpty());
} }

2
writerfilter/source/dmapper/CellColorHandler.hxx
View File

@@ -59,7 +59,7 @@ public:
void enableInteropGrabBag(const OUString& aName); void enableInteropGrabBag(const OUString& aName);
beans::PropertyValue getInteropGrabBag(); beans::PropertyValue getInteropGrabBag();
void disableInteropGrabBag(); void disableInteropGrabBag();
sal_Bool isInteropGrabBagEnabled(); bool isInteropGrabBagEnabled();
}; };
typedef boost::shared_ptr< CellColorHandler > CellColorHandlerPtr; typedef boost::shared_ptr< CellColorHandler > CellColorHandlerPtr;
}} }}

8
writerfilter/source/dmapper/DomainMapper.cxx
View File

@@ -1206,7 +1206,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
{ {
CellColorHandlerPtr pCellColorHandler( new CellColorHandler ); CellColorHandlerPtr pCellColorHandler( new CellColorHandler );
pCellColorHandler->setOutputFormat( CellColorHandler::Paragraph ); pCellColorHandler->setOutputFormat( CellColorHandler::Paragraph );
sal_Bool bEnableTempGrabBag = !pCellColorHandler->isInteropGrabBagEnabled(); bool bEnableTempGrabBag = !pCellColorHandler->isInteropGrabBagEnabled();
if( bEnableTempGrabBag ) if( bEnableTempGrabBag )
pCellColorHandler->enableInteropGrabBag( "TempShdPropsGrabBag" ); pCellColorHandler->enableInteropGrabBag( "TempShdPropsGrabBag" );
@@ -1517,7 +1517,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
} }
break; break;
case NS_ooxml::LN_EG_RPrBase_kern: // auto kerning is bound to a minimum font size in Word - but not in Writer :-( case NS_ooxml::LN_EG_RPrBase_kern: // auto kerning is bound to a minimum font size in Word - but not in Writer :-(
rContext->Insert(PROP_CHAR_AUTO_KERNING, uno::makeAny( sal_Bool(nIntValue) ) ); rContext->Insert(PROP_CHAR_AUTO_KERNING, uno::makeAny( nIntValue != 0 ) );
break; break;
case NS_ooxml::LN_EG_RPrBase_w: case NS_ooxml::LN_EG_RPrBase_w:
rContext->Insert(PROP_CHAR_SCALE_WIDTH, rContext->Insert(PROP_CHAR_SCALE_WIDTH,
@@ -2204,10 +2204,10 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
case NS_ooxml::LN_EG_RPrBase_snapToGrid: // "Use document grid settings for inter-paragraph spacing" case NS_ooxml::LN_EG_RPrBase_snapToGrid: // "Use document grid settings for inter-paragraph spacing"
break; break;
case NS_ooxml::LN_CT_PPrBase_contextualSpacing: case NS_ooxml::LN_CT_PPrBase_contextualSpacing:
rContext->Insert(PROP_PARA_CONTEXT_MARGIN, uno::makeAny( sal_Bool( nIntValue ) )); rContext->Insert(PROP_PARA_CONTEXT_MARGIN, uno::makeAny( nIntValue != 0 ));
break; break;
case NS_ooxml::LN_CT_PPrBase_mirrorIndents: // mirrorIndents case NS_ooxml::LN_CT_PPrBase_mirrorIndents: // mirrorIndents
rContext->Insert(PROP_MIRROR_INDENTS, uno::makeAny(sal_Bool(nIntValue)), true, PARA_GRAB_BAG); rContext->Insert(PROP_MIRROR_INDENTS, uno::makeAny( nIntValue != 0 ), true, PARA_GRAB_BAG);
break; break;
case NS_ooxml::LN_EG_SectPrContents_formProt: //section protection, only form editing is enabled - unsupported case NS_ooxml::LN_EG_SectPrContents_formProt: //section protection, only form editing is enabled - unsupported
case NS_ooxml::LN_EG_SectPrContents_vAlign: case NS_ooxml::LN_EG_SectPrContents_vAlign:

4
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
View File

@@ -553,7 +553,7 @@ TableStyleSheetEntry * DomainMapperTableHandler::endTableGetTableStyle(TableInfo
else else
{ {
m_aTableProperties->Insert( PROP_RELATIVE_WIDTH, uno::makeAny( sal_Int16( nTableWidth ) ) ); m_aTableProperties->Insert( PROP_RELATIVE_WIDTH, uno::makeAny( sal_Int16( nTableWidth ) ) );
m_aTableProperties->Insert( PROP_IS_WIDTH_RELATIVE, uno::makeAny( sal_Bool( sal_True ) ) ); m_aTableProperties->Insert( PROP_IS_WIDTH_RELATIVE, uno::makeAny( true ) );
} }
sal_Int32 nHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH; sal_Int32 nHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH;
@@ -987,7 +987,7 @@ void DomainMapperTableHandler::endTable(unsigned int nestedTableLevel)
if (xTable.is() && xStart.is() && xEnd.is()) if (xTable.is() && xStart.is() && xEnd.is())
{ {
uno::Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xTableProperties(xTable, uno::UNO_QUERY);
sal_Bool bIsRelative = sal_False; bool bIsRelative = false;
xTableProperties->getPropertyValue("IsWidthRelative") >>= bIsRelative; xTableProperties->getPropertyValue("IsWidthRelative") >>= bIsRelative;
if (!bIsRelative) if (!bIsRelative)
{ {

2
writerfilter/source/dmapper/PropertyMap.cxx
View File

@@ -1091,7 +1091,7 @@ void SectionPropertyMap::CloseSectionGroup( DomainMapper_Impl& rDM_Impl )
{ {
uno::Reference< beans::XPropertySet > xDocProperties; uno::Reference< beans::XPropertySet > xDocProperties;
xDocProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument(), uno::UNO_QUERY_THROW ); xDocProperties = uno::Reference< beans::XPropertySet >( rDM_Impl.GetTextDocument(), uno::UNO_QUERY_THROW );
sal_Bool bSquaredPageMode = sal_False; bool bSquaredPageMode = false;
operator[](PROP_GRID_STANDARD_MODE) = uno::makeAny( !bSquaredPageMode ); operator[](PROP_GRID_STANDARD_MODE) = uno::makeAny( !bSquaredPageMode );
xDocProperties->setPropertyValue("DefaultPageMode", uno::makeAny( bSquaredPageMode )); xDocProperties->setPropertyValue("DefaultPageMode", uno::makeAny( bSquaredPageMode ));
} }

4
writerfilter/source/dmapper/StyleSheetTable.cxx
View File

@@ -439,7 +439,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
{ {
beans::PropertyValue aValue; beans::PropertyValue aValue;
aValue.Name = "default"; aValue.Name = "default";
aValue.Value = uno::makeAny(sal_Bool(m_pImpl->m_pCurrentEntry->bIsDefaultStyle)); aValue.Value = uno::makeAny(m_pImpl->m_pCurrentEntry->bIsDefaultStyle);
m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue); m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue);
} }
break; break;
@@ -448,7 +448,7 @@ void StyleSheetTable::lcl_attribute(Id Name, Value & val)
{ {
beans::PropertyValue aValue; beans::PropertyValue aValue;
aValue.Name = "customStyle"; aValue.Name = "customStyle";
aValue.Value = uno::makeAny(sal_Bool(nIntValue != 0)); aValue.Value = uno::makeAny(nIntValue != 0);
m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue); m_pImpl->m_pCurrentEntry->AppendInteropGrabBag(aValue);
} }
break; break;

2
writerfilter/source/dmapper/TablePropertiesHandler.cxx
View File

@@ -173,7 +173,7 @@ namespace dmapper {
{ {
//row can't break across pages if nIntValue == 1 //row can't break across pages if nIntValue == 1
TablePropertyMapPtr pPropMap( new TablePropertyMap ); TablePropertyMapPtr pPropMap( new TablePropertyMap );
pPropMap->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny(sal_Bool( nIntValue == 1 ? sal_False : sal_True ) )); pPropMap->Insert( PROP_IS_SPLIT_ALLOWED, uno::makeAny( nIntValue != 1 ) );
insertRowProps(pPropMap); insertRowProps(pPropMap);
} }
break; break;

4
writerfilter/source/filter/RtfFilter.cxx
View File

@@ -63,7 +63,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
return xFilter->filter(aDescriptor); return xFilter->filter(aDescriptor);
} }
sal_Bool bResult(sal_False); bool bResult(false);
uno::Reference<task::XStatusIndicator> xStatusIndicator; uno::Reference<task::XStatusIndicator> xStatusIndicator;
try try
@@ -120,7 +120,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence< beans::PropertyValue >& aDescrip
writerfilter::rtftok::RTFDocument::Pointer_t const pDocument( writerfilter::rtftok::RTFDocument::Pointer_t const pDocument(
writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc, xFrame, xStatusIndicator)); writerfilter::rtftok::RTFDocumentFactory::createDocument(m_xContext, xInputStream, m_xDstDoc, xFrame, xStatusIndicator));
pDocument->resolve(*pStream); pDocument->resolve(*pStream);
bResult = sal_True; bResult = true;
#ifdef DEBUG_IMPORT #ifdef DEBUG_IMPORT
dmapperLogger->endDocument(); dmapperLogger->endDocument();
#endif #endif

2
writerfilter/source/filter/WriterFilter.hxx
View File

@@ -85,7 +85,7 @@ private:
OUString WriterFilter_getImplementationName() OUString WriterFilter_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException ); throw ( ::com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL WriterFilter_supportsService( const OUString& ServiceName ) bool SAL_CALL WriterFilter_supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException ); throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL WriterFilter_getSupportedServiceNames( ) ::com::sun::star::uno::Sequence< OUString > SAL_CALL WriterFilter_getSupportedServiceNames( )

2
writerfilter/source/filter/WriterFilterDetection.hxx
View File

@@ -53,7 +53,7 @@ public:
OUString WriterFilterDetection_getImplementationName() OUString WriterFilterDetection_getImplementationName()
throw ( ::com::sun::star::uno::RuntimeException ); throw ( ::com::sun::star::uno::RuntimeException );
sal_Bool SAL_CALL WriterFilterDetection_supportsService( const OUString& ServiceName ) bool SAL_CALL WriterFilterDetection_supportsService( const OUString& ServiceName )
throw ( ::com::sun::star::uno::RuntimeException ); throw ( ::com::sun::star::uno::RuntimeException );
::com::sun::star::uno::Sequence< OUString > SAL_CALL WriterFilterDetection_getSupportedServiceNames( ) ::com::sun::star::uno::Sequence< OUString > SAL_CALL WriterFilterDetection_getSupportedServiceNames( )