diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-01 14:35:59 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-04-03 09:17:51 +0200 |
commit | ba73873ea70b076e0c04d33fea2e243a1b6f3a43 (patch) | |
tree | 895fd1fefa82f9cd9c005eab68ab32c99096a94b /vbahelper | |
parent | f3802139ac6d21edbd1b30df9675eac1aae50360 (diff) |
vbahelper: sal_Bool->bool
Change-Id: Ic4bcc2fa02426e1995d08a6992cc5b35777c1c9a
Diffstat (limited to 'vbahelper')
-rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 16 | ||||
-rw-r--r-- | vbahelper/source/vbahelper/vbashapes.cxx | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 90efa1e9ed4a..c22f1f108bfc 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -339,7 +339,7 @@ XLRGBToOORGB( const uno::Any& aCol ) return uno::makeAny( nCol ); } -void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, sal_Bool bUseSelection ) +void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno::Any& To, const uno::Any& Copies, const uno::Any& Preview, const uno::Any& /*ActivePrinter*/, const uno::Any& /*PrintToFile*/, const uno::Any& Collate, const uno::Any& PrToFileName, bool bUseSelection ) { sal_Int32 nTo = 0; sal_Int32 nFrom = 0; @@ -635,7 +635,7 @@ OUString VBAToRegexp(const OUString &rIn, bool bForLike ) return sResult.makeStringAndClear( ); } -double getPixelTo100thMillimeterConversionFactor( const css::uno::Reference< css::awt::XDevice >& xDevice, sal_Bool bVertical) +double getPixelTo100thMillimeterConversionFactor( const css::uno::Reference< css::awt::XDevice >& xDevice, bool bVertical) { double fConvertFactor = 1.0; if( bVertical ) @@ -649,12 +649,12 @@ double getPixelTo100thMillimeterConversionFactor( const css::uno::Reference< css return fConvertFactor; } -double PointsToPixels( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, sal_Bool bVertical) +double PointsToPixels( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPoints, bool bVertical) { double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical ); return PointsToHmm( fPoints ) * fConvertFactor; } -double PixelsToPoints( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, sal_Bool bVertical) +double PixelsToPoints( const css::uno::Reference< css::awt::XDevice >& xDevice, double fPixels, bool bVertical) { double fConvertFactor = getPixelTo100thMillimeterConversionFactor( xDevice, bVertical ); return HmmToPoints(static_cast<sal_Int32>(fPixels/fConvertFactor)); @@ -702,7 +702,7 @@ sal_Int32 getPointerStyle( const uno::Reference< frame::XModel >& xModel ) // #FIXME this method looks wrong, shouldn't it just affect calc *or* writer // document/frame/window(s) but not both ( and depending on what api called // this ) -void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Pointer& rPointer, sal_Bool bOverWrite ) +void setCursorHelper( const uno::Reference< frame::XModel >& xModel, const Pointer& rPointer, bool bOverWrite ) { ::std::vector< uno::Reference< frame::XController > > aControllers; @@ -774,17 +774,17 @@ uno::Any getPropertyValue( const uno::Sequence< beans::PropertyValue >& aProp, c return result; } -sal_Bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const OUString& aName, const uno::Any& aValue ) +bool setPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const OUString& aName, const uno::Any& aValue ) { for ( sal_Int32 i = 0; i < aProp.getLength(); i++ ) { if ( aProp[i].Name.equals(aName) ) { aProp[i].Value = aValue; - return sal_True; + return true; } } - return sal_False; + return false; } void setOrAppendPropertyValue( uno::Sequence< beans::PropertyValue >& aProp, const OUString& aName, const uno::Any& aValue ) diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 7e03aafd5b95..1f3287c6052b 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -78,7 +78,7 @@ void ScVbaShapes::initBaseCollection() m_xNameAccess.set( xShapes, uno::UNO_QUERY ); } -ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes, sal_True ), m_nNewShapeCount(0), m_xModel( xModel ) +ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes, true ), m_nNewShapeCount(0), m_xModel( xModel ) { m_xShapes.set( xShapes, uno::UNO_QUERY_THROW ); m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); |