diff options
33 files changed, 109 insertions, 109 deletions
diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index fcc4693fec22..69bde000d955 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -439,7 +439,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject& _rSource ) throw( Ru void OButtonControl::actionPerformed(const ActionEvent& /*rEvent*/) throw ( ::com::sun::star::uno::RuntimeException) { // Asynchron fuer starutil::URL-Button - ULONG n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) ); + sal_uLong n = Application::PostUserEvent( LINK(this, OButtonControl,OnClick) ); { ::osl::MutexGuard aGuard( m_aMutex ); m_nClickEvent = n; diff --git a/forms/source/component/Button.hxx b/forms/source/component/Button.hxx index 72d53e6a1b0c..641af4a20d64 100644 --- a/forms/source/component/Button.hxx +++ b/forms/source/component/Button.hxx @@ -127,7 +127,7 @@ class OButtonControl :public OButtonControl_BASE ,public OFormNavigationHelper { private: - ULONG m_nClickEvent; + sal_uLong m_nClickEvent; sal_Int16 m_nTargetUrlFeatureId; /// caches the value of the "Enabled" property of our model sal_Bool m_bEnabledByPropertyValue; diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 154ed4b00272..d7c56b293523 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -1500,8 +1500,8 @@ Reference< XCloneable > SAL_CALL ODatabaseForm::createClone( ) throw (RuntimeEx //------------------------------------------------------------------------------ void ODatabaseForm::fire( sal_Int32* pnHandles, const Any* pNewValues, const Any* pOldValues, sal_Int32 nCount, sal_Bool bVetoable ) { - // same as in getFastPropertyValue(INT32) : if we're resetting currently don't fire any changes of the - // IsModified property from FALSE to TRUE, as this is only temporary 'til the reset is done + // same as in getFastPropertyValue(sal_Int32) : if we're resetting currently don't fire any changes of the + // IsModified property from sal_False to sal_True, as this is only temporary 'til the reset is done if (m_nResetsPending > 0) { // look for the PROPERTY_ID_ISMODIFIED diff --git a/forms/source/component/DatabaseForm.hxx b/forms/source/component/DatabaseForm.hxx index af506aa305d2..2ada38be93e6 100644 --- a/forms/source/component/DatabaseForm.hxx +++ b/forms/source/component/DatabaseForm.hxx @@ -201,7 +201,7 @@ class ODatabaseForm :public OFormComponents // will be used as additional context information // when an exception is catched and forwarded to the listeners - INT32 m_nResetsPending; + sal_Int32 m_nResetsPending; // <overwritten_properties> sal_Int32 m_nPrivileges; sal_Bool m_bInsertOnly; @@ -505,12 +505,12 @@ private: @param _rEvent the event to notify @param _bAllowSQLException - <TRUE/> if SQLExceptions are allowed to leave the method + <sal_True/> if SQLExceptions are allowed to leave the method @param _rGuard the guard to be cleared before actually calling into the listeners, but after making a copy of the listeners array to operate on. @return - <TRUE/> if and only if the execution has been approved + <sal_True/> if and only if the execution has been approved */ bool impl_approveRowChange_throw( const ::com::sun::star::lang::EventObject& _rEvent, diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx index 5b4146b82d06..e9c2466350dc 100644 --- a/forms/source/component/Edit.hxx +++ b/forms/source/component/Edit.hxx @@ -47,7 +47,7 @@ class OEditModel ::com::sun::star::uno::Any m_aLastKnownValue; ::std::auto_ptr< ::dbtools::FormattedColumnValue > m_pValueFormatter; - sal_Bool m_bMaxTextLenModified : 1; // set to <TRUE/> when we change the MaxTextLen of the aggregate + sal_Bool m_bMaxTextLenModified : 1; // set to <sal_True/> when we change the MaxTextLen of the aggregate sal_Bool m_bWritingFormattedFake : 1; // are we writing something which should be interpreted as formatted upon reading? diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index de2dda9ca388..984e9b324b30 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -920,7 +920,7 @@ void OControlModel::read(const Reference<stario::XObjectInputStream>& InStream) } // 2. Lesen des Versionsnummer - UINT16 nVersion = InStream->readShort(); + sal_uInt16 nVersion = InStream->readShort(); // 3. Lesen der allgemeinen Properties ::comphelper::operator>>( InStream, m_aName); @@ -1758,7 +1758,7 @@ void SAL_CALL OBoundControlModel::read( const Reference< stario::XObjectInputStr OControlModel::read(_rxInStream); osl::MutexGuard aGuard(m_aMutex); - UINT16 nVersion = _rxInStream->readShort(); (void)nVersion; + sal_uInt16 nVersion = _rxInStream->readShort(); (void)nVersion; ::comphelper::operator>>( _rxInStream, m_aControlSource); } @@ -2128,7 +2128,7 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm) m_xColumnUpdate = Reference< XColumnUpdate >( m_xField, UNO_QUERY ); m_xColumn = Reference< XColumn >( m_xField, UNO_QUERY ); - INT32 nNullableFlag = ColumnValue::NO_NULLS; + sal_Int32 nNullableFlag = ColumnValue::NO_NULLS; m_xField->getPropertyValue(PROPERTY_ISNULLABLE) >>= nNullableFlag; m_bRequired = (ColumnValue::NO_NULLS == nNullableFlag); // we're optimistic : in case of ColumnValue_NULLABLE_UNKNOWN we assume nullability .... diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx index 9c20de263d80..6094839a99b7 100644 --- a/forms/source/component/Hidden.cxx +++ b/forms/source/component/Hidden.cxx @@ -171,7 +171,7 @@ void SAL_CALL OHiddenModel::write(const Reference<XObjectOutputStream>& _rxOutSt void SAL_CALL OHiddenModel::read(const Reference<XObjectInputStream>& _rxInStream) throw(IOException, RuntimeException) { // Version - UINT16 nVersion = _rxInStream->readShort(); + sal_uInt16 nVersion = _rxInStream->readShort(); // Name DBG_ASSERT(nVersion != 1, "OHiddenModel::read : this version is obsolete !"); diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 3a7e05404d75..a2ad111a79b7 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -857,7 +857,7 @@ bool OImageControlControl::implInsertGraphics() implClearGraphics( sal_False ); sal_Bool bIsLink = sal_False; xController->getValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bIsLink; - // Force bIsLink to be TRUE if we're bound to a field. Though we initialized the file picker with IsLink=TRUE + // Force bIsLink to be sal_True if we're bound to a field. Though we initialized the file picker with IsLink=TRUE // in this case, and disabled the respective control, there might be picker implementations which do not // respect this, and return IsLink=FALSE here. In this case, "normalize" the flag. // #i112659# / 2010-08-26 / frank.schoenheit@oracle.com diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx index c4a1216ad76c..48a2499381a9 100644 --- a/forms/source/component/RadioButton.cxx +++ b/forms/source/component/RadioButton.cxx @@ -310,7 +310,7 @@ void SAL_CALL ORadioButtonModel::read(const Reference<XObjectInputStream>& _rxIn ::osl::MutexGuard aGuard(m_aMutex); // Version - UINT16 nVersion = _rxInStream->readShort(); + sal_uInt16 nVersion = _rxInStream->readShort(); ::rtl::OUString sReferenceValue; sal_Int16 nDefaultChecked( 0 ); diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx index f888aa4e3309..caebdf3f3848 100644 --- a/forms/source/component/clickableimage.hxx +++ b/forms/source/component/clickableimage.hxx @@ -241,7 +241,7 @@ namespace frm ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > _getTypes(); /** approves the action by calling the approve listeners - @return <TRUE/> if and only if the action has <em>not</em> been cancelled by a listener + @return <sal_True/> if and only if the action has <em>not</em> been cancelled by a listener */ bool approveAction( ); diff --git a/forms/source/component/entrylisthelper.hxx b/forms/source/component/entrylisthelper.hxx index 64778e9abdc3..b72a069e2dc5 100644 --- a/forms/source/component/entrylisthelper.hxx +++ b/forms/source/component/entrylisthelper.hxx @@ -84,7 +84,7 @@ namespace frm /** handling the XEventListener::disposing call for the case where our list source is being disposed @return - <TRUE/> if and only if the disposed object was our list source, and so the + <sal_True/> if and only if the disposed object was our list source, and so the event was handled */ bool handleDisposing( const ::com::sun::star::lang::EventObject& _rEvent ); diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 0c8b421008a3..42e79443279b 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -194,7 +194,7 @@ public: @param _rAggregateService the service name of the component to aggregate @param _bSetDelegator - set this to <FALSE/> if you don't want the constructor to set the delegator at + set this to <sal_False/> if you don't want the constructor to set the delegator at the aggregate. In this case, you <em>have</em> to call doSetDelegator within your own constructor. @@ -202,7 +202,7 @@ public: In this case, the aggregate needs to be queried for this interface <b>before</b> the <member scope="com::sun::star::uno">XAggregation::setDelegator</member> call. - In such a case, pass <FALSE/> to this parameter. Then, cache the aggregate's interface(s) + In such a case, pass <sal_False/> to this parameter. Then, cache the aggregate's interface(s) as needed. Afterwards, call <member>doSetDelegator</member>. In your destructor, you need to call <member>doResetDelegator</member> before @@ -228,7 +228,7 @@ protected: /** sets the control as delegator at the aggregate This has to be called from within your derived class' constructor, if and only - if you passed <FALSE/> to the <arg>_bSetDelegator</arg> parameter of the + if you passed <sal_False/> to the <arg>_bSetDelegator</arg> parameter of the <type>OControl</type> constructor. */ void doSetDelegator(); @@ -383,13 +383,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate const ::rtl::OUString& rDefault = ::rtl::OUString(), // service name of the default control - const sal_Bool _bSetDelegator = sal_True // set to FALSE if you want to call setDelegator later (after returning from this ctor) + const sal_Bool _bSetDelegator = sal_True // set to sal_False if you want to call setDelegator later (after returning from this ctor) ); OControlModel( const OControlModel* _pOriginal, // the original object to clone const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rFactory, // factory to create the aggregate with const sal_Bool _bCloneAggregate = sal_True, // should the aggregate of the original be cloned, too? - const sal_Bool _bSetDelegator = sal_True // set to FALSE if you want to call setDelegator later (after returning from this ctor) + const sal_Bool _bSetDelegator = sal_True // set to sal_False if you want to call setDelegator later (after returning from this ctor) ); virtual ~OControlModel(); @@ -710,8 +710,8 @@ protected: const ::rtl::OUString& _rUnoControlModelTypeName, // service name of te model to aggregate const ::rtl::OUString& _rDefault, // service name of the default control const sal_Bool _bCommitable, // is the control (model) commitable ? - const sal_Bool _bSupportExternalBinding, // set to TRUE if you want to support XBindableValue - const sal_Bool _bSupportsValidation // set to TRUE if you want to support XValidatable + const sal_Bool _bSupportExternalBinding, // set to sal_True if you want to support XBindableValue + const sal_Bool _bSupportsValidation // set to sal_True if you want to support XValidatable ); OBoundControlModel( const OBoundControlModel* _pOriginal, // the original object to clone @@ -879,7 +879,7 @@ protected: we're properly bound to a database column, especially <member>m_xColumnUpdate</member> is not <NULL/> @param _bPostReset - <TRUE/> if and only if the current control value results from a reset (<member>getDefaultForReset</member>) + <sal_True/> if and only if the current control value results from a reset (<member>getDefaultForReset</member>) @pure */ virtual sal_Bool commitControlValueToDbColumn( @@ -1183,10 +1183,10 @@ private: Use this method if there is a potential that <b>only</b> the validity flag changed. If any of the other aspects (our current value, or our current text) changed, then - pass <TRUE/> for <member>_bForceNotification</member>. + pass <sal_True/> for <member>_bForceNotification</member>. @param _bForceNotification - if <TRUE/>, then the validity listeners will be notified, not matter whether the validity + if <sal_True/>, then the validity listeners will be notified, not matter whether the validity changed. */ void recheckValidity( bool _bForceNotification ); @@ -1217,8 +1217,8 @@ private: @precond The control does not have an external value supplier @param _bFromReload - Determines whether the connection is made after the row set has been loaded (<FALSE/>) - or reloaded (<TRUE/>) + Determines whether the connection is made after the row set has been loaded (<sal_False/>) + or reloaded (<sal_True/>) @see impl_disconnectDatabaseColumn_noNotify */ @@ -1286,7 +1286,7 @@ private: the binding which applies for being responsible for our value, Must not be <NULL/> @return - <TRUE/> if and only if the given binding can supply values in the proper type + <sal_True/> if and only if the given binding can supply values in the proper type @seealso getExternalValueType */ diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 90e508f43ca8..72466fb31e3f 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -211,12 +211,12 @@ protected: @param _nIndex the index at which position it should be inserted @param _bEvents - if <TRUE/>, event knittings will be done + if <sal_True/>, event knittings will be done @param _pApprovalResult must contain the result of an approveNewElement call. Can be <NULL/>, in this case, the approval is done within implInsert. @param _bFire - if <TRUE/>, a notification about the insertion will be fired + if <sal_True/>, a notification about the insertion will be fired */ void implInsert( sal_Int32 _nIndex, diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index 6dc848bd8abe..440d76bae7bd 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -208,7 +208,7 @@ namespace frm @complexity O(log n), with n being the number of all potentially known URLs @return - <TRUE/> if and only if the given id is a known feature id + <sal_True/> if and only if the given id is a known feature id (which is a valid usage) */ bool getFeatureURL( sal_Int16 _nFeatureId, ::com::sun::star::util::URL& /* [out] */ _rURL ); diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx index 2e8bdf1f684a..0231f983c1b3 100644 --- a/forms/source/inc/urltransformer.hxx +++ b/forms/source/inc/urltransformer.hxx @@ -73,7 +73,7 @@ namespace frm /** ensures that we have an URLTransformer instance in <member>m_xTransformer</member> @return - <TRUE/> if and only if m_xTransformer is not <NULL/> + <sal_True/> if and only if m_xTransformer is not <NULL/> */ bool implEnsureTransformer() const; }; diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index 97b2ec1cba84..1f021d9ad0ea 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -155,7 +155,7 @@ namespace frm { m_pClipListener = new TransferableClipboardListener( LINK( this, OPasteClipboardDispatcher, OnClipboardChanged ) ); m_pClipListener->acquire(); - m_pClipListener->AddRemoveListener( _rView.GetWindow(), TRUE ); + m_pClipListener->AddRemoveListener( _rView.GetWindow(), sal_True ); // initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( _rView.GetWindow() ) ); @@ -189,7 +189,7 @@ namespace frm { OSL_ENSURE( getEditView() && getEditView()->GetWindow(), "OPasteClipboardDispatcher::disposing: EditView should not (yet) be disfunctional here!" ); if ( getEditView() && getEditView()->GetWindow() && m_pClipListener ) - m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), FALSE ); + m_pClipListener->AddRemoveListener( getEditView()->GetWindow(), sal_False ); m_pClipListener->release(); m_pClipListener = NULL; diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 3a82822f6701..4ee236276874 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -89,7 +89,7 @@ namespace frm m_pEngine->registerEngineStatusListener( this ); { - ULONG nViewControlWord = m_pView->GetControlWord(); + sal_uLong nViewControlWord = m_pView->GetControlWord(); nViewControlWord |= EV_CNTRL_AUTOSCROLL; m_pView->SetControlWord( nViewControlWord ); } @@ -236,7 +236,7 @@ namespace frm //-------------------------------------------------------------------- void RichTextControlImpl::normalizeScriptDependentAttribute( SvxScriptSetItem& _rScriptSetItem ) { - _rScriptSetItem.GetItemSet().Put( m_pView->GetAttribs(), FALSE ); + _rScriptSetItem.GetItemSet().Put( m_pView->GetAttribs(), sal_False ); const SfxPoolItem* pNormalizedItem = _rScriptSetItem.GetItemOfScript( getSelectedScriptType() ); WhichId nNormalizedWhichId = _rScriptSetItem.GetItemSet().GetPool()->GetWhich( _rScriptSetItem.Which() ); @@ -291,7 +291,7 @@ namespace frm //-------------------------------------------------------------------- void RichTextControlImpl::EditEngineStatusChanged( const EditStatus& _rStatus ) { - ULONG nStatusWord( _rStatus.GetStatusWord() ); + sal_uLong nStatusWord( _rStatus.GetStatusWord() ); if ( ( nStatusWord & EE_STAT_TEXTWIDTHCHANGED ) || ( nStatusWord & EE_STAT_TEXTHEIGHTCHANGED ) ) @@ -589,7 +589,7 @@ namespace frm } //-------------------------------------------------------------------- - void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG /*_nFlags*/ ) + void RichTextControlImpl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong /*_nFlags*/ ) { // need to normalize the map mode of the device - every paint operation on any device needs // to use the same map mode @@ -643,7 +643,7 @@ namespace frm lcl_inflate( aPlayground, -aOnePixel.Width(), -aOnePixel.Height() ); // actually draw the content - m_pEngine->Draw( _pDev, aPlayground, Point(), TRUE ); + m_pEngine->Draw( _pDev, aPlayground, Point(), sal_True ); _pDev->Pop(); } diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 619766bbfc4e..52341905087f 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -152,7 +152,7 @@ namespace frm bool GetHideInactiveSelection() const; /// draws the control onto a given output device - void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags ); + void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags ); /// handles command events arrived at the anti-impl control long HandleCommand( const CommandEvent& _rEvent ); diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 46a77c6dd791..91c6100f1817 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -157,7 +157,7 @@ namespace frm { m_pEngine->SetModifyHdl( LINK( this, ORichTextModel, OnEngineContentModified ) ); - ULONG nEngineControlWord = m_pEngine->GetControlWord(); + sal_uLong nEngineControlWord = m_pEngine->GetControlWord(); nEngineControlWord = nEngineControlWord & ~EE_CNTRL_AUTOPAGESIZE; m_pEngine->SetControlWord( nEngineControlWord ); diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index 1d3f98467aa7..d08f04f5c0ae 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -118,8 +118,8 @@ namespace frm { // this means that the content of the EditEngine changed via the UNO API // to reflect this in the views, we need to update them - USHORT viewCount = m_rEngine.GetViewCount(); - for ( USHORT view = 0; view < viewCount; ++view ) + sal_uInt16 viewCount = m_rEngine.GetViewCount(); + for ( sal_uInt16 view = 0; view < viewCount; ++view ) { EditView* pView = m_rEngine.GetView( view ); if ( pView ) diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 48d458288d40..ed2ca6aef521 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -83,7 +83,7 @@ namespace frm void RichTextControl::implInit( RichTextEngine* _pEngine, ITextAttributeListener* _pTextAttribListener, ITextSelectionListener* _pSelectionListener ) { m_pImpl = new RichTextControlImpl( this, _pEngine, _pTextAttribListener, _pSelectionListener ); - SetCompoundControl( TRUE ); + SetCompoundControl( sal_True ); } //-------------------------------------------------------------------- @@ -118,8 +118,8 @@ namespace frm if ( HasChildPathFocus() ) getView().HideCursor(); - BOOL bOldUpdateMode = getEngine().GetUpdateMode(); // TODO: guard? - getEngine().SetUpdateMode( FALSE ); + sal_Bool bOldUpdateMode = getEngine().GetUpdateMode(); // TODO: guard? + getEngine().SetUpdateMode( sal_False ); getView().SetAttribs( _rAttributesToApply ); @@ -320,7 +320,7 @@ namespace frm } //-------------------------------------------------------------------- - void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags ) + void RichTextControl::Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags ) { m_pImpl->Draw( _pDev, _rPos, _rSize, _nFlags ); } diff --git a/forms/source/richtext/richtextvclcontrol.hxx b/forms/source/richtext/richtextvclcontrol.hxx index 54f59569984f..254665f9b873 100644 --- a/forms/source/richtext/richtextvclcontrol.hxx +++ b/forms/source/richtext/richtextvclcontrol.hxx @@ -115,7 +115,7 @@ namespace frm EditView& getView(); // Window overridables - virtual void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, ULONG _nFlags ); + virtual void Draw( OutputDevice* _pDev, const Point& _rPos, const Size& _rSize, sal_uLong _nFlags ); protected: // Window overridables diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index ffeda61e6b0c..295f83248a9f 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -63,7 +63,7 @@ namespace frm { Control::GetFocus(); m_pView->SetSelectionMode( EE_SELMODE_STD ); - m_pView->ShowCursor( TRUE ); + m_pView->ShowCursor( sal_True ); } //-------------------------------------------------------------------- diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index c19fe516beb2..4df5a682c5fc 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -122,7 +122,7 @@ namespace frm { SvxScriptSetItem aSetItem( (WhichId)getAttributeId(), *_rAttribs.GetPool() ); aSetItem.PutItemForScriptType( _nForScriptType, _rItem ); - _rAttribs.Put( aSetItem.GetItemSet(), FALSE ); + _rAttribs.Put( aSetItem.GetItemSet(), sal_False ); } //-------------------------------------------------------------------- @@ -276,7 +276,7 @@ namespace frm AttributeCheckState LineSpacingHandler::implGetCheckState( const SfxPoolItem& _rItem ) const { OSL_ENSURE( _rItem.ISA( SvxLineSpacingItem ), "LineSpacingHandler::implGetCheckState: invalid pool item!" ); - USHORT nLineSpace = static_cast< const SvxLineSpacingItem& >( _rItem ).GetPropLineSpace(); + sal_uInt16 nLineSpace = static_cast< const SvxLineSpacingItem& >( _rItem ).GetPropLineSpace(); return ( nLineSpace == m_nLineSpace ) ? eChecked : eUnchecked; } @@ -291,7 +291,7 @@ namespace frm if ( 100 == m_nLineSpace ) aLineSpacing.GetInterLineSpaceRule() = SVX_INTER_LINE_SPACE_OFF; else - aLineSpacing.SetPropLineSpace( (BYTE)m_nLineSpace ); + aLineSpacing.SetPropLineSpace( (sal_uInt8)m_nLineSpace ); _rNewAttribs.Put( aLineSpacing ); } @@ -399,7 +399,7 @@ namespace frm if ( pFontHeightItem ) { // by definition, the item should have the unit twip - ULONG nHeight = pFontHeightItem->GetHeight(); + sal_uLong nHeight = pFontHeightItem->GetHeight(); if ( _rAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP ) { nHeight = OutputDevice::LogicToLogic( @@ -427,7 +427,7 @@ namespace frm { // corect measurement units SfxMapUnit eItemMapUnit = pFontHeightItem->GetPropUnit(); (void)eItemMapUnit; - ULONG nHeight = pFontHeightItem->GetHeight(); + sal_uLong nHeight = pFontHeightItem->GetHeight(); if ( _rNewAttribs.GetPool()->GetMetric( getWhich() ) != SFX_MAPUNIT_TWIP ) { nHeight = OutputDevice::LogicToLogic( @@ -488,7 +488,7 @@ namespace frm // then we toggle the adjustment, too SvxAdjust eCurrentAdjustment = SVX_ADJUST_LEFT; const SfxPoolItem* pCurrentAdjustment = NULL; - if ( SFX_ITEM_ON == _rCurrentAttribs.GetItemState( EE_PARA_JUST, TRUE, &pCurrentAdjustment ) ) + if ( SFX_ITEM_ON == _rCurrentAttribs.GetItemState( EE_PARA_JUST, sal_True, &pCurrentAdjustment ) ) eCurrentAdjustment = static_cast< const SvxAdjustItem* >( pCurrentAdjustment )->GetAdjust(); if ( eCurrentAdjustment == m_eOppositeDefaultAdjustment ) diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index 4e15cbc44050..f15fd5d5c49b 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -146,7 +146,7 @@ namespace frm class LineSpacingHandler : public AttributeHandler { private: - USHORT m_nLineSpace; + sal_uInt16 m_nLineSpace; public: LineSpacingHandler( AttributeId _nAttributeId ); diff --git a/forms/source/richtext/rtattributes.hxx b/forms/source/richtext/rtattributes.hxx index 2506dbcb5186..29baa5b8d355 100644 --- a/forms/source/richtext/rtattributes.hxx +++ b/forms/source/richtext/rtattributes.hxx @@ -43,11 +43,11 @@ namespace frm /// the id of an attribute typedef sal_Int32 AttributeId; /// the "which id" of an item in an SfxItemSet - typedef USHORT WhichId; + typedef sal_uInt16 WhichId; /// a SFX slot id - typedef USHORT SfxSlotId; + typedef sal_uInt16 SfxSlotId; /// a script type - typedef USHORT ScriptType; + typedef sal_uInt16 ScriptType; //==================================================================== //= AttributeCheckState diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index 2540c9d797f2..c7f2005eb7df 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -80,10 +80,10 @@ namespace frm if ( !pEngine ) return; - USHORT nParagraphs = pEngine->GetParagraphCount(); + sal_uInt16 nParagraphs = pEngine->GetParagraphCount(); if ( nParagraphs ) { - USHORT nLastParaNumber = nParagraphs - 1; + sal_uInt16 nLastParaNumber = nParagraphs - 1; xub_StrLen nParaLen = pEngine->GetTextLen( nLastParaNumber ); getEditView()->SetSelection( ESelection( 0, 0, nLastParaNumber, nParaLen ) ); } diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index d31727cff125..36b1f12eb6b2 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -300,7 +300,7 @@ namespace frm MouseSettings aMouseSettings = aSettings.GetMouseSettings(); aMouseSettings.SetButtonRepeat( 10 ); aSettings.SetMouseSettings( aMouseSettings ); - pNavBar->SetSettings( aSettings, TRUE ); + pNavBar->SetSettings( aSettings, sal_True ); // outta here return pPeer; diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index 128bc112adee..a24d07e28ba5 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -64,7 +64,7 @@ namespace frm || ( _nFeatureId == LID_RECORD_FILLER ); } - static String getLabelString( USHORT _nResId ) + static String getLabelString( sal_uInt16 _nResId ) { String sLabel = String::CreateFromAscii( " " ); sLabel += String( FRM_RES_STRING( _nResId ) ); @@ -195,9 +195,9 @@ namespace frm //--------------------------------------------------------------------- void NavigationToolBar::updateFeatureStates( ) { - for ( USHORT nPos = 0; nPos < m_pToolbar->GetItemCount(); ++nPos ) + for ( sal_uInt16 nPos = 0; nPos < m_pToolbar->GetItemCount(); ++nPos ) { - USHORT nItemId = m_pToolbar->GetItemId( nPos ); + sal_uInt16 nItemId = m_pToolbar->GetItemId( nPos ); if ( ( nItemId == LID_RECORD_LABEL ) || ( nItemId == LID_RECORD_FILLER ) ) continue; @@ -209,7 +209,7 @@ namespace frm } //--------------------------------------------------------------------- - void NavigationToolBar::implEnableItem( USHORT _nItemId, bool _bEnabled ) + void NavigationToolBar::implEnableItem( sal_uInt16 _nItemId, bool _bEnabled ) { m_pToolbar->EnableItem( _nItemId, _bEnabled ); @@ -223,32 +223,32 @@ namespace frm //--------------------------------------------------------------------- void NavigationToolBar::enableFeature( sal_Int16 _nFeatureId, bool _bEnabled ) { - DBG_ASSERT( m_pToolbar->GetItemPos( (USHORT)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, + DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, "NavigationToolBar::enableFeature: invalid id!" ); - implEnableItem( (USHORT)_nFeatureId, _bEnabled ); + implEnableItem( (sal_uInt16)_nFeatureId, _bEnabled ); } //--------------------------------------------------------------------- void NavigationToolBar::checkFeature( sal_Int16 _nFeatureId, bool _bEnabled ) { - DBG_ASSERT( m_pToolbar->GetItemPos( (USHORT)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, + DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, "NavigationToolBar::checkFeature: invalid id!" ); - m_pToolbar->CheckItem( (USHORT)_nFeatureId, _bEnabled ); + m_pToolbar->CheckItem( (sal_uInt16)_nFeatureId, _bEnabled ); } //--------------------------------------------------------------------- void NavigationToolBar::setFeatureText( sal_Int16 _nFeatureId, const ::rtl::OUString& _rText ) { - DBG_ASSERT( m_pToolbar->GetItemPos( (USHORT)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, + DBG_ASSERT( m_pToolbar->GetItemPos( (sal_uInt16)_nFeatureId ) != TOOLBOX_ITEM_NOTFOUND, "NavigationToolBar::checkFeature: invalid id!" ); - Window* pItemWindow = m_pToolbar->GetItemWindow( (USHORT)_nFeatureId ); + Window* pItemWindow = m_pToolbar->GetItemWindow( (sal_uInt16)_nFeatureId ); if ( pItemWindow ) pItemWindow->SetText( _rText ); else - m_pToolbar->SetItemText( (USHORT)_nFeatureId, _rText ); + m_pToolbar->SetItemText( (sal_uInt16)_nFeatureId, _rText ); } //--------------------------------------------------------------------- @@ -264,7 +264,7 @@ namespace frm struct FeatureDescription { - USHORT nId; + sal_uInt16 nId; bool bRepeat; bool bItemWindow; } aSupportedFeatures[] = @@ -331,7 +331,7 @@ namespace frm { pItemWindow = new FixedText( m_pToolbar, WB_VCENTER ); pItemWindow->SetBackground(); - pItemWindow->SetPaintTransparent(TRUE); + pItemWindow->SetPaintTransparent(sal_True); } m_aChildWins.push_back( pItemWindow ); @@ -369,16 +369,16 @@ namespace frm const bool bIsHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); - const USHORT nItemCount = m_pToolbar->GetItemCount(); + const sal_uInt16 nItemCount = m_pToolbar->GetItemCount(); // collect the FormFeatures in the toolbar typedef ::std::vector< sal_Int16 > FormFeatures; FormFeatures aFormFeatures; aFormFeatures.reserve( nItemCount ); - for ( USHORT i=0; i<nItemCount; ++i ) + for ( sal_uInt16 i=0; i<nItemCount; ++i ) { - USHORT nId = m_pToolbar->GetItemId( i ); + sal_uInt16 nId = m_pToolbar->GetItemId( i ); if ( ( TOOLBOXITEM_BUTTON == m_pToolbar->GetItemType( i ) ) && !isArtificialItem( nId ) ) aFormFeatures.push_back( nId ); } @@ -429,13 +429,13 @@ namespace frm //--------------------------------------------------------------------- void NavigationToolBar::ShowFunctionGroup( FunctionGroup _eGroup, bool _bShow ) { - const USHORT* pGroupIds = NULL; + const sal_uInt16* pGroupIds = NULL; switch ( _eGroup ) { case ePosition: { - static const USHORT aPositionIds[] = { + static const sal_uInt16 aPositionIds[] = { LID_RECORD_LABEL, FormFeature::MoveAbsolute, LID_RECORD_FILLER, FormFeature::TotalRecords, 0 }; pGroupIds = aPositionIds; @@ -443,7 +443,7 @@ namespace frm break; case eNavigation: { - static const USHORT aNavigationIds[] = { + static const sal_uInt16 aNavigationIds[] = { FormFeature::MoveToFirst, FormFeature::MoveToPrevious, FormFeature::MoveToNext, FormFeature::MoveToLast, FormFeature::MoveToInsertRow, 0 }; pGroupIds = aNavigationIds; @@ -451,7 +451,7 @@ namespace frm break; case eRecordActions: { - static const USHORT aActionIds[] = { + static const sal_uInt16 aActionIds[] = { FormFeature::SaveRecordChanges, FormFeature::UndoRecordChanges, FormFeature::DeleteRecord, FormFeature::ReloadForm, FormFeature::RefreshCurrentControl, 0 }; pGroupIds = aActionIds; @@ -459,7 +459,7 @@ namespace frm break; case eFilterSort: { - static const USHORT aFilterSortIds[] = { + static const sal_uInt16 aFilterSortIds[] = { FormFeature::SortAscending, FormFeature::SortDescending, FormFeature::InteractiveSort, FormFeature::AutoFilter, FormFeature::InteractiveFilter, FormFeature::ToggleApplyFilter, FormFeature::RemoveFilterAndSort, 0 }; pGroupIds = aFilterSortIds; @@ -477,7 +477,7 @@ namespace frm //--------------------------------------------------------------------- bool NavigationToolBar::IsFunctionGroupVisible( FunctionGroup _eGroup ) { - USHORT nIndicatorItem = 0; + sal_uInt16 nIndicatorItem = 0; switch ( _eGroup ) { case ePosition : nIndicatorItem = LID_RECORD_LABEL; break; @@ -516,7 +516,7 @@ namespace frm case STATE_CHANGE_MIRRORING: { - BOOL bIsRTLEnabled( IsRTLEnabled() ); + sal_Bool bIsRTLEnabled( IsRTLEnabled() ); m_pToolbar->EnableRTL( bIsRTLEnabled ); forEachItemWindow( &NavigationToolBar::enableItemRTL, &bIsRTLEnabled ); Resize(); @@ -583,9 +583,9 @@ namespace frm //--------------------------------------------------------------------- void NavigationToolBar::forEachItemWindow( ItemWindowHandler _handler, const void* _pParam ) { - for ( USHORT item = 0; item < m_pToolbar->GetItemCount(); ++item ) + for ( sal_uInt16 item = 0; item < m_pToolbar->GetItemCount(); ++item ) { - USHORT nItemId = m_pToolbar->GetItemId( item ); + sal_uInt16 nItemId = m_pToolbar->GetItemId( item ); Window* pItemWindow = m_pToolbar->GetItemWindow( nItemId ); if ( pItemWindow ) (this->*_handler)( nItemId, pItemWindow, _pParam ); @@ -593,7 +593,7 @@ namespace frm } //--------------------------------------------------------------------- - void NavigationToolBar::setItemBackground( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const + void NavigationToolBar::setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const { if ( _pColor ) _pItemWindow->SetControlBackground( *static_cast< const Color* >( _pColor ) ); @@ -602,7 +602,7 @@ namespace frm } //--------------------------------------------------------------------- - void NavigationToolBar::setTextLineColor( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const + void NavigationToolBar::setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const { if ( _pColor ) _pItemWindow->SetTextLineColor( *static_cast< const Color* >( _pColor ) ); @@ -611,14 +611,14 @@ namespace frm } #if 0 //--------------------------------------------------------------------- - void NavigationToolBar::setItemWindowZoom( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const { _pItemWindow->SetZoom( GetZoom() ); _pItemWindow->SetZoomedPointFont( IsControlFont() ? GetControlFont() : GetPointFont() ); } #endif //--------------------------------------------------------------------- - void NavigationToolBar::setItemControlFont( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const { if ( IsControlFont() ) _pItemWindow->SetControlFont( GetControlFont() ); @@ -627,7 +627,7 @@ namespace frm } //--------------------------------------------------------------------- - void NavigationToolBar::setItemControlForeground( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const { if ( IsControlForeground() ) _pItemWindow->SetControlForeground( GetControlForeground() ); @@ -637,7 +637,7 @@ namespace frm } //--------------------------------------------------------------------- - void NavigationToolBar::adjustItemWindowWidth( USHORT _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const + void NavigationToolBar::adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const { String sItemText; switch ( _nItemId ) @@ -667,9 +667,9 @@ namespace frm } //--------------------------------------------------------------------- - void NavigationToolBar::enableItemRTL( USHORT /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const + void NavigationToolBar::enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const { - _pItemWindow->EnableRTL( *static_cast< const BOOL* >( _pIsRTLEnabled ) ); + _pItemWindow->EnableRTL( *static_cast< const sal_Bool* >( _pIsRTLEnabled ) ); } //===================================================================== @@ -684,7 +684,7 @@ namespace frm SetFirst( 1 ); SetSpinSize( 1 ); SetDecimalDigits( 0 ); - SetStrictFormat( TRUE ); + SetStrictFormat( sal_True ); SetBorderStyle( WINDOW_BORDER_MONO ); } diff --git a/forms/source/solar/inc/navtoolbar.hxx b/forms/source/solar/inc/navtoolbar.hxx index 5ace33765262..a6147a60b0e4 100644 --- a/forms/source/solar/inc/navtoolbar.hxx +++ b/forms/source/solar/inc/navtoolbar.hxx @@ -141,25 +141,25 @@ namespace frm void implUpdateImages(); /// enables or disables an item, plus possible dependent items - void implEnableItem( USHORT _nItemId, bool _bEnabled ); + void implEnableItem( sal_uInt16 _nItemId, bool _bEnabled ); /** update the states of all features, using the callback */ void updateFeatureStates( ); // iterating through item windows - typedef void (NavigationToolBar::*ItemWindowHandler) (USHORT, Window*, const void*) const; + typedef void (NavigationToolBar::*ItemWindowHandler) (sal_uInt16, Window*, const void*) const; void forEachItemWindow( ItemWindowHandler _handler, const void* _pParam ); - void setItemBackground( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const; - void setTextLineColor( USHORT /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const; + void setItemBackground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const; + void setTextLineColor( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* _pColor ) const; #if 0 - void setItemWindowZoom( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; + void setItemWindowZoom( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; #endif - void setItemControlFont( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; - void setItemControlForeground( USHORT /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; - void adjustItemWindowWidth( USHORT _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const; - void enableItemRTL( USHORT /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const; + void setItemControlFont( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; + void setItemControlForeground( sal_uInt16 /* _nItemId */, Window* _pItemWindow, const void* /* _pParam */ ) const; + void adjustItemWindowWidth( sal_uInt16 _nItemId, Window* _pItemWindow, const void* /* _pParam */ ) const; + void enableItemRTL( sal_uInt16 /*_nItemId*/, Window* _pItemWindow, const void* _pIsRTLEnabled ) const; }; //===================================================================== diff --git a/forms/source/xforms/datatypes.cxx b/forms/source/xforms/datatypes.cxx index 212b5f721e67..d8540851569c 100644 --- a/forms/source/xforms/datatypes.cxx +++ b/forms/source/xforms/datatypes.cxx @@ -957,7 +957,7 @@ namespace xforms fValue = (double)(sal_Int16)value.toInt32(); // TODO/eforms // this does not care for values which do not fit into a sal_Int16, but simply - // cuts them down. A better implementation here should probably return <FALSE/> + // cuts them down. A better implementation here should probably return <sal_False/> // for those values. // Else, we may have a situation where the UI claims an input to be valid // (say "12345678"), while internally, and at submission time, this is cut to diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx index 9e11efe1ebb7..67b080febbaf 100644 --- a/forms/source/xforms/propertysetbase.hxx +++ b/forms/source/xforms/propertysetbase.hxx @@ -253,7 +253,7 @@ protected: Usually used to initialize the cache with values which are different from default constructed values. Say you have a boolean property whose initial state - is <TRUE/>. Say you call <member>notifyAndCachePropertyValue</member> the first time: it will + is <sal_True/>. Say you call <member>notifyAndCachePropertyValue</member> the first time: it will default construct the "old value" for this property as <FALSE/>, and thus <b>not</b> do any notifications if the "current value" is also <FALSE/> - which might be wrong, since the guessing of the "old value" differed from the real initial value which was <TRUE/>. diff --git a/forms/source/xforms/xpathlib/xpathlib.cxx b/forms/source/xforms/xpathlib/xpathlib.cxx index 2fd6a93b614a..40b75bfda10b 100644 --- a/forms/source/xforms/xpathlib/xpathlib.cxx +++ b/forms/source/xforms/xpathlib/xpathlib.cxx @@ -327,7 +327,7 @@ static sal_Bool parseDateTime(const ::rtl::OUString& aString, DateTime& aDateTim sal_Int32 nMinute = aTimeString.getToken(0, ':', nIndex).toInt32(); sal_Int32 nSecond = aTimeString.getToken(0, ':', nIndex).toInt32(); - Date tmpDate((USHORT)nDay, (USHORT)nMonth, (USHORT)nYear); + Date tmpDate((sal_uInt16)nDay, (sal_uInt16)nMonth, (sal_uInt16)nYear); Time tmpTime(nHour, nMinute, nSecond); DateTime tmpDateTime(tmpDate, tmpTime); if (aString.indexOf(aUTCString) < 0) |