wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Frank Schoenheit [fs]
2011-02-15 10:31:10 +01:00
parent a7ca9a1c4e 36635e78f0
commit 87784da170
477 changed files with 10109 additions and 10196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forms/source/component/Button.cxx
View File

@ -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;

2
forms/source/component/Button.hxx
View File

@ -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;

4
forms/source/component/DatabaseForm.cxx
View File

@ -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

2
forms/source/component/DatabaseForm.hxx
View File

@ -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;

2
forms/source/component/Edit.cxx
View File

@ -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>

2
forms/source/component/Filter.cxx
View File

@ -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()

6
forms/source/component/FormComponent.cxx
View File

@ -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 ....

2
forms/source/component/FormattedField.cxx
View File

@ -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>

2
forms/source/component/Hidden.cxx
View File

@ -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 !");

2
forms/source/component/ImageControl.cxx
View File

@ -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

2
forms/source/component/RadioButton.cxx
View File

@ -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 );