diff options
author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-13 16:49:46 +0100 |
---|---|---|
committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-13 16:49:46 +0100 |
commit | a6569df130ac16327e4f52498e9925e16f56bf10 (patch) | |
tree | 0f3f9b83ccfd13aab3f749d5121f907199120877 /forms/source/component | |
parent | df0b31641237470028437efd959c355dc0f32953 (diff) |
removetooltypes01: #i112600# remove tooltypes from slideshow and forms
Diffstat (limited to 'forms/source/component')
-rw-r--r-- | forms/source/component/Button.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/Button.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.cxx | 4 | ||||
-rw-r--r-- | forms/source/component/DatabaseForm.hxx | 6 | ||||
-rw-r--r-- | forms/source/component/Edit.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/FormComponent.cxx | 6 | ||||
-rw-r--r-- | forms/source/component/Hidden.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/ImageControl.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/RadioButton.cxx | 2 | ||||
-rw-r--r-- | forms/source/component/clickableimage.hxx | 2 | ||||
-rw-r--r-- | forms/source/component/entrylisthelper.hxx | 2 |
11 files changed, 16 insertions, 16 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 ); |