diff options
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShape3d.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 12 | ||||
-rw-r--r-- | svx/source/engine3d/deflt3d.cxx | 26 | ||||
-rw-r--r-- | svx/source/engine3d/view3d.cxx | 8 | ||||
-rw-r--r-- | svx/source/fmcomp/dbaexchange.cxx | 38 | ||||
-rw-r--r-- | svx/source/fmcomp/dbaobjectex.cxx | 14 | ||||
-rw-r--r-- | svx/source/form/dataaccessdescriptor.cxx | 4 | ||||
-rw-r--r-- | svx/source/form/dbtoolsclient.cxx | 10 |
8 files changed, 58 insertions, 58 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 789f3f87825f..869eec2b1042 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -329,8 +329,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE ); // pShape2d Convert in scenes which include 3D Objects E3dDefaultAttributes a3DDefaultAttr; - a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True ); - a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True ); + a3DDefaultAttr.SetDefaultLatheCharacterMode( true ); + a3DDefaultAttr.SetDefaultExtrudeCharacterMode( true ); E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr ); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 27515989e779..2364a2a1c905 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -158,7 +158,7 @@ void SvxRectCtl::Resize_Impl() break; } Reset(); - InitSettings( sal_True, sal_True ); + InitSettings( true, true ); } @@ -211,7 +211,7 @@ void SvxRectCtl::InitRectBitmap( void ) -void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) +void SvxRectCtl::InitSettings( bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -372,9 +372,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) void SvxRectCtl::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( sal_True, sal_False ); + InitSettings( true, false ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( sal_False, sal_True ); + InitSettings( false, true ); Window::StateChanged( nType ); } @@ -384,7 +384,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType ) void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( sal_True, sal_True ); + InitSettings( true, true ); else Window::DataChanged( rDCEvt ); } @@ -745,7 +745,7 @@ RECT_POINT SvxRectCtl::GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& } // CompletelyDisabled() added to have a disabled state for SvxRectCtl -void SvxRectCtl::DoCompletelyDisable(sal_Bool bNew) +void SvxRectCtl::DoCompletelyDisable(bool bNew) { mbCompleteDisable = bNew; Invalidate(); diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index 00b0b0644d5d..1b4847a10f02 100644 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -34,14 +34,14 @@ E3dDefaultAttributes::E3dDefaultAttributes() void E3dDefaultAttributes::Reset() { // Compound object - bDefaultCreateNormals = sal_True; - bDefaultCreateTexture = sal_True; + bDefaultCreateNormals = true; + bDefaultCreateTexture = true; // Cube object aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); nDefaultCubeSideFlags = CUBE_FULL; - bDefaultCubePosIsCenter = sal_False; + bDefaultCubePosIsCenter = false; // Sphere object aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0); @@ -49,18 +49,18 @@ void E3dDefaultAttributes::Reset() // Lathe object nDefaultLatheEndAngle = 3600; - bDefaultLatheSmoothed = sal_True; - bDefaultLatheSmoothFrontBack = sal_False; - bDefaultLatheCharacterMode = sal_False; - bDefaultLatheCloseFront = sal_True; - bDefaultLatheCloseBack = sal_True; + bDefaultLatheSmoothed = true; + bDefaultLatheSmoothFrontBack = false; + bDefaultLatheCharacterMode = false; + bDefaultLatheCloseFront = true; + bDefaultLatheCloseBack = true; // Extrude object - bDefaultExtrudeSmoothed = sal_True; - bDefaultExtrudeSmoothFrontBack = sal_False; - bDefaultExtrudeCharacterMode = sal_False; - bDefaultExtrudeCloseFront = sal_True; - bDefaultExtrudeCloseBack = sal_True; + bDefaultExtrudeSmoothed = true; + bDefaultExtrudeSmoothFrontBack = false; + bDefaultExtrudeCharacterMode = false; + bDefaultExtrudeCloseFront = true; + bDefaultExtrudeCloseBack = true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 4428776ddd2d..a945093d21a8 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -708,9 +708,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo { E3dDefaultAttributes aDefault = Get3DDefaultAttributes(); if(bExtrude) - aDefault.SetDefaultExtrudeCharacterMode(sal_True); + aDefault.SetDefaultExtrudeCharacterMode(true); else - aDefault.SetDefaultLatheCharacterMode(sal_True); + aDefault.SetDefaultLatheCharacterMode(true); // Get Itemset of the original object SfxItemSet aSet(pObj->GetMergedItemSet()); @@ -725,8 +725,8 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo { // This SdrPathObj is not filled, leave the front and rear face out. // Moreover, a two-sided representation necessary. - aDefault.SetDefaultExtrudeCloseFront(sal_False); - aDefault.SetDefaultExtrudeCloseBack(sal_False); + aDefault.SetDefaultExtrudeCloseFront(false); + aDefault.SetDefaultExtrudeCloseBack(false); aSet.Put(Svx3DDoubleSidedItem(sal_True)); diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 60c5284cab03..a32cb57e7b8f 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -240,25 +240,25 @@ namespace svx } - sal_Bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats) + bool OColumnTransferable::canExtractColumnDescriptor(const DataFlavorExVector& _rFlavors, sal_Int32 _nFormats) { - sal_Bool bFieldFormat = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR); - sal_Bool bControlFormat = 0 != (_nFormats & CTF_CONTROL_EXCHANGE); - sal_Bool bDescriptorFormat = 0 != (_nFormats & CTF_COLUMN_DESCRIPTOR); + bool bFieldFormat = 0 != (_nFormats & CTF_FIELD_DESCRIPTOR); + bool bControlFormat = 0 != (_nFormats & CTF_CONTROL_EXCHANGE); + bool bDescriptorFormat = 0 != (_nFormats & CTF_COLUMN_DESCRIPTOR); for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); aCheck != _rFlavors.end(); ++aCheck ) { if (bFieldFormat && (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE == aCheck->mnSotId)) - return sal_True; + return true; if (bControlFormat && (SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE == aCheck->mnSotId)) - return sal_True; + return true; if (bDescriptorFormat && (getDescriptorFormatId() == aCheck->mnSotId)) - return sal_True; + return true; } - return sal_False; + return false; } @@ -313,7 +313,7 @@ namespace svx } - sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData + bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData ,OUString& _rDatasource ,OUString& _rDatabaseLocation ,OUString& _rConnectionResource @@ -334,7 +334,7 @@ namespace svx aDescriptor[daCommand] >>= _rCommand; aDescriptor[daCommandType] >>= _nCommandType; aDescriptor[daColumnName] >>= _rFieldName; - return sal_True; + return true; } // check if we have a (string) format we can use .... @@ -344,7 +344,7 @@ namespace svx if (_rData.HasFormat(SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE)) nRecognizedFormat = SOT_FORMATSTR_ID_SBA_CTRLDATAEXCHANGE; if (!nRecognizedFormat) - return sal_False; + return false; OUString sFieldDescription; const_cast<TransferableDataHelper&>(_rData).GetString(nRecognizedFormat, sFieldDescription); @@ -355,7 +355,7 @@ namespace svx _nCommandType = sFieldDescription.getToken(2, cSeparator).toInt32(); _rFieldName = sFieldDescription.getToken(3, cSeparator); - return sal_True; + return true; } @@ -486,7 +486,7 @@ namespace svx } - sal_Bool ODataAccessObjectTransferable::canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors) + bool ODataAccessObjectTransferable::canExtractObjectDescriptor(const DataFlavorExVector& _rFlavors) { for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); aCheck != _rFlavors.end(); @@ -494,13 +494,13 @@ namespace svx ) { if (SOT_FORMATSTR_ID_DBACCESS_TABLE == aCheck->mnSotId) - return sal_True; + return true; if (SOT_FORMATSTR_ID_DBACCESS_QUERY == aCheck->mnSotId) - return sal_True; + return true; if (SOT_FORMATSTR_ID_DBACCESS_COMMAND == aCheck->mnSotId) - return sal_True; + return true; } - return sal_False; + return false; } @@ -571,7 +571,7 @@ namespace svx ,const sal_Int32 _nCommandType ,const OUString& _rCommand ,const Reference< XConnection >& _rxConnection - ,sal_Bool _bAddCommand + ,bool _bAddCommand ,const OUString& _sActiveCommand) { m_aDescriptor.setDataSource(_rDatasource); @@ -656,7 +656,7 @@ namespace svx } - sal_Bool OMultiColumnTransferable::canExtractDescriptor(const DataFlavorExVector& _rFlavors) + bool OMultiColumnTransferable::canExtractDescriptor(const DataFlavorExVector& _rFlavors) { DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); for ( ; diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 0687e6aa8bbf..5af2af2e6b21 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -56,7 +56,7 @@ namespace svx - sal_uInt32 OComponentTransferable::getDescriptorFormatId(sal_Bool _bExtractForm) + sal_uInt32 OComponentTransferable::getDescriptorFormatId(bool _bExtractForm) { static sal_uInt32 s_nReportFormat = (sal_uInt32)-1; static sal_uInt32 s_nFormFormat = (sal_uInt32)-1; @@ -93,14 +93,14 @@ namespace svx sal_Bool OComponentTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); - if ( nFormatId == getDescriptorFormatId(sal_True) || nFormatId == getDescriptorFormatId(sal_False) ) + if ( nFormatId == getDescriptorFormatId(true) || nFormatId == getDescriptorFormatId(false) ) return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ), _rFlavor ); return sal_False; } - sal_Bool OComponentTransferable::canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors,sal_Bool _bForm ) + bool OComponentTransferable::canExtractComponentDescriptor(const DataFlavorExVector& _rFlavors, bool _bForm ) { DataFlavorExVector::const_iterator aEnd = _rFlavors.end(); for ( DataFlavorExVector::const_iterator aCheck = _rFlavors.begin(); @@ -109,17 +109,17 @@ namespace svx ) { if ( getDescriptorFormatId(_bForm) == aCheck->mnSotId ) - return sal_True; + return true; } - return sal_False; + return false; } ODataAccessDescriptor OComponentTransferable::extractComponentDescriptor(const TransferableDataHelper& _rData) { - sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(sal_True)); - if ( bForm || _rData.HasFormat(getDescriptorFormatId(sal_False)) ) + sal_Bool bForm = _rData.HasFormat(getDescriptorFormatId(true)); + if ( bForm || _rData.HasFormat(getDescriptorFormatId(false)) ) { // the object has a real descriptor object (not just the old compatible format) diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index 3c1371234306..dc75cb6c7875 100644 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx @@ -343,7 +343,7 @@ namespace svx } - sal_Bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const + bool ODataAccessDescriptor::has(DataAccessDescriptorProperty _eWhich) const { return m_pImpl->m_aValues.find(_eWhich) != m_pImpl->m_aValues.end(); } @@ -369,7 +369,7 @@ namespace svx } - void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, sal_Bool _bClear) + void ODataAccessDescriptor::initializeFrom(const Sequence< PropertyValue >& _rValues, bool _bClear) { if (_bClear) clear(); diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index 6f288a758d0d..a22155887418 100644 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -57,7 +57,7 @@ namespace svxform ODbtoolsClient::ODbtoolsClient() { - m_bCreateAlready = sal_False; + m_bCreateAlready = false; } @@ -264,18 +264,18 @@ namespace svxform } - sal_Bool OStaticDataAccessTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const + bool OStaticDataAccessTools::canInsert(const Reference< XPropertySet>& _rxCursorSet) const { - sal_Bool bRet = sal_False; + bool bRet = false; if ( ensureLoaded() ) bRet = m_xDataAccessTools->canInsert( _rxCursorSet ); return bRet; } - sal_Bool OStaticDataAccessTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const + bool OStaticDataAccessTools::canUpdate(const Reference< XPropertySet>& _rxCursorSet) const { - sal_Bool bRet = sal_False; + bool bRet = false; if ( ensureLoaded() ) bRet = m_xDataAccessTools->canUpdate( _rxCursorSet ); return bRet; |