dba34d: pulled and merged CWS dba34c, thus implicitly rebasing to m100

11 files changed, 14 insertions, 14 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 31f933f136bc..8ff11dfc2f59 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..e18586fb309d 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;
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index f409e154096c..113d664acf33 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
 
 #include <vcl/svapp.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 #include <connectivity/dbtools.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index d664be8e4a86..f9f17524756f 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -72,7 +72,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 
 //--------------------------------------------------------------------------
 extern "C" void SAL_CALL createRegistryInfo_OFilterControl()
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/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 193ed4b1a693..5f36934cb98e 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -43,7 +43,7 @@
 #include <svl/numuno.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <i18npool/mslangid.hxx>
 #include <rtl/textenc.h>
 #include <com/sun/star/sdbc/DataType.hpp>
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 );