summaryrefslogtreecommitdiff
path: root/extensions/source/propctrlr
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/source/propctrlr')
-rw-r--r--extensions/source/propctrlr/browserlistbox.cxx4
-rw-r--r--extensions/source/propctrlr/browserpage.cxx2
-rw-r--r--extensions/source/propctrlr/defaultforminspection.cxx2
-rw-r--r--extensions/source/propctrlr/fontdialog.cxx4
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx4
-rw-r--r--extensions/source/propctrlr/formlinkdialog.cxx4
-rw-r--r--extensions/source/propctrlr/formmetadata.cxx2
-rw-r--r--extensions/source/propctrlr/genericpropertyhandler.cxx2
-rw-r--r--extensions/source/propctrlr/inspectorhelpwindow.cxx4
-rw-r--r--extensions/source/propctrlr/propertyeditor.cxx4
-rw-r--r--extensions/source/propctrlr/pushbuttonnavigation.cxx2
-rw-r--r--extensions/source/propctrlr/standardcontrol.cxx20
-rw-r--r--extensions/source/propctrlr/taborder.cxx14
13 files changed, 34 insertions, 34 deletions
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 27d97868bcf2..8682d9e701bb 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -1213,9 +1213,9 @@ namespace pcr
{
Edit* pControlWindowAsEdit = dynamic_cast< Edit* >( rLine.pLine->getControlWindow() );
if ( pControlWindowAsEdit )
- pControlWindowAsEdit->SetReadOnly( TRUE );
+ pControlWindowAsEdit->SetReadOnly( sal_True );
else
- pControlWindowAsEdit->Enable( FALSE );
+ pControlWindowAsEdit->Enable( sal_False );
}
}
}
diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index 1065da18f6cc..131a3587a038 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -48,7 +48,7 @@ namespace pcr
,m_aListBox(this)
{
m_aListBox.SetBackground(GetBackground());
- m_aListBox.SetPaintTransparent( TRUE );
+ m_aListBox.SetPaintTransparent( sal_True );
m_aListBox.Show();
}
diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx
index ace7be265fb1..f3014d7d2e57 100644
--- a/extensions/source/propctrlr/defaultforminspection.cxx
+++ b/extensions/source/propctrlr/defaultforminspection.cxx
@@ -186,7 +186,7 @@ namespace pcr
struct
{
const sal_Char* programmaticName;
- USHORT uiNameResId;
+ sal_uInt16 uiNameResId;
const sal_Char* helpId;
} aCategories[] = {
{ "General", RID_STR_PROPPAGE_DEFAULT, HID_FM_PROPDLG_TAB_GENERAL },
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index c7c52b60a910..e1fe31c56bb8 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -396,7 +396,7 @@ namespace pcr
sal_Int32 nColor = rUnderlineItem.GetColor().GetColor();
Any aUnoColor;
- if (COL_AUTO != (UINT32)nColor)
+ if (COL_AUTO != (sal_uInt32)nColor)
aUnoColor <<= nColor;
lcl_pushBackPropertyValue( _out_properties, PROPERTY_TEXTLINECOLOR, aUnoColor );
@@ -441,7 +441,7 @@ namespace pcr
sal_Int32 nColor = rColorItem.GetValue().GetColor();
Any aUnoColor;
- if (COL_AUTO != (UINT32)nColor)
+ if (COL_AUTO != (sal_uInt32)nColor)
aUnoColor <<= nColor;
lcl_pushBackPropertyValue( _out_properties, PROPERTY_TEXTCOLOR, aUnoColor );
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 97c954c95fa6..bc83c820e909 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -779,7 +779,7 @@ namespace pcr
// font style
::FontWeight eWeight = VCLUnoHelper::ConvertFontWeight( aFont.Weight );
- USHORT nStyleResID = RID_STR_FONTSTYLE_REGULAR;
+ sal_uInt16 nStyleResID = RID_STR_FONTSTYLE_REGULAR;
if ( aFont.Slant == FontSlant_ITALIC )
{
if ( eWeight > WEIGHT_NORMAL )
@@ -1256,7 +1256,7 @@ namespace pcr
// boolean values
if ( eType == TypeClass_BOOLEAN )
{
- USHORT nResId = RID_RSC_ENUM_YESNO;
+ sal_uInt16 nResId = RID_RSC_ENUM_YESNO;
if ( ( nPropId == PROPERTY_ID_SHOW_POSITION )
|| ( nPropId == PROPERTY_ID_SHOW_NAVIGATION )
|| ( nPropId == PROPERTY_ID_SHOW_RECORDACTIONS )
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 85d3cb8e10b9..7010c9102188 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -356,7 +356,7 @@ namespace pcr
// in all rows, there must be either two valid selections, or none at all
// If there is at least one row with exactly one valid selection, then the
// OKButton needs to be disabled
- BOOL bEnable = TRUE;
+ sal_Bool bEnable = sal_True;
const FieldLinkRow* aRows[] = {
m_aRow1.get(), m_aRow2.get(), m_aRow3.get(), m_aRow4.get()
@@ -368,7 +368,7 @@ namespace pcr
if ( aRows[ i ]->GetFieldName( FieldLinkRow::eDetailField, sNotInterestedInRightNow )
!= aRows[ i ]->GetFieldName( FieldLinkRow::eMasterField, sNotInterestedInRightNow )
)
- bEnable = FALSE;
+ bEnable = sal_False;
}
m_aOK.Enable( bEnable );
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index d9fe180c1ac7..d5dea0841c54 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -38,7 +38,7 @@
#include "propctrlr.hrc"
#include <svtools/localresaccess.hxx>
#include <tools/debug.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <algorithm>
#include <functional>
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 3c6bf717ffab..65514038181d 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -42,7 +42,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
/** === end UNO includes === **/
#include <tools/debug.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <algorithm>
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.cxx b/extensions/source/propctrlr/inspectorhelpwindow.cxx
index 1498bb072649..dbf562a7536c 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.cxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.cxx
@@ -55,14 +55,14 @@ namespace pcr
,m_nMaxLines( 8 )
{
SetBackground();
- SetPaintTransparent(TRUE);
+ SetPaintTransparent(sal_True);
m_aSeparator.SetText( String( PcrRes( RID_STR_HELP_SECTION_LABEL ) ) );
m_aSeparator.SetBackground();
m_aSeparator.Show();
m_aHelpText.SetControlBackground( /*m_aSeparator.GetBackground().GetColor() */);
m_aHelpText.SetBackground();
- m_aHelpText.SetPaintTransparent(TRUE);
+ m_aHelpText.SetPaintTransparent(sal_True);
m_aHelpText.Show();
}
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 2d81566d8fbb..64be3ae20e9f 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -481,7 +481,7 @@ namespace pcr
//------------------------------------------------------------------
void OPropertyEditor::EnablePropertyControls( const ::rtl::OUString& _rEntryName, sal_Int16 _nControls, bool _bEnable )
{
- for ( USHORT i = 0; i < m_aTabControl.GetPageCount(); ++i )
+ for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i )
{
OBrowserPage* pPage = static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( m_aTabControl.GetPageId( i ) ) );
if ( pPage )
@@ -492,7 +492,7 @@ namespace pcr
//------------------------------------------------------------------
void OPropertyEditor::EnablePropertyLine( const ::rtl::OUString& _rEntryName, bool _bEnable )
{
- for ( USHORT i = 0; i < m_aTabControl.GetPageCount(); ++i )
+ for ( sal_uInt16 i = 0; i < m_aTabControl.GetPageCount(); ++i )
{
OBrowserPage* pPage = static_cast< OBrowserPage* >( m_aTabControl.GetTabPage( m_aTabControl.GetPageId( i ) ) );
if ( pPage )
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.cxx b/extensions/source/propctrlr/pushbuttonnavigation.cxx
index 0390e1c927fd..3894825d603d 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.cxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.cxx
@@ -31,7 +31,7 @@
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include "formstrings.hxx"
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
#include <comphelper/property.hxx>
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx
index b0dc9536d0e2..cd38db9c9944 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -281,7 +281,7 @@ namespace pcr
getTypedControlWindow()->SetFormatter( getTypedControlWindow()->StandardFormatter() );
SvNumberFormatter* pFormatter = getTypedControlWindow()->GetFormatter();
- ULONG nStandardDateTimeFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATETIME, eSysLanguage );
+ sal_uLong nStandardDateTimeFormat = pFormatter->GetStandardFormat( NUMBERFORMAT_DATETIME, eSysLanguage );
getTypedControlWindow()->SetFormatKey( nStandardDateTimeFormat );
}
@@ -715,8 +715,8 @@ namespace pcr
getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT );
if ( ( nWinStyle & WB_READONLY ) != 0 )
{
- getTypedControlWindow()->SetReadOnly( TRUE );
- getTypedControlWindow()->Enable( TRUE );
+ getTypedControlWindow()->SetReadOnly( sal_True );
+ getTypedControlWindow()->Enable( sal_True );
}
}
@@ -824,8 +824,8 @@ namespace pcr
getTypedControlWindow()->SetDropDownLineCount( LB_DEFAULT_COUNT );
if ( ( nWinStyle & WB_READONLY ) != 0 )
{
- getTypedControlWindow()->SetReadOnly( TRUE );
- getTypedControlWindow()->Enable( TRUE );
+ getTypedControlWindow()->SetReadOnly( sal_True );
+ getTypedControlWindow()->Enable( sal_True );
}
}
@@ -887,10 +887,10 @@ namespace pcr
//------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OListboxControl::getListEntries( ) throw (RuntimeException)
{
- const USHORT nCount = getTypedControlWindow()->GetEntryCount();
+ const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
Sequence< ::rtl::OUString > aRet(nCount);
::rtl::OUString* pIter = aRet.getArray();
- for (USHORT i = 0; i < nCount ; ++i,++pIter)
+ for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter)
*pIter = getTypedControlWindow()->GetEntry(i);
return aRet;
@@ -957,10 +957,10 @@ namespace pcr
//------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL OComboboxControl::getListEntries( ) throw (RuntimeException)
{
- const USHORT nCount = getTypedControlWindow()->GetEntryCount();
+ const sal_uInt16 nCount = getTypedControlWindow()->GetEntryCount();
Sequence< ::rtl::OUString > aRet(nCount);
::rtl::OUString* pIter = aRet.getArray();
- for (USHORT i = 0; i < nCount ; ++i,++pIter)
+ for (sal_uInt16 i = 0; i < nCount ; ++i,++pIter)
*pIter = getTypedControlWindow()->GetEntry(i);
return aRet;
@@ -1050,7 +1050,7 @@ namespace pcr
,m_nOperationMode( eStringList )
,m_bDropdown( sal_False )
{
- SetCompoundControl( TRUE );
+ SetCompoundControl( sal_True );
m_pImplEdit = new MultiLineEdit( this, WB_TABSTOP | WB_IGNORETAB | WB_NOBORDER | (_nStyle & WB_READONLY) );
SetSubEdit( m_pImplEdit );
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 3ed3dff35081..c3e0268bbc7a 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -285,13 +285,13 @@ namespace pcr
//------------------------------------------------------------------------
IMPL_LINK( TabOrderDialog, OKClickHdl, Button*, /*pButton*/ )
{
- ULONG nEntryCount = aLB_Controls.GetEntryCount();
+ sal_uLong nEntryCount = aLB_Controls.GetEntryCount();
Sequence< Reference< XControlModel > > aSortedControlModelSeq( nEntryCount );
Sequence< Reference< XControlModel > > aControlModels( m_xTempModel->getControlModels());
Reference< XControlModel > * pSortedControlModels = aSortedControlModelSeq.getArray();
const Reference< XControlModel > * pControlModels = aControlModels.getConstArray();
- for (ULONG i=0; i < nEntryCount; i++)
+ for (sal_uLong i=0; i < nEntryCount; i++)
{
SvLBoxEntry* pEntry = aLB_Controls.GetEntry(i);
@@ -359,13 +359,13 @@ namespace pcr
{
SvLBoxEntry* pFirstSelected = FirstSelected();
if( !pFirstSelected ) return;
- ULONG nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected );
+ sal_uLong nFirstSelPos = GetModel()->GetAbsPos( pFirstSelected );
if( nFirstSelPos == 0 ) return;
SvLBoxEntry* pSelEntry = pFirstSelected;
while( pSelEntry )
{
- ULONG nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
+ sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
SvLBoxEntry* pSelEntryPrev = GetEntry( nSelEntryPos-1 );
aSelEntryPrevText = GetEntryText( pSelEntryPrev );
aImage = GetExpandedEntryBmp(pSelEntryPrev);
@@ -382,12 +382,12 @@ namespace pcr
{
SvLBoxEntry* pLastSelected = LastSelected();
if( !pLastSelected ) return;
- ULONG nLastSelPos = GetModel()->GetAbsPos( pLastSelected );
+ sal_uLong nLastSelPos = GetModel()->GetAbsPos( pLastSelected );
if( (nLastSelPos + nRelPos - i) > (GetEntryCount()-1) ) return;
#if OSL_DEBUG_LEVEL > 0
- ULONG nSelCount = GetSelectionCount();
+ sal_uLong nSelCount = GetSelectionCount();
(void)nSelCount;
#endif
@@ -395,7 +395,7 @@ namespace pcr
SvLBoxEntry* pSelEntry = pLastSelected;
while( pSelEntry )
{
- ULONG nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
+ sal_uLong nSelEntryPos = GetModel()->GetAbsPos( pSelEntry );
SvLBoxEntry* pSelEntryNext = GetEntry( nSelEntryPos+1 );
void* pData = pSelEntryNext->GetUserData();
generated by cgit (git 2.34.1) at 2024-07-16 20:58:55 +0000