summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-11-09 20:49:05 +0100
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-11-16 16:54:39 +0100
commit2abe293f085fc66eeaeeae85c9714a41a874cbcd (patch)
tree5bc520bcd1b60cd0f39ccf9b72e721a981d4ebe6
parentfe4901829f7e1ff397945a7abd5af977a80978e9 (diff)
makeAny(sal_True/sal_False) to makeAny(true/false) in sw
Change-Id: Ie368fecd39189dc6ea72737b0c695c55a2d350a9
-rw-r--r--sw/source/core/unocore/swunohelper.cxx2
-rw-r--r--sw/source/filter/xml/wrtxml.cxx2
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx2
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx12
-rw-r--r--sw/source/ui/vba/vbaselection.cxx4
-rw-r--r--sw/source/ui/vba/vbaview.cxx6
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx4
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx2
-rw-r--r--sw/source/uibase/shells/textsh.cxx2
-rw-r--r--sw/source/uibase/uno/unomailmerge.cxx4
-rw-r--r--sw/source/uibase/utlui/unotools.cxx4
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx4
12 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index aeee2a3a7f18..40e0761e192c 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -70,7 +70,7 @@ bool UCB_DeleteFile( const OUString& rURL )
::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >(),
comphelper::getProcessComponentContext() );
aTempContent.executeCommand("delete",
- ::com::sun::star::uno::makeAny( sal_True ) );
+ ::com::sun::star::uno::makeAny( true ) );
bRemoved = true;
}
catch( ::com::sun::star::uno::Exception& )
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index a682f7dff7db..f94ce203da84 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -218,7 +218,7 @@ sal_uInt32 SwXMLWriter::_Write( const uno::Reference < task::XStatusIndicator >&
if ( bOASIS &&
docfunc::HasOutlineStyleToBeWrittenAsNormalListStyle( *pDoc ) )
{
- xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", makeAny( sal_True ) );
+ xInfoSet->setPropertyValue( "OutlineStyleAsNormalListStyle", makeAny( true ) );
}
// filter arguments
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index 78a498b14255..55ae07d1aca2 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -81,7 +81,7 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
}
else
{
- xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( sal_False ) );
+ xProps->setPropertyValue("ParaIsNumberingRestart", uno::makeAny( false ) );
}
rListTemplate.applyListTemplate( xProps );
}
diff --git a/sw/source/ui/vba/vbapagesetup.cxx b/sw/source/ui/vba/vbapagesetup.cxx
index 8c75691e9509..d06247302fbd 100644
--- a/sw/source/ui/vba/vbapagesetup.cxx
+++ b/sw/source/ui/vba/vbapagesetup.cxx
@@ -61,7 +61,7 @@ double SAL_CALL SwVbaPageSetup::getHeaderDistance() throw (uno::RuntimeException
bool isHeaderOn = false;
mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
if( !isHeaderOn )
- mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) );
return VbaPageSetupBase::getHeaderMargin();
}
@@ -84,7 +84,7 @@ void SAL_CALL SwVbaPageSetup::setHeaderDistance( double _headerdistance ) throw
mxPageProps->getPropertyValue("HeaderIsOn") >>= isHeaderOn;
if( !isHeaderOn )
- mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue("HeaderIsOn", uno::makeAny( true ) );
mxPageProps->getPropertyValue("TopMargin") >>= aktTopMargin;
mxPageProps->getPropertyValue("HeaderBodyDistance") >>= aktSpacing;
@@ -104,7 +104,7 @@ double SAL_CALL SwVbaPageSetup::getFooterDistance() throw (uno::RuntimeException
bool isFooterOn = false;
mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn;
if( !isFooterOn )
- mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) );
return VbaPageSetupBase::getFooterMargin();
}
@@ -118,7 +118,7 @@ void SAL_CALL SwVbaPageSetup::setFooterDistance( double _footerdistance ) throw
mxPageProps->getPropertyValue("FooterIsOn") >>= isFooterOn;
if( !isFooterOn )
- mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_True ) );
+ mxPageProps->setPropertyValue("FooterIsOn", uno::makeAny( true ) );
mxPageProps->getPropertyValue("BottomMargin") >>= aktBottomMargin;
mxPageProps->getPropertyValue("FooterBodyDistance") >>= aktSpacing;
@@ -173,8 +173,8 @@ void SAL_CALL SwVbaPageSetup::setDifferentFirstPageHeaderFooter( sal_Bool status
{
nTopMargin += nHeaderHeight;
nBottomMargin += nFooterHeight;
- xStyleProps->setPropertyValue("HeaderIsOn", uno::makeAny( sal_False ) );
- xStyleProps->setPropertyValue("FooterIsOn", uno::makeAny( sal_False ) );
+ xStyleProps->setPropertyValue("HeaderIsOn", uno::makeAny( false ) );
+ xStyleProps->setPropertyValue("FooterIsOn", uno::makeAny( false ) );
}
uno::Reference< text::XPageCursor > xPageCursor( word::getXTextViewCursor( mxModel ), uno::UNO_QUERY_THROW );
if( xPageCursor->getPage() != 1 )
diff --git a/sw/source/ui/vba/vbaselection.cxx b/sw/source/ui/vba/vbaselection.cxx
index cc321aeb52d7..f2af13a09a08 100644
--- a/sw/source/ui/vba/vbaselection.cxx
+++ b/sw/source/ui/vba/vbaselection.cxx
@@ -695,9 +695,9 @@ uno::Any SAL_CALL SwVbaSelection::Information( sal_Int32 _type ) throw (uno::Run
uno::Reference< text::XTextTable > xTextTable;
xCursorProps->getPropertyValue("TextTable") >>= xTextTable;
if( xTextTable.is() )
- result = uno::makeAny( sal_True );
+ result = uno::makeAny( true );
else
- result = uno::makeAny( sal_False );
+ result = uno::makeAny( false );
break;
}
case word::WdInformation::wdHeaderFooterType:
diff --git a/sw/source/ui/vba/vbaview.cxx b/sw/source/ui/vba/vbaview.cxx
index bca5ca6088f2..d268c4b536d6 100644
--- a/sw/source/ui/vba/vbaview.cxx
+++ b/sw/source/ui/vba/vbaview.cxx
@@ -221,12 +221,12 @@ SwVbaView::setType( ::sal_Int32 _type ) throw (css::uno::RuntimeException, std::
case word::WdViewType::wdPrintView:
case word::WdViewType::wdNormalView:
{
- mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( sal_False ) );
+ mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( false ) );
break;
}
case word::WdViewType::wdWebView:
{
- mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( sal_True ) );
+ mxViewSettings->setPropertyValue("ShowOnlineLayout", uno::makeAny( true ) );
break;
}
case word::WdViewType::wdPrintPreview:
@@ -334,7 +334,7 @@ uno::Reference< text::XTextRange > SwVbaView::getHFTextRange( sal_Int32 nType )
xPageProps->getPropertyValue( aPropIsShared ) >>= isShared;
if( !isOn )
{
- xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( sal_True ) );
+ xPageProps->setPropertyValue( aPropIsOn, uno::makeAny( true ) );
xPageProps->setPropertyValue( aPropBodyDistance, uno::makeAny( DEFAULT_BODY_DISTANCE ) );
}
if( !isShared )
diff --git a/sw/source/ui/vba/vbawrapformat.cxx b/sw/source/ui/vba/vbawrapformat.cxx
index 6944558ba9e1..38002e5ddfee 100644
--- a/sw/source/ui/vba/vbawrapformat.cxx
+++ b/sw/source/ui/vba/vbawrapformat.cxx
@@ -62,13 +62,13 @@ void SwVbaWrapFormat::makeWrap() throw (uno::RuntimeException)
case word::WdWrapType::wdWrapSquare:
{
eTextMode = text::WrapTextMode_PARALLEL;
- m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( sal_False ) );
+ m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( false ) );
break;
}
case word::WdWrapType::wdWrapTight:
{
eTextMode = text::WrapTextMode_PARALLEL;
- m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( sal_True ) );
+ m_xPropertySet->setPropertyValue("SurroundContour", uno::makeAny( true ) );
break;
}
default:
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 21cfa2ee7324..c18f4cf0dfc7 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -711,7 +711,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
{
if (m_bGrammarResults)
{
- SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( sal_True ));
+ SvtLinguConfig().SetProperty( UPN_IS_GRAMMAR_INTERACTIVE, uno::makeAny( true ));
}
m_pSh->Left(CRSR_SKIP_CHARS, false, 1, false );
{
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 3ffbba4a9253..89f0871a1faf 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -385,7 +385,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq)
if ( eScroll == ScrollingAuto )
xSet->setPropertyValue("FrameIsAutoScroll",
- uno::makeAny( sal_True ) );
+ uno::makeAny( true ) );
else
xSet->setPropertyValue("FrameIsScrollingMode",
uno::makeAny( eScroll == ScrollingYes ) );
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 2fd78f078ee0..4687312d9a7b 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -633,7 +633,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
xRowSetPropSet->setPropertyValue( "Command", makeAny( aCurDataCommand ) );
xRowSetPropSet->setPropertyValue( "CommandType", makeAny( nCurDataCommandType ) );
xRowSetPropSet->setPropertyValue( "EscapeProcessing", makeAny( bCurEscapeProcessing ) );
- xRowSetPropSet->setPropertyValue( "ApplyFilter", makeAny( sal_True ) );
+ xRowSetPropSet->setPropertyValue( "ApplyFilter", makeAny( true ) );
xRowSetPropSet->setPropertyValue( "Filter", makeAny( aCurFilter ) );
Reference< sdbc::XRowSet > xRowSet( xInstance, UNO_QUERY );
@@ -830,7 +830,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
return makeAny( Reference< XComponent >( xTextDoc->queryInterface( XComponent::static_type() ), css::uno::UNO_QUERY) );
}
else
- return makeAny( sal_True );
+ return makeAny( true );
}
void SAL_CALL SwXMailMerge::cancel() throw (com::sun::star::uno::RuntimeException, std::exception)
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 6d3c4baf89a0..a3c19c0e578b 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -181,7 +181,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps,
//To reproduce this problem, in edit->autotext and click through
//the examples and see if the preview gets a horizontal scrollbar
- uno::Any aFalseSet(uno::makeAny(sal_False));
+ uno::Any aFalseSet(uno::makeAny(false));
xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, aFalseSet);
xViewProps->setPropertyValue(UNO_NAME_SHOW_HORI_SCROLL_BAR, aFalseSet);
@@ -189,7 +189,7 @@ static void disableScrollBars(uno::Reference< beans::XPropertySet > xViewProps,
if (bEnableOnlineMode)
{
- xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, uno::makeAny(sal_True));
+ xViewProps->setPropertyValue(UNO_NAME_SHOW_ONLINE_LAYOUT, uno::makeAny(true));
}
}
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 48fc4cc5ea28..daa9d7479ec8 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -534,9 +534,9 @@ bool SwWrtShell::InsertOleObject( const svt::EmbeddedObjectRef& xRef, SwFlyFrmFm
bDisableDataTableDialog )
{
xProps->setPropertyValue("DisableDataTableDialog",
- uno::makeAny( sal_False ) );
+ uno::makeAny( false ) );
xProps->setPropertyValue("DisableComplexChartTypes",
- uno::makeAny( sal_False ) );
+ uno::makeAny( false ) );
uno::Reference< util::XModifiable > xModifiable( xProps, uno::UNO_QUERY );
if ( xModifiable.is() )
{