summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-02-14 23:26:54 +0100
committerFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2011-02-14 23:26:54 +0100
commit5e49d6bc6be04b1b6cb11336842ef9534fd32ae9 (patch)
tree6c2d2fdc6b83256e37163fa112deb0a69fcff5bb /extensions/source
parenta4894295f3af978314b2abb1e3ff0b8c6a709179 (diff)
parent16680c16eb84b5315dbbeeb61b3693c4d567640a (diff)
debuglevels: pulled and merged DEV300.m100
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx4
-rw-r--r--extensions/source/abpilot/abspilot.cxx4
-rw-r--r--extensions/source/abpilot/abspilot.hxx2
-rw-r--r--extensions/source/bibliography/bibbeam.cxx2
-rw-r--r--extensions/source/bibliography/bibconfig.cxx2
-rw-r--r--extensions/source/bibliography/bibcont.cxx8
-rw-r--r--extensions/source/bibliography/bibcont.hxx2
-rw-r--r--extensions/source/bibliography/bibresid.hxx2
-rw-r--r--extensions/source/bibliography/bibshortcuthandler.hxx2
-rw-r--r--extensions/source/bibliography/bibtools.hxx6
-rw-r--r--extensions/source/bibliography/bibview.cxx4
-rw-r--r--extensions/source/bibliography/bibview.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx2
-rw-r--r--extensions/source/bibliography/framectr.cxx4
-rw-r--r--extensions/source/bibliography/general.cxx30
-rw-r--r--extensions/source/bibliography/general.hxx2
-rw-r--r--extensions/source/bibliography/toolbar.cxx4
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx12
-rw-r--r--extensions/source/inc/componentmodule.hxx2
-rw-r--r--extensions/source/plugin/aqua/macmgr.cxx4
-rw-r--r--extensions/source/plugin/aqua/sysplug.cxx12
-rw-r--r--extensions/source/plugin/base/manager.cxx6
-rw-r--r--extensions/source/plugin/base/xplugin.cxx8
-rw-r--r--extensions/source/plugin/inc/plugin/aqua/sysplug.hxx2
-rw-r--r--extensions/source/plugin/inc/plugin/impl.hxx6
-rw-r--r--extensions/source/plugin/inc/plugin/unx/mediator.hxx30
-rw-r--r--extensions/source/plugin/inc/plugin/unx/plugcon.hxx28
-rw-r--r--extensions/source/plugin/unx/mediator.cxx70
-rw-r--r--extensions/source/plugin/unx/npnapi.cxx74
-rw-r--r--extensions/source/plugin/unx/nppapi.cxx68
-rw-r--r--extensions/source/plugin/unx/npwrap.cxx12
-rw-r--r--extensions/source/plugin/unx/plugcon.cxx66
-rw-r--r--extensions/source/plugin/unx/sysplug.cxx2
-rw-r--r--extensions/source/plugin/unx/unxmgr.cxx4
-rw-r--r--extensions/source/preload/oemwiz.cxx32
-rw-r--r--extensions/source/preload/oemwiz.hxx10
-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
-rw-r--r--extensions/source/resource/resource.cxx32
-rw-r--r--extensions/source/scanner/grid.cxx4
-rw-r--r--extensions/source/scanner/grid.hxx4
-rw-r--r--extensions/source/scanner/sane.cxx196
-rw-r--r--extensions/source/scanner/sane.hxx34
-rw-r--r--extensions/source/scanner/sanedlg.cxx162
-rw-r--r--extensions/source/scanner/sanedlg.hxx12
-rw-r--r--extensions/source/scanner/scanner.hxx2
-rw-r--r--extensions/source/scanner/scanunx.cxx14
-rw-r--r--extensions/source/scanner/scanwin.cxx2
-rw-r--r--extensions/source/scanner/twain.cxx10
-rw-r--r--extensions/source/scanner/twain.hxx12
-rw-r--r--extensions/source/svg/svgaction.cxx50
-rw-r--r--extensions/source/svg/svgaction.hxx2
-rw-r--r--extensions/source/svg/svgprinter.cxx22
-rw-r--r--extensions/source/svg/svgwriter.cxx4
-rw-r--r--extensions/source/update/ui/updatecheckui.cxx26
-rw-r--r--extensions/source/xmlextract/xmxtrct.cxx2
68 files changed, 595 insertions, 595 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 2ffeb0d09739..ed7dde55290f 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -78,7 +78,7 @@ namespace abp
m_aName.SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
m_aLocation.SetModifyHdl( LINK(this, FinalPage, OnNameModified) );
m_aRegisterName.SetClickHdl( LINK( this, FinalPage, OnRegister ) );
- m_aRegisterName.Check(TRUE);
+ m_aRegisterName.Check(sal_True);
}
//---------------------------------------------------------------------
@@ -217,7 +217,7 @@ namespace abp
// -----------------------------------------------------------------------------
IMPL_LINK( FinalPage, OnRegister, CheckBox*, EMPTYARG )
{
- BOOL bEnable = m_aRegisterName.IsChecked();
+ sal_Bool bEnable = m_aRegisterName.IsChecked();
m_aNameLabel.Enable(bEnable);
m_aName.Enable(bEnable);
implCheckName();
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index d8007873a2c4..83200c373385 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -140,7 +140,7 @@ namespace abp
//---------------------------------------------------------------------
String OAddessBookSourcePilot::getStateDisplayName( WizardState _nState ) const
{
- USHORT nResId = 0;
+ sal_uInt16 nResId = 0;
switch ( _nState )
{
case STATE_SELECT_ABTYPE: nResId = STR_SELECT_ABTYPE; break;
@@ -205,7 +205,7 @@ namespace abp
}
//---------------------------------------------------------------------
- BOOL OAddessBookSourcePilot::Close()
+ sal_Bool OAddessBookSourcePilot::Close()
{
implCleanup();
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 0abdacd0281d..c87748a49da2 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -84,7 +84,7 @@ namespace abp
// RoadmapWizard
virtual String getStateDisplayName( WizardState _nState ) const;
- virtual BOOL Close();
+ virtual sal_Bool Close();
private:
DECL_LINK( OnCancelClicked, void* );
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index 7020f9eec2ba..f0203607c219 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -65,7 +65,7 @@ namespace bib
using namespace ::com::sun::star::uno;
- void HandleTaskPaneList( Window* pWindow, BOOL bAddToList )
+ void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList )
{
Window* pParent = pWindow->GetParent();
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index 0515e4227b86..16ece4dc7411 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -279,7 +279,7 @@ void BibConfig::Commit()
OUString sCommandType(C2U("CommandType"));
for(sal_Int32 i = 0; i < pMappingsArr->Count(); i++)
{
- const Mapping* pMapping = pMappingsArr->GetObject((USHORT)i);
+ const Mapping* pMapping = pMappingsArr->GetObject((sal_uInt16)i);
OUString sPrefix(C2U(cDataSourceHistory));
sPrefix += C2U("/_");
sPrefix += OUString::valueOf(i);
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index 2666a1a69199..6309b635f386 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -233,8 +233,8 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
const KeyCode aKeyCode = pKEvt->GetKeyCode();
- USHORT nKey = aKeyCode.GetCode();
- const USHORT nModifier = aKeyCode.GetModifier();
+ sal_uInt16 nKey = aKeyCode.GetCode();
+ const sal_uInt16 nModifier = aKeyCode.GetModifier();
if( KEY_MOD2 == nModifier )
{
@@ -242,8 +242,8 @@ long BibBookContainer::PreNotify( NotifyEvent& rNEvt )
{
if(pTopWin && pBottomWin)
{
- USHORT nFirstWinId = KEY_UP == nKey ? TOP_WINDOW : BOTTOM_WINDOW;
- USHORT nSecondWinId = KEY_UP == nKey ? BOTTOM_WINDOW : TOP_WINDOW;
+ sal_uInt16 nFirstWinId = KEY_UP == nKey ? TOP_WINDOW : BOTTOM_WINDOW;
+ sal_uInt16 nSecondWinId = KEY_UP == nKey ? BOTTOM_WINDOW : TOP_WINDOW;
long nHeight = GetItemSize( nFirstWinId );
nHeight -= WIN_STEP_SIZE;
if(nHeight < WIN_MIN_HEIGHT)
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 12b1bf1748e8..931c4d3fb09b 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -57,7 +57,7 @@ class BibWindowContainer : public BibWindow //Window
virtual void GetFocus();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
using Window::GetChild;
};
diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx
index 5fc3e06abb59..75b61129b96e 100644
--- a/extensions/source/bibliography/bibresid.hxx
+++ b/extensions/source/bibliography/bibresid.hxx
@@ -35,7 +35,7 @@
class BibResId : public ResId
{
public:
- BibResId( USHORT nId );
+ BibResId( sal_uInt16 nId );
};
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index 3e9d152d5583..0ef8c6fcf9a2 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -46,7 +46,7 @@ protected:
public:
virtual ~BibShortCutHandler();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
inline Window* GetWindow( void );
};
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index 090fa280ad4d..22b9e07faac2 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -33,17 +33,17 @@ namespace bib
{
// source in bibbeam.cxx
- void HandleTaskPaneList( Window* pWindow, BOOL bAddToList );
+ void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList );
// pWindow: just an system window or something wich is child of a system window
inline void AddToTaskPaneList( Window* pWindowToBeHandled )
{
- HandleTaskPaneList( pWindowToBeHandled, TRUE );
+ HandleTaskPaneList( pWindowToBeHandled, sal_True );
}
inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled )
{
- HandleTaskPaneList( pWindowToBeHandled, FALSE );
+ HandleTaskPaneList( pWindowToBeHandled, sal_False );
}
}
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index fee2610898f6..76f489f17bf5 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -222,9 +222,9 @@ namespace bib
m_pGeneralPage->GrabFocus();
}
- BOOL BibView::HandleShortCutKey( const KeyEvent& rKeyEvent )
+ sal_Bool BibView::HandleShortCutKey( const KeyEvent& rKeyEvent )
{
- return m_pGeneralPage? m_pGeneralPage->HandleShortCutKey( rKeyEvent ) : FALSE;
+ return m_pGeneralPage? m_pGeneralPage->HandleShortCutKey( rKeyEvent ) : sal_False;
}
//.........................................................................
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index ec165f9a7930..59c516874568 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -74,7 +74,7 @@ namespace bib
virtual void GetFocus();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
};
//.........................................................................
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index e903707a74ec..4d4092804879 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -329,7 +329,7 @@ public:
MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan);
~MappingDialog_Impl();
- void SetModified() {bModified = TRUE;}
+ void SetModified() {bModified = sal_True;}
};
/* -----------------11.11.99 16:42-------------------
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 4489fad70161..ca9996216f9b 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -422,8 +422,8 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
Window* lcl_GetFocusChild( Window* pParent )
{
- USHORT nChildren = pParent->GetChildCount();
- for( USHORT nChild = 0; nChild < nChildren; ++nChild)
+ sal_uInt16 nChildren = pParent->GetChildCount();
+ for( sal_uInt16 nChild = 0; nChild < nChildren; ++nChild)
{
Window* pChild = pParent->GetChild( nChild );
if(pChild->HasFocus())
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 63c813fe2a99..36e7c825a8bf 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -278,8 +278,8 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan):
aBasePos = aIdentifierFT.GetPosPixel();
- INT16* pMap = nFT2CtrlMap;
- for( USHORT i = 0 ; i < FIELD_COUNT ; ++i, ++pMap )
+ sal_Int16* pMap = nFT2CtrlMap;
+ for( sal_uInt16 i = 0 ; i < FIELD_COUNT ; ++i, ++pMap )
{
aControls[ i ] = 0;
*pMap = -1;
@@ -437,7 +437,7 @@ BibGeneralPage::~BibGeneralPage()
---------------------------------------------------------------------------*/
void BibGeneralPage::RemoveListeners()
{
- for(USHORT i = 0; i < FIELD_COUNT; i++)
+ for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
{
if(aControls[i].is())
{
@@ -468,7 +468,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P
{
// adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
- INT16 nIndex = -1;
+ sal_Int16 nIndex = -1;
uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, sHelpId, nIndex );
if( xTmp.is() )
{
@@ -488,7 +488,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P
//-----------------------------------------------------------------------------
uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
const String& rName,
- ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, INT16& rIndex )
+ ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, sal_Int16& rIndex )
{
uno::Reference< awt::XControlModel > xCtrModel;
try
@@ -545,7 +545,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
xPropSet->setPropertyValue(C2U("StringItemList"), aAny);
- BOOL bTrue = sal_True;
+ sal_Bool bTrue = sal_True;
aAny.setValue( &bTrue, ::getBooleanCppuType() );
xPropSet->setPropertyValue( C2U("Dropdown"), aAny );
@@ -564,11 +564,11 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl(
uno::Reference< awt::XWindow > xCtrWin(xControl, UNO_QUERY );
xCtrWin->addFocusListener( this );
rIndex = -1; // -> implies, that not found
- for(USHORT i = 0; i < FIELD_COUNT; i++)
+ for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
if(!aControls[i].is())
{
aControls[i] = xCtrWin;
- rIndex = INT16( i );
+ rIndex = sal_Int16( i );
break;
}
xCtrWin->setVisible( sal_True );
@@ -595,8 +595,8 @@ void BibGeneralPage::AdjustScrollbars()
long nVertScrollWidth = aVertScroll.GetSizePixel().Width();
long nHoriScrollHeight = aHoriScroll.GetSizePixel().Height();
::Size aOutSize(GetOutputSizePixel());
- BOOL bHoriVisible = aOutSize.Width() <= aStdSize.Width();
- BOOL bVertVisible = (aOutSize.Height()-(bHoriVisible ? nHoriScrollHeight : 0)) <= (aStdSize.Height());
+ sal_Bool bHoriVisible = aOutSize.Width() <= aStdSize.Width();
+ sal_Bool bVertVisible = (aOutSize.Height()-(bHoriVisible ? nHoriScrollHeight : 0)) <= (aStdSize.Height());
aHoriScroll.Show(bHoriVisible);
aVertScroll.Show(bVertVisible);
@@ -732,7 +732,7 @@ void BibGeneralPage::InitFixedTexts( void )
IMPL_LINK(BibGeneralPage, ScrollHdl, ScrollBar*, pScroll)
{
- BOOL bVertical = &aVertScroll == pScroll;
+ sal_Bool bVertical = &aVertScroll == pScroll;
long nOffset = 0;
long nCurrentOffset = 0;
if(bVertical)
@@ -741,7 +741,7 @@ IMPL_LINK(BibGeneralPage, ScrollHdl, ScrollBar*, pScroll)
nCurrentOffset = aFixedTexts[0]->GetPosPixel().X() - aBasePos.X();
nOffset = pScroll->IsVisible() ? pScroll->GetThumbPos() + nCurrentOffset : nCurrentOffset;;
- for(USHORT i = 0; i < FIELD_COUNT; i++)
+ for(sal_uInt16 i = 0; i < FIELD_COUNT; i++)
{
::Point aPos = aFixedTexts[i]->GetPosPixel();
if(bVertical)
@@ -826,13 +826,13 @@ void BibGeneralPage::GetFocus()
aControlParentWin.GrabFocus();
}
-BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
+sal_Bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
{
DBG_ASSERT( KEY_MOD2 == rKeyEvent.GetKeyCode().GetModifier(), "+BibGeneralPage::HandleShortCutKey(): this is not for me!" );
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
const xub_Unicode c = rKeyEvent.GetCharCode();
- BOOL bHandled = FALSE;
+ sal_Bool bHandled = sal_False;
sal_Int16 i;
@@ -847,7 +847,7 @@ BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent )
{
if( rI18nHelper.MatchMnemonic( aFixedTexts[ i ]->GetText(), c ) )
{
- bHandled = TRUE;
+ bHandled = sal_True;
sal_Int16 nCtrlIndex = nFT2CtrlMap[ i ];
if( nCtrlIndex >= 0 )
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 27074404929a..b5519301131d 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -179,7 +179,7 @@ public:
virtual void GetFocus();
- virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
+ virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled
};
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 2af70ffcbffd..d320f175f0a3 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -389,7 +389,7 @@ void BibToolBar::Click()
{
if(pDatMan)
pDatMan->CreateMappingDialog(GetParent());
- CheckItem( nId, FALSE );
+ CheckItem( nId, sal_False );
}
else if(nId == TBC_BT_CHANGESOURCE)
{
@@ -399,7 +399,7 @@ void BibToolBar::Click()
if(sNew.getLength())
pDatMan->setActiveDataSource(sNew);
}
- CheckItem( nId, FALSE );
+ CheckItem( nId, sal_False );
}
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 88d8e2eb352e..dfadd4893cb6 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -147,7 +147,7 @@ namespace dbp
// search the entry of the given type with the given name
XubString sLookup( sCommand );
- for ( USHORT nLookup = 0; nLookup < m_aTable.GetEntryCount(); ++nLookup )
+ for ( sal_uInt16 nLookup = 0; nLookup < m_aTable.GetEntryCount(); ++nLookup )
{
if ( m_aTable.GetEntry( nLookup ) == sLookup )
if ( reinterpret_cast< sal_IntPtr >( m_aTable.GetEntryData( nLookup ) ) == nCommandType )
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 7606fc7bec65..c19f1d3245c0 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -372,12 +372,12 @@ namespace dbp
return sal_False;
OGridSettings& rSettings = getSettings();
- USHORT nSelected = m_aSelFields.GetEntryCount();
+ sal_uInt16 nSelected = m_aSelFields.GetEntryCount();
rSettings.aSelectedFields.realloc(nSelected);
::rtl::OUString* pSelected = rSettings.aSelectedFields.getArray();
- for (USHORT i=0; i<nSelected; ++i, ++pSelected)
+ for (sal_uInt16 i=0; i<nSelected; ++i, ++pSelected)
*pSelected = m_aSelFields.GetEntry(i);
return sal_True;
@@ -419,11 +419,11 @@ namespace dbp
ListBox& rMoveTo = bMoveRight ? m_aSelFields : m_aExistFields;
// the index of the selected entry
- USHORT nSelected = bMoveRight ? m_aExistFields.GetSelectEntryPos() : m_aSelFields.GetSelectEntryPos();
+ sal_uInt16 nSelected = bMoveRight ? m_aExistFields.GetSelectEntryPos() : m_aSelFields.GetSelectEntryPos();
// the (original) relative position of the entry
sal_IntPtr nRelativeIndex = reinterpret_cast<sal_IntPtr>(bMoveRight ? m_aExistFields.GetEntryData(nSelected) : m_aSelFields.GetEntryData(nSelected));
- USHORT nInsertPos = LISTBOX_APPEND;
+ sal_uInt16 nInsertPos = LISTBOX_APPEND;
if (!bMoveRight)
{ // need to determine an insert pos which reflects the original
nInsertPos = 0;
@@ -446,7 +446,7 @@ namespace dbp
// remove the entry from it's old list
if (bMoveRight)
{
- USHORT nSelectPos = m_aExistFields.GetSelectEntryPos();
+ sal_uInt16 nSelectPos = m_aExistFields.GetSelectEntryPos();
m_aExistFields.RemoveEntry(nSelected);
if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aExistFields.GetEntryCount()))
m_aExistFields.SelectEntryPos(nSelectPos);
@@ -455,7 +455,7 @@ namespace dbp
}
else
{
- USHORT nSelectPos = m_aSelFields.GetSelectEntryPos();
+ sal_uInt16 nSelectPos = m_aSelFields.GetSelectEntryPos();
m_aSelFields.RemoveEntry(nSelected);
if ((LISTBOX_ENTRY_NOTFOUND != nSelectPos) && (nSelectPos < m_aSelFields.GetEntryCount()))
m_aSelFields.SelectEntryPos(nSelectPos);
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 88d6e5cf99c0..70c416ac8d51 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -168,7 +168,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
class ModuleRes : public ::ResId
{
public:
- ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+ ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
};
//==========================================================================
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index b66963e420fb..e0bfe3ad5c01 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -580,7 +580,7 @@ static rtl::OUString FindFolderURL( FSVolumeRefNum vRefNum, OSType folderType )
Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
{
static Sequence<PluginDescription> aDescriptions;
- static BOOL bHavePlugins = FALSE;
+ static sal_Bool bHavePlugins = sal_False;
if( ! bHavePlugins )
{
std::list<PluginDescription*> aPlugins;
@@ -639,7 +639,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
delete *iter;
}
aPlugins.clear();
- bHavePlugins = TRUE;
+ bHavePlugins = sal_True;
}
return aDescriptions;
}
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 81637eb2d564..206204fa10a7 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -67,8 +67,8 @@ struct FakeEventRecord : public EventRecord
}
-(id)initWithInstance: (XPlugin_Impl*)i_pImpl pluginComm: (MacPluginComm*)i_pCom frame: (NSRect)i_aRect;
-(void)drawRect: (NSRect)i_aRect;
--(MacOSBOOL)isOpaque;
--(MacOSBOOL)isFlipped;
+-(BOOL)isOpaque;
+-(BOOL)isFlipped;
// NSResponder
-(void)mouseMoved: (NSEvent*)i_pEvent;
@@ -101,12 +101,12 @@ struct FakeEventRecord : public EventRecord
m_pCom->drawView( m_pImpl );
}
--(MacOSBOOL)isOpaque
+-(BOOL)isOpaque
{
return NO;
}
--(MacOSBOOL)isFlipped
+-(BOOL)isFlipped
{
return YES;
}
@@ -270,10 +270,10 @@ MacPluginComm::~MacPluginComm()
}
//--------------------------------------------------------------------------------------------------
-BOOL MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) const
+sal_Bool MacPluginComm::retrieveFunction( const char* i_pName, void** o_ppFunc ) const
{
if( ! m_hPlugLib || ! o_ppFunc )
- return FALSE;
+ return sal_False;
*o_ppFunc = (void*)osl_getAsciiFunctionSymbol( m_hPlugLib, i_pName );
diff --git a/extensions/source/plugin/base/manager.cxx b/extensions/source/plugin/base/manager.cxx
index 0526f3ed881b..c40f599aad23 100644
--- a/extensions/source/plugin/base/manager.cxx
+++ b/extensions/source/plugin/base/manager.cxx
@@ -76,9 +76,9 @@ const Sequence< ::rtl::OUString >& PluginManager::getAdditionalSearchPaths()
String aPluginPath( aOptions.GetPluginPath() );
if( aPluginPath.Len() )
{
- USHORT nPaths = aPluginPath.GetTokenCount( ';' );
+ sal_uInt16 nPaths = aPluginPath.GetTokenCount( ';' );
aPaths.realloc( nPaths );
- for( USHORT i = 0; i < nPaths; i++ )
+ for( sal_uInt16 i = 0; i < nPaths; i++ )
aPaths.getArray()[i] = aPluginPath.GetToken( i, ';' );
}
}
@@ -176,7 +176,7 @@ Sequence<com::sun::star::plugin::PluginDescription> XPluginManager_Impl::getPlug
return aRet;
}
-Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, INT16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype)
+Reference< ::com::sun::star::plugin::XPlugin > XPluginManager_Impl::createPlugin( const Reference< ::com::sun::star::plugin::XPluginContext >& acontext, sal_Int16 mode, const Sequence< ::rtl::OUString >& argn, const Sequence< ::rtl::OUString >& argv, const ::com::sun::star::plugin::PluginDescription& plugintype)
throw( RuntimeException,::com::sun::star::plugin::PluginException )
{
XPlugin_Impl* pImpl = new XPlugin_Impl( m_xSMgr );
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index a501d23f269b..b031df45e2af 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -78,7 +78,7 @@ void PluginDisposer::onShot()
{
if( m_pPlugin->isDisposable() )
{
- ULONG nEvent;
+ sal_uLong nEvent;
Application::PostUserEvent( nEvent, LINK( m_pPlugin, XPlugin_Impl, secondLevelDispose ), (void*)m_pPlugin );
}
}
@@ -1026,7 +1026,7 @@ void PluginInputStream::load()
aUrl.SetSmartProtocol( INET_PROT_FILE );
aUrl.SetSmartURL(
String( getStream()->url,
- ::sal::static_int_cast< USHORT, size_t >( strlen( getStream()->url ) ),
+ ::sal::static_int_cast< sal_uInt16, size_t >( strlen( getStream()->url ) ),
RTL_TEXTENCODING_MS_1252
) );
try
@@ -1071,8 +1071,8 @@ void PluginInputStream::writeBytes( const Sequence<sal_Int8>& Buffer ) throw()
if( m_nMode == -1 || !m_pPlugin->getPluginComm() )
return;
- UINT32 nPos = m_aFileStream.Tell();
- UINT32 nBytes = 0;
+ sal_uInt32 nPos = m_aFileStream.Tell();
+ sal_uInt32 nBytes = 0;
while( m_nMode != NP_ASFILEONLY &&
m_nWritePos < nPos &&
(nBytes = m_pPlugin->getPluginComm()-> NPP_WriteReady(
diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index 941725b1f53d..bd4fc5405822 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -136,7 +136,7 @@ public:
void drawView( XPlugin_Impl* );
private:
- BOOL retrieveFunction( const char* i_pName, void** i_ppFunc ) const;
+ sal_Bool retrieveFunction( const char* i_pName, void** i_ppFunc ) const;
DECL_LINK( NullTimerHdl, void* );
private:
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index 6aa7ec7cca14..9b91c2fdeef1 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -340,7 +340,7 @@ class PluginInputStream :
private:
::ucbhelper::Content* m_pContent;
sal_Int32 m_nMode;
- UINT32 m_nWritePos;
+ sal_uInt32 m_nWritePos;
Reference< com::sun::star::io::XActiveDataSource > m_xSource;
// hold a reference on input until closeOutput is called
@@ -354,7 +354,7 @@ private:
SvFileStream m_aFileStream;
public:
PluginInputStream( XPlugin_Impl* pPlugin,
- const char* url, UINT32 len, UINT32 lastmod );
+ const char* url, sal_uInt32 len, sal_uInt32 lastmod );
PluginInputStream() : PluginStream( NULL, NULL, 0, 0 ) {}
@@ -363,7 +363,7 @@ public:
virtual PluginStreamType getStreamType();
void setMode( sal_Int32 nMode );
- UINT32 read( UINT32 offset, sal_Int8* buffer, UINT32 size );
+ sal_uInt32 read( sal_uInt32 offset, sal_Int8* buffer, sal_uInt32 size );
void setSource( const Reference< com::sun::star::io::XActiveDataSource >& xSource ) { m_xSource = xSource; }
// get contents ot url via ucbhelper::Content
void load();
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index e1a7f59b5dee..ea068410d13e 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -43,14 +43,14 @@
struct MediatorMessage
{
- ULONG m_nID;
- ULONG m_nBytes;
+ sal_uLong m_nID;
+ sal_uLong m_nBytes;
char* m_pBytes;
char* m_pRun;
MediatorMessage() : m_nID( 0 ), m_nBytes( 0 ),
m_pBytes( NULL ), m_pRun( NULL ) {}
- MediatorMessage( ULONG nID, ULONG nBytes, char* pBytes ) :
+ MediatorMessage( sal_uLong nID, sal_uLong nBytes, char* pBytes ) :
m_nID( nID ),m_nBytes( nBytes ), m_pRun( NULL )
{
m_pBytes = new char[ m_nBytes ];
@@ -63,7 +63,7 @@ struct MediatorMessage
delete [] m_pBytes;
}
- void Set( ULONG nBytes, char* pBytes )
+ void Set( sal_uLong nBytes, char* pBytes )
{
if( m_pBytes )
delete [] m_pBytes;
@@ -72,11 +72,11 @@ struct MediatorMessage
memcpy( m_pBytes, pBytes, (size_t)m_nBytes );
}
- ULONG ExtractULONG();
+ sal_uLong ExtractULONG();
char* GetString();
- UINT32 GetUINT32();
- void* GetBytes( ULONG& );
- void* GetBytes() { ULONG nBytes; return GetBytes( nBytes ); }
+ sal_uInt32 GetUINT32();
+ void* GetBytes( sal_uLong& );
+ void* GetBytes() { sal_uLong nBytes; return GetBytes( nBytes ); }
void Rewind() { m_pRun = NULL; }
};
@@ -97,7 +97,7 @@ protected:
MediatorListener* m_pListener;
// thread to fill the queue
- ULONG m_nCurrentID;
+ sal_uLong m_nCurrentID;
// will be constantly increased with each message sent
bool m_bValid;
@@ -112,27 +112,27 @@ public:
// with error
void invalidate() { m_bValid = false; }
- ULONG SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID = 0 );
- ULONG SendMessage( const ByteString& rMessage, ULONG nMessageID = 0 )
+ sal_uLong SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID = 0 );
+ sal_uLong SendMessage( const ByteString& rMessage, sal_uLong nMessageID = 0 )
{
return SendMessage( rMessage.Len(), rMessage.GetBuffer(), nMessageID );
}
- BOOL WaitForMessage( ULONG nTimeOut = 5000 );
+ sal_Bool WaitForMessage( sal_uLong nTimeOut = 5000 );
// timeout in ms
// TRUE: Message came in
// FALSE: timed out
// if timeout is set, WaitForMessage will wait even if there are messages
// in the queue
- virtual MediatorMessage* WaitForAnswer( ULONG nMessageID );
+ virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID );
// wait for an answer message ( ID >= 1 << 24 )
// the message will be removed from the queue and returned
- MediatorMessage* TransactMessage( ULONG nBytes, char* pBytes );
+ MediatorMessage* TransactMessage( sal_uLong nBytes, char* pBytes );
// sends a message and waits for an answer
- MediatorMessage* GetNextMessage( BOOL bWait = FALSE );
+ MediatorMessage* GetNextMessage( sal_Bool bWait = sal_False );
Link SetConnectionLostHdl( const Link& rLink )
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 694fab30801a..d333d994e111 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -157,9 +157,9 @@ public:
NPSavedData aData;
ConnectorInstance( NPP inst, char* type,
- int args, char* pargnbuf, ULONG nargnbytes,
- char* pargvbuf, ULONG nargvbytes,
- char* savedata, ULONG savebytes );
+ int args, char* pargnbuf, sal_uLong nargnbytes,
+ char* pargvbuf, sal_uLong nargvbytes,
+ char* savedata, sal_uLong savebytes );
~ConnectorInstance();
};
@@ -176,22 +176,22 @@ protected:
std::vector<NPStream*> m_aNPWrapStreams;
std::vector<ConnectorInstance*> m_aInstances;
- ULONG FillBuffer( char*&, const char*, ULONG, va_list );
+ sal_uLong FillBuffer( char*&, const char*, sal_uLong, va_list );
public:
PluginConnector( int nSocket );
~PluginConnector();
- virtual MediatorMessage* WaitForAnswer( ULONG nMessageID );
- MediatorMessage* Transact( const char*, ULONG, ... );
- MediatorMessage* Transact( UINT32, ... );
- void Respond( ULONG nID, char*, ULONG, ... );
- ULONG Send( UINT32, ... );
+ virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID );
+ MediatorMessage* Transact( const char*, sal_uLong, ... );
+ MediatorMessage* Transact( sal_uInt32, ... );
+ void Respond( sal_uLong nID, char*, sal_uLong, ... );
+ sal_uLong Send( sal_uInt32, ... );
- static const UINT32 UnknownStreamID = 0xffffffff;
- static const UINT32 UnknownNPPID = 0xffffffff;
+ static const sal_uInt32 UnknownStreamID = 0xffffffff;
+ static const sal_uInt32 UnknownNPPID = 0xffffffff;
- UINT32 GetStreamID( NPStream* pStream );
- UINT32 GetNPPID( NPP );
+ sal_uInt32 GetStreamID( NPStream* pStream );
+ sal_uInt32 GetNPPID( NPP );
std::vector<NPStream*>& getStreamList() { return m_aNPWrapStreams; }
@@ -210,7 +210,7 @@ public:
}
ConnectorInstance* getInstance( NPP );
- ConnectorInstance* getInstanceById( UINT32 );
+ ConnectorInstance* getInstanceById( sal_uInt32 );
};
enum CommandAtoms
diff --git a/extensions/source/plugin/unx/mediator.cxx b/extensions/source/plugin/unx/mediator.cxx
index 9ecf0f48d9f8..4d8fd64a8407 100644
--- a/extensions/source/plugin/unx/mediator.cxx
+++ b/extensions/source/plugin/unx/mediator.cxx
@@ -56,7 +56,7 @@ Mediator::~Mediator()
m_pListener = NULL;
if( m_bValid )
{
- ULONG aHeader[3];
+ sal_uLong aHeader[3];
aHeader[0] = 0;
aHeader[1] = 0;
aHeader[2] = MEDIATOR_MAGIC;
@@ -75,7 +75,7 @@ Mediator::~Mediator()
}
-ULONG Mediator::SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID )
+sal_uLong Mediator::SendMessage( sal_uLong nBytes, const char* pBytes, sal_uLong nMessageID )
{
if( ! m_pListener )
return 0;
@@ -91,26 +91,26 @@ ULONG Mediator::SendMessage( ULONG nBytes, const char* pBytes, ULONG nMessageID
if( ! m_bValid )
return nMessageID;
- ULONG* pBuffer = new ULONG[ (nBytes/sizeof(ULONG)) + 4 ];
+ sal_uLong* pBuffer = new sal_uLong[ (nBytes/sizeof(sal_uLong)) + 4 ];
pBuffer[ 0 ] = nMessageID;
pBuffer[ 1 ] = nBytes;
pBuffer[ 2 ] = MEDIATOR_MAGIC;
memcpy( &pBuffer[3], pBytes, (size_t)nBytes );
- write( m_nSocket, pBuffer, nBytes + 3*sizeof( ULONG ) );
+ write( m_nSocket, pBuffer, nBytes + 3*sizeof( sal_uLong ) );
delete [] pBuffer;
return nMessageID;
}
-BOOL Mediator::WaitForMessage( ULONG nTimeOut )
+sal_Bool Mediator::WaitForMessage( sal_uLong nTimeOut )
{
if( ! m_pListener )
- return FALSE;
+ return sal_False;
size_t nItems = m_aMessageQueue.size();
if( ! nTimeOut && nItems > 0 )
- return TRUE;
+ return sal_True;
TimeValue aValue;
aValue.Seconds = nTimeOut/1000;
@@ -121,12 +121,12 @@ BOOL Mediator::WaitForMessage( ULONG nTimeOut )
m_aNewMessageCdtn.wait( & aValue );
m_aNewMessageCdtn.reset();
if( nTimeOut && m_aMessageQueue.size() == nItems )
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
-MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
+MediatorMessage* Mediator::WaitForAnswer( sal_uLong nMessageID )
{
nMessageID &= 0x00ffffff;
while( m_pListener )
@@ -136,7 +136,7 @@ MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
- ULONG nID = pMessage->m_nID;
+ sal_uLong nID = pMessage->m_nID;
if( ( nID & 0xff000000 ) &&
( ( nID & 0x00ffffff ) == nMessageID ) )
{
@@ -150,7 +150,7 @@ MediatorMessage* Mediator::WaitForAnswer( ULONG nMessageID )
return NULL;
}
-MediatorMessage* Mediator::GetNextMessage( BOOL bWait )
+MediatorMessage* Mediator::GetNextMessage( sal_Bool bWait )
{
while( m_pListener )
{
@@ -175,9 +175,9 @@ MediatorMessage* Mediator::GetNextMessage( BOOL bWait )
return NULL;
}
-MediatorMessage* Mediator::TransactMessage( ULONG nBytes, char* pBytes )
+MediatorMessage* Mediator::TransactMessage( sal_uLong nBytes, char* pBytes )
{
- ULONG nID = SendMessage( nBytes, pBytes );
+ sal_uLong nID = SendMessage( nBytes, pBytes );
return WaitForAnswer( nID );
}
@@ -195,7 +195,7 @@ void MediatorListener::run()
bool bRun = true;
while( schedule() && m_pMediator && bRun )
{
- ULONG nHeader[ 3 ];
+ sal_uLong nHeader[ 3 ];
int nBytes;
if( m_pMediator && ( nBytes = read( m_pMediator->m_nSocket, nHeader, sizeof( nHeader ) ) ) == sizeof( nHeader ) && nHeader[2] == MEDIATOR_MAGIC)
@@ -203,7 +203,7 @@ void MediatorListener::run()
if( nHeader[ 0 ] == 0 && nHeader[ 1 ] == 0 )
return;
char* pBuffer = new char[ nHeader[ 1 ] ];
- if( m_pMediator && (ULONG)read( m_pMediator->m_nSocket, pBuffer, nHeader[ 1 ] ) == nHeader[ 1 ] )
+ if( m_pMediator && (sal_uLong)read( m_pMediator->m_nSocket, pBuffer, nHeader[ 1 ] ) == nHeader[ 1 ] )
{
::vos::OGuard aMyGuard( m_aMutex );
{
@@ -243,30 +243,30 @@ void MediatorListener::onTerminated()
delete this;
}
-ULONG MediatorMessage::ExtractULONG()
+sal_uLong MediatorMessage::ExtractULONG()
{
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::ExtractULONG\n" );
- ULONG nCount;
- memcpy( &nCount, m_pRun, sizeof( ULONG ) );
- m_pRun += sizeof( ULONG );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::ExtractULONG\n" );
+ sal_uLong nCount;
+ memcpy( &nCount, m_pRun, sizeof( sal_uLong ) );
+ m_pRun += sizeof( sal_uLong );
return nCount;
}
-void* MediatorMessage::GetBytes( ULONG& rBytes )
+void* MediatorMessage::GetBytes( sal_uLong& rBytes )
{
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
- ULONG nBytes = ExtractULONG();
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
+ sal_uLong nBytes = ExtractULONG();
if( nBytes == 0 )
return NULL;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetBytes\n" );
char* pBuffer = new char[ nBytes ];
memcpy( pBuffer, m_pRun, nBytes );
m_pRun += nBytes;
@@ -279,13 +279,13 @@ char* MediatorMessage::GetString()
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
- ULONG nBytes = ExtractULONG();
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
+ sal_uLong nBytes = ExtractULONG();
if( nBytes == 0 )
return NULL;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetString\n" );
char* pBuffer = new char[ nBytes+1 ];
memcpy( pBuffer, m_pRun, nBytes );
pBuffer[ nBytes ] = 0;
@@ -293,17 +293,17 @@ char* MediatorMessage::GetString()
return pBuffer;
}
-UINT32 MediatorMessage::GetUINT32()
+sal_uInt32 MediatorMessage::GetUINT32()
{
if( ! m_pRun )
m_pRun = m_pBytes;
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
- ULONG nBytes = ExtractULONG();
- medDebug( nBytes != sizeof( UINT32 ), "No UINT32 in MediatorMessage::GetUINT32\n" );
- medDebug( (ULONG)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
- UINT32 nRet;
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
+ sal_uLong nBytes = ExtractULONG();
+ medDebug( nBytes != sizeof( sal_uInt32 ), "No sal_uInt32 in MediatorMessage::GetUINT32\n" );
+ medDebug( (sal_uLong)(m_pRun - m_pBytes) >= m_nBytes, "Overflow in MediatorMessage::GetUINT32\n" );
+ sal_uInt32 nRet;
memcpy( &nRet, m_pRun, sizeof( nRet ) );
- m_pRun += sizeof( UINT32 );
+ m_pRun += sizeof( sal_uInt32 );
return nRet;
}
diff --git a/extensions/source/plugin/unx/npnapi.cxx b/extensions/source/plugin/unx/npnapi.cxx
index 4a88577c5b71..364ff05606bc 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -66,11 +66,11 @@ static uint32 l_NPN_MemFlush( uint32 /*nSize*/ )
static NPError l_NPN_DestroyStream( NPP instance, NPStream* stream, NPError reason )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
- UINT32 nFileID = pConnector->GetStreamID( stream );
+ sal_uInt32 nFileID = pConnector->GetStreamID( stream );
MediatorMessage* pMes=
pConnector->
Transact( eNPN_DestroyStream,
@@ -117,7 +117,7 @@ static jref l_NPN_GetJavaPeer( NPP /*instance*/ )
static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -142,7 +142,7 @@ static NPError l_NPN_GetURL( NPP instance, const char* url, const char* window )
static NPError l_NPN_GetURLNotify( NPP instance, const char* url, const char* target,
void* notifyData )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -169,7 +169,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType type, const char* targe
NPStream** stream )
// stream is a return value
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -203,7 +203,7 @@ static NPError l_NPN_NewStream( NPP instance, NPMIMEType type, const char* targe
static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* target, uint32 len, const char* buf, NPBool file, void* notifyData )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -228,7 +228,7 @@ static NPError l_NPN_PostURLNotify( NPP instance, const char* url, const char* t
static NPError l_NPN_PostURL( NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -254,29 +254,29 @@ static NPError l_NPN_RequestRead( NPStream* stream, NPByteRange* rangeList )
medDebug( 1, "pluginapp: NPN_RequestRead\n" );
NPByteRange* pRange = rangeList;
- UINT32 nRanges = 0;
+ sal_uInt32 nRanges = 0;
while( pRange )
{
nRanges++;
pRange = pRange->next;
}
- UINT32* pArray = new UINT32[ 2 * nRanges ];
+ sal_uInt32* pArray = new sal_uInt32[ 2 * nRanges ];
pRange = rangeList;
- UINT32 n = 0;
+ sal_uInt32 n = 0;
while( pRange )
{
- pArray[ 2*n ] = (UINT32)pRange->offset;
- pArray[ 2*n + 1] = (UINT32)pRange->length;
+ pArray[ 2*n ] = (sal_uInt32)pRange->offset;
+ pArray[ 2*n + 1] = (sal_uInt32)pRange->length;
n++;
pRange = pRange->next;
}
- UINT32 nFileID = pConnector->GetStreamID( stream );
+ sal_uInt32 nFileID = pConnector->GetStreamID( stream );
MediatorMessage* pMes = pConnector->
Transact( eNPN_RequestRead,
&nFileID, sizeof( nFileID ),
&nRanges, sizeof( nRanges ),
- pArray, sizeof( UINT32 ) * 2 * nRanges,
+ pArray, sizeof( sal_uInt32 ) * 2 * nRanges,
NULL );
if( ! pMes )
@@ -290,7 +290,7 @@ static NPError l_NPN_RequestRead( NPStream* stream, NPByteRange* rangeList )
static void l_NPN_Status( NPP instance, const char* message )
{
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return;
@@ -304,7 +304,7 @@ static const char* l_NPN_UserAgent( NPP instance )
{
static char* pAgent = NULL;
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
{
if( instance )
@@ -355,10 +355,10 @@ static void l_NPN_Version( int* major, int* minor, int* net_major, int* net_mino
static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffer )
{
- UINT32 nFileID = pConnector->GetStreamID( stream );
+ sal_uInt32 nFileID = pConnector->GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return NPERR_GENERIC_ERROR;
- UINT32 nInstance = pConnector->GetNPPID( instance );
+ sal_uInt32 nInstance = pConnector->GetNPPID( instance );
if( nInstance == PluginConnector::UnknownNPPID )
return NPERR_GENERIC_ERROR;
@@ -373,7 +373,7 @@ static int32 l_NPN_Write( NPP instance, NPStream* stream, int32 len, void* buffe
if( ! pMes )
return 0;
- INT32 nRet = pMes->GetUINT32();
+ sal_Int32 nRet = pMes->GetUINT32();
return nRet;
}
@@ -531,7 +531,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
{
MediatorMessage* pMessage;
CommandAtoms nCommand;
- while( (pMessage = GetNextMessage( FALSE )) )
+ while( (pMessage = GetNextMessage( sal_False )) )
{
nCommand = (CommandAtoms)pMessage->GetUINT32();
medDebug( 1, "pluginapp: %s\n", GetCommandName( nCommand ) );
@@ -539,9 +539,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
{
case eNPP_DestroyStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
NPError aReason = GetNPError( pMessage );
m_aNPWrapStreams.erase( m_aNPWrapStreams.begin() + nFileID );
@@ -557,7 +557,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_Destroy:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
ConnectorInstance* pInst= m_aInstances[ nInstance ];
// some plugin rely on old netscapes behaviour
@@ -576,7 +576,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
case eNPP_DestroyPhase2:
{
// now really destroy the instance
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
ConnectorInstance* pInst= m_aInstances[ nInstance ];
NPP instance = pInst->instance;
NPSavedData* pSave = NULL;
@@ -611,7 +611,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_NewStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pType = pMessage->GetString();
NPStream* pStream = new NPStream;
@@ -643,10 +643,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
int16* pArgc = (int16*)pMessage->GetBytes();
NPP instance = new NPP_t;
instance->pdata = instance->ndata = NULL;
- ULONG nArgnBytes, nArgvBytes;
+ sal_uLong nArgnBytes, nArgvBytes;
char* pArgn = (char*)pMessage->GetBytes( nArgnBytes );
char* pArgv = (char*)pMessage->GetBytes( nArgvBytes );
- ULONG nSaveBytes;
+ sal_uLong nSaveBytes;
char* pSavedData = (char*)pMessage->GetBytes( nSaveBytes );
ConnectorInstance* pInst =
new ConnectorInstance( instance, pType,
@@ -659,7 +659,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
aRet = aPluginFuncs.newp( pInst->pMimeType, instance, *pMode, *pArgc,
pInst->nArg ? pInst->argn : NULL,
pInst->nArg ? pInst->argv : NULL,
- ( nSaveBytes == 4 && *(UINT32*)pSavedData == 0 ) ?
+ ( nSaveBytes == 4 && *(sal_uInt32*)pSavedData == 0 ) ?
&(pInst->aData) : NULL );
medDebug( 1, "pluginapp: NPP_New( %s, %p, %d, %d, %p, %p, %p ) returns %d\n",
pInst->pMimeType,
@@ -695,7 +695,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_SetWindow:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
ConnectorInstance* pInst= m_aInstances[ nInstance ];
NPWindow* pWindow = (NPWindow*)pMessage->GetBytes();
@@ -795,9 +795,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_StreamAsFile:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
char* fname = pMessage->GetString();
medDebug( 1, "pluginapp: NPP_StreamAsFile %s\n", fname );
@@ -807,7 +807,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_URLNotify:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* url = pMessage->GetString();
NPReason* pReason = (NPReason*)pMessage->GetBytes();
@@ -820,9 +820,9 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_WriteReady:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
int32 nRet = aPluginFuncs.writeready( instance, pStream );
@@ -836,12 +836,12 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPP_Write:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
int32 offset = pMessage->GetUINT32();
- ULONG len;
+ sal_uLong len;
char* buffer = (char*)pMessage->GetBytes( len );
int32 nRet = aPluginFuncs.write( instance, pStream, offset, len, buffer );
diff --git a/extensions/source/plugin/unx/nppapi.cxx b/extensions/source/plugin/unx/nppapi.cxx
index 82be7ae3c2df..640daba417ce 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/unx/nppapi.cxx
@@ -94,7 +94,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
MediatorMessage* pMessage;
CommandAtoms nCommand;
- while( (pMessage = GetNextMessage( FALSE )) )
+ while( (pMessage = GetNextMessage( sal_False )) )
{
nCommand = (CommandAtoms)pMessage->GetUINT32();
medDebug( 1, "%s\n", GetCommandName( nCommand ) );
@@ -102,7 +102,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
{
case eNPN_GetURL:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pWindow = pMessage->GetString();
@@ -115,7 +115,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_GetURLNotify:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pWindow = pMessage->GetString();
@@ -131,13 +131,13 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_DestroyStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
char* pUrl = pMessage->GetString();
NPError* pReason = (NPError*)pMessage->GetBytes();
NPError aRet = NPERR_FILE_NOT_FOUND;
- if( nFileID < static_cast<UINT32>(m_aNPWrapStreams.size()) )
+ if( nFileID < static_cast<sal_uInt32>(m_aNPWrapStreams.size()) )
{
if( ! strcmp( m_aNPWrapStreams[ nFileID ]->url, pUrl ) )
{
@@ -162,7 +162,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_NewStream:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
NPMIMEType pType = pMessage->GetString();
char* pTarget = pMessage->GetString();
@@ -173,24 +173,24 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
if( aRet != NPERR_NO_ERROR )
{
- UINT32 nDummy = 0;
+ sal_uInt32 nDummy = 0;
Respond( pMessage->m_nID,
(char*)&aRet, sizeof( aRet ),
"", 0,
- &nDummy, sizeof(UINT32),
- &nDummy, sizeof(UINT32),
+ &nDummy, sizeof(sal_uInt32),
+ &nDummy, sizeof(sal_uInt32),
NULL );
}
else
{
m_aNPWrapStreams.push_back( pStream );
- ULONG nLen = strlen( pStream->url );
+ sal_uLong nLen = strlen( pStream->url );
Respond( pMessage->m_nID,
(char*)&aRet, sizeof( aRet ),
pStream->url, nLen,
- &pStream->end, sizeof(UINT32),
- &pStream->lastmodified, sizeof(UINT32),
+ &pStream->end, sizeof(sal_uInt32),
+ &pStream->lastmodified, sizeof(sal_uInt32),
NULL );
}
@@ -200,11 +200,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_PostURLNotify:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pTarget = pMessage->GetString();
- UINT32 nLen = pMessage->GetUINT32();
+ sal_uInt32 nLen = pMessage->GetUINT32();
char* pBuf = (char*)pMessage->GetBytes();
NPBool* pFile = (NPBool*)pMessage->GetBytes();
void** pNData = (void**)pMessage->GetBytes();
@@ -220,11 +220,11 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_PostURL:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pUrl = pMessage->GetString();
char* pWindow = pMessage->GetString();
- UINT32 nLen = pMessage->GetUINT32();
+ sal_uInt32 nLen = pMessage->GetUINT32();
char* pBuf = (char*)pMessage->GetBytes();
NPBool* pFile = (NPBool*)pMessage->GetBytes();
NPError aRet =
@@ -238,14 +238,14 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_RequestRead:
{
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
- UINT32 nRanges = pMessage->GetUINT32();
- UINT32* pArray = (UINT32*)pMessage->GetBytes();
+ sal_uInt32 nRanges = pMessage->GetUINT32();
+ sal_uInt32* pArray = (sal_uInt32*)pMessage->GetBytes();
// build ranges table
NPByteRange* pFirst = new NPByteRange;
NPByteRange* pRun = pFirst;
- for( UINT32 n = 0; n < nRanges; n++ )
+ for( sal_uInt32 n = 0; n < nRanges; n++ )
{
pRun->offset = pArray[ 2*n ];
pRun->length = pArray[ 2*n+1 ];
@@ -265,7 +265,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_Status:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
char* pString = pMessage->GetString();
NPN_Status( instance, pString );
@@ -286,13 +286,13 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_Write:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
- UINT32 nFileID = pMessage->GetUINT32();
+ sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
- INT32 nLen = pMessage->GetUINT32();
+ sal_Int32 nLen = pMessage->GetUINT32();
void* pBuffer = pMessage->GetBytes();
- INT32 nRet = NPN_Write( instance, pStream, nLen, pBuffer );
+ sal_Int32 nRet = NPN_Write( instance, pStream, nLen, pBuffer );
Respond( pMessage->m_nID,
(char*)&nRet, sizeof( nRet ),
NULL );
@@ -302,7 +302,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
break;
case eNPN_UserAgent:
{
- UINT32 nInstance = pMessage->GetUINT32();
+ sal_uInt32 nInstance = pMessage->GetUINT32();
NPP instance = m_aInstances[ nInstance ]->instance;
const char* pAnswer = NPN_UserAgent( instance );
Respond( pMessage->m_nID,
@@ -320,7 +320,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*, /*pMediator*/ )
}
#define GET_INSTANCE() \
- UINT32 nInstance; \
+ sal_uInt32 nInstance; \
nInstance = GetNPPID( instance );
#define GET_INSTANCE_RET( err ) \
@@ -350,9 +350,9 @@ NPError UnxPluginComm::NPP_Destroy( NPP instance, NPSavedData** save )
return NPERR_GENERIC_ERROR;
aRet = GetNPError( pMes );
- ULONG nSaveBytes;
+ sal_uLong nSaveBytes;
void* pSaveData = pMes->GetBytes( nSaveBytes );
- if( nSaveBytes == 4 && *(UINT32*)pSaveData == 0 )
+ if( nSaveBytes == 4 && *(sal_uInt32*)pSaveData == 0 )
*save = NULL;
else
{
@@ -369,7 +369,7 @@ NPError UnxPluginComm::NPP_DestroyStream( NPP instance, NPStream* stream, NPErro
{
NPError aRet = NPERR_GENERIC_ERROR;
GET_INSTANCE_RET( aRet );
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return NPERR_GENERIC_ERROR;
@@ -526,7 +526,7 @@ void UnxPluginComm::NPP_Shutdown()
void UnxPluginComm::NPP_StreamAsFile( NPP instance, NPStream* stream, const char* fname )
{
GET_INSTANCE();
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return;
@@ -552,7 +552,7 @@ void UnxPluginComm::NPP_URLNotify( NPP instance, const char* url, NPReason reaso
int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, int32 len, void* buffer )
{
GET_INSTANCE_RET( -1 );
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return -1;
@@ -575,7 +575,7 @@ int32 UnxPluginComm::NPP_Write( NPP instance, NPStream* stream, int32 offset, in
int32 UnxPluginComm::NPP_WriteReady( NPP instance, NPStream* stream )
{
GET_INSTANCE_RET( -1 );
- UINT32 nFileID = GetStreamID( stream );
+ sal_uInt32 nFileID = GetStreamID( stream );
if( nFileID == PluginConnector::UnknownStreamID )
return -1;
diff --git a/extensions/source/plugin/unx/npwrap.cxx b/extensions/source/plugin/unx/npwrap.cxx
index 387de8cde24d..98bb858ecc0f 100644
--- a/extensions/source/plugin/unx/npwrap.cxx
+++ b/extensions/source/plugin/unx/npwrap.cxx
@@ -227,7 +227,7 @@ static void signal_handler( int nSig )
static gboolean noClosure( gpointer )
{
- return TRUE;
+ return sal_True;
}
// Xt events
@@ -246,7 +246,7 @@ static gboolean checkXtEvent( GSource* )
static gboolean dispatchXtEvent( GSource*, GSourceFunc, gpointer )
{
XtAppProcessEvent( app_context, XtIMAll );
- return TRUE;
+ return sal_True;
}
static GSourceFuncs aXtEventFuncs =
@@ -267,7 +267,7 @@ static gboolean pollXtTimerCallback(gpointer)
break;
XtAppProcessEvent(app_context, XtIMAll & ~XtIMXEvent);
}
- return TRUE;
+ return sal_True;
}
static gboolean prepareWakeupEvent( GSource*, gint* )
@@ -302,7 +302,7 @@ static gboolean dispatchWakeupEvent( GSource*, GSourceFunc, gpointer )
pConnector = NULL;
}
- return TRUE;
+ return sal_True;
}
static GSourceFuncs aWakeupEventFuncs = {
@@ -412,7 +412,7 @@ int main( int argc, char **argv)
}
g_source_set_priority( pXTSource, GDK_PRIORITY_EVENTS );
- g_source_set_can_recurse( pXTSource, TRUE );
+ g_source_set_can_recurse( pXTSource, sal_True );
g_source_attach( pXTSource, NULL );
aXtPollDesc.fd = ConnectionNumber( pXtAppDisplay );
aXtPollDesc.events = G_IO_IN;
@@ -474,7 +474,7 @@ int main( int argc, char **argv)
do
{
#ifdef ENABLE_GTK
- g_main_context_iteration( NULL, TRUE );
+ g_main_context_iteration( NULL, sal_True );
#else
XtAppProcessEvent( app_context, XtIMAll );
#endif
diff --git a/extensions/source/plugin/unx/plugcon.cxx b/extensions/source/plugin/unx/plugcon.cxx
index 8e0183ab8c81..c71738be3632 100644
--- a/extensions/source/plugin/unx/plugcon.cxx
+++ b/extensions/source/plugin/unx/plugcon.cxx
@@ -32,22 +32,22 @@
#include <cstdarg>
#include <vector>
-UINT32 PluginConnector::GetStreamID( NPStream* pStream )
+sal_uInt32 PluginConnector::GetStreamID( NPStream* pStream )
{
size_t nLen = m_aNPWrapStreams.size();
for( size_t i = 0; i < nLen; i++ )
if( m_aNPWrapStreams[ i ] == pStream )
- return static_cast<UINT32>(i);
+ return static_cast<sal_uInt32>(i);
medDebug( 1, "Error: NPStream has no ID\n" );
return UnknownStreamID;
}
-UINT32 PluginConnector::GetNPPID( NPP instance )
+sal_uInt32 PluginConnector::GetNPPID( NPP instance )
{
size_t nLen = m_aInstances.size();
for( size_t i=0; i <nLen; i++ )
if( m_aInstances[ i ]->instance == instance )
- return static_cast<UINT32>(i);
+ return static_cast<sal_uInt32>(i);
medDebug( 1, "Error: NPP has no ID\n" );
return UnknownNPPID;
@@ -65,37 +65,37 @@ ConnectorInstance* PluginConnector::getInstance( NPP instance )
return NULL;
}
-ConnectorInstance* PluginConnector::getInstanceById( UINT32 nInstanceID )
+ConnectorInstance* PluginConnector::getInstanceById( sal_uInt32 nInstanceID )
{
- return nInstanceID < static_cast<UINT32>(m_aInstances.size()) ? m_aInstances[ nInstanceID ] : NULL;
+ return nInstanceID < static_cast<sal_uInt32>(m_aInstances.size()) ? m_aInstances[ nInstanceID ] : NULL;
}
struct PtrStruct
{
char* pData;
- ULONG nBytes;
+ sal_uLong nBytes;
- PtrStruct( char* i_pData, ULONG i_nBytes )
+ PtrStruct( char* i_pData, sal_uLong i_nBytes )
: pData( i_pData ), nBytes( i_nBytes ) {}
};
-ULONG PluginConnector::FillBuffer( char*& rpBuffer,
+sal_uLong PluginConnector::FillBuffer( char*& rpBuffer,
const char* pFunction,
- ULONG nFunctionLen,
+ sal_uLong nFunctionLen,
va_list ap )
{
std::vector< PtrStruct > aList;
aList.reserve( 5 );
- ULONG nDataSize = nFunctionLen + sizeof( ULONG );
+ sal_uLong nDataSize = nFunctionLen + sizeof( sal_uLong );
char* pNext;
do {
pNext = va_arg( ap, char* );
if( pNext )
{
- aList.push_back( PtrStruct( pNext, va_arg( ap, ULONG ) ) );
- nDataSize += aList.back().nBytes + sizeof(ULONG);
+ aList.push_back( PtrStruct( pNext, va_arg( ap, sal_uLong ) ) );
+ nDataSize += aList.back().nBytes + sizeof(sal_uLong);
}
} while( pNext );
@@ -108,8 +108,8 @@ ULONG PluginConnector::FillBuffer( char*& rpBuffer,
for( std::vector<PtrStruct>::const_iterator it = aList.begin(); it != aList.end(); ++it )
{
- memcpy( pRun, &it->nBytes, sizeof( ULONG ) );
- pRun += sizeof( ULONG );
+ memcpy( pRun, &it->nBytes, sizeof( sal_uLong ) );
+ pRun += sizeof( sal_uLong );
memcpy( pRun, it->pData, it->nBytes );
pRun += it->nBytes;
}
@@ -117,53 +117,53 @@ ULONG PluginConnector::FillBuffer( char*& rpBuffer,
}
MediatorMessage* PluginConnector::Transact( const char* pFunction,
- ULONG nFunctionLen, ... )
+ sal_uLong nFunctionLen, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunctionLen );
- ULONG nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
+ sal_uLong nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
va_end( ap );
return TransactMessage( nSize, pBuffer );
}
-MediatorMessage* PluginConnector::Transact( UINT32 nFunction, ... )
+MediatorMessage* PluginConnector::Transact( sal_uInt32 nFunction, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunction );
- ULONG nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
+ sal_uLong nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
va_end( ap );
return TransactMessage( nSize, pBuffer );
}
-ULONG PluginConnector::Send( UINT32 nFunction, ... )
+sal_uLong PluginConnector::Send( sal_uInt32 nFunction, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunction );
- ULONG nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
+ sal_uLong nSize = FillBuffer( pBuffer, (char*)&nFunction, sizeof( nFunction ), ap );
va_end( ap );
return SendMessage( nSize, pBuffer );
}
-void PluginConnector::Respond( ULONG nID,
+void PluginConnector::Respond( sal_uLong nID,
char* pFunction,
- ULONG nFunctionLen, ... )
+ sal_uLong nFunctionLen, ... )
{
va_list ap;
char* pBuffer;
va_start( ap, nFunctionLen );
- ULONG nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
+ sal_uLong nSize = FillBuffer( pBuffer, pFunction, nFunctionLen, ap );
va_end( ap );
SendMessage( nSize, pBuffer, nID | ( 1 << 24 ) );
}
-MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
+MediatorMessage* PluginConnector::WaitForAnswer( sal_uLong nMessageID )
{
if( ! m_bValid )
return NULL;
@@ -176,7 +176,7 @@ MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
for( size_t i = 0; i < m_aMessageQueue.size(); i++ )
{
MediatorMessage* pMessage = m_aMessageQueue[ i ];
- ULONG nID = pMessage->m_nID;
+ sal_uLong nID = pMessage->m_nID;
if( ( nID & 0xff000000 ) &&
( ( nID & 0x00ffffff ) == nMessageID ) )
{
@@ -193,9 +193,9 @@ MediatorMessage* PluginConnector::WaitForAnswer( ULONG nMessageID )
}
ConnectorInstance::ConnectorInstance( NPP inst, char* type,
- int args, char* pargnbuf, ULONG nargnbytes,
- char* pargvbuf, ULONG nargvbytes,
- char* savedata, ULONG savebytes ) :
+ int args, char* pargnbuf, sal_uLong nargnbytes,
+ char* pargvbuf, sal_uLong nargvbytes,
+ char* savedata, sal_uLong savebytes ) :
instance( inst ),
pShell( NULL ),
pWidget( NULL ),
@@ -219,18 +219,18 @@ ConnectorInstance::ConnectorInstance( NPP inst, char* type,
for( i = 0; i < nArg; i++ )
{
argn[i] = pRun;
- while( *pRun != 0 && (ULONG)(pRun - pArgnBuf) < nargnbytes )
+ while( *pRun != 0 && (sal_uLong)(pRun - pArgnBuf) < nargnbytes )
pRun++;
- if( (ULONG)(pRun - pArgnBuf) < nargnbytes )
+ if( (sal_uLong)(pRun - pArgnBuf) < nargnbytes )
pRun++;
}
pRun = pArgvBuf;
for( i = 0; i < nArg; i++ )
{
argv[i] = pRun;
- while( *pRun != 0 && (ULONG)(pRun - pArgvBuf) < nargvbytes )
+ while( *pRun != 0 && (sal_uLong)(pRun - pArgvBuf) < nargvbytes )
pRun++;
- if( (ULONG)(pRun - pArgvBuf) < nargvbytes )
+ if( (sal_uLong)(pRun - pArgvBuf) < nargvbytes )
pRun++;
}
}
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index 97de2911ca82..e78ddf2322cf 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -91,7 +91,7 @@ UnxPluginComm::UnxPluginComm(
}
else
{
- MediatorMessage* pMessage = GetNextMessage( TRUE );
+ MediatorMessage* pMessage = GetNextMessage( sal_True );
Respond( pMessage->m_nID,
const_cast<char*>("init ack"),8,
NULL );
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 1a3736e87e0b..5c02910ada33 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -231,7 +231,7 @@ static void CheckPluginRegistryFiles( const rtl::OString& rPath, list< PluginDes
Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() throw()
{
static Sequence<PluginDescription> aDescriptions;
- static BOOL bHavePlugins = FALSE;
+ static sal_Bool bHavePlugins = sal_False;
if( ! bHavePlugins )
{
rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
@@ -309,7 +309,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
delete *iter;
}
aPlugins.clear();
- bHavePlugins = TRUE;
+ bHavePlugins = sal_True;
}
return aDescriptions;
}
diff --git a/extensions/source/preload/oemwiz.cxx b/extensions/source/preload/oemwiz.cxx
index a073e71c7c7c..c3b7af8e7426 100644
--- a/extensions/source/preload/oemwiz.cxx
+++ b/extensions/source/preload/oemwiz.cxx
@@ -126,7 +126,7 @@ namespace preload
{
FreeResource();
aDlgTitle = GetText();
- aPrevPB.Enable(FALSE);
+ aPrevPB.Enable(sal_False);
aNextST = aNextPB.GetText();
aPrevPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
aNextPB.SetClickHdl(LINK(this, OEMPreloadDialog, NextPrevPageHdl));
@@ -178,7 +178,7 @@ namespace preload
{
case OEM_WELCOME:
aNextPB.SetText(aNextST);
- aNextPB.Enable(TRUE);
+ aNextPB.Enable(sal_True);
break;
case OEM_LICENSE:
sTitle += aLicense;
@@ -208,7 +208,7 @@ namespace preload
sFileName = aURLObject.GetMainURL(INetURLObject::DECODE_TO_IURI);
sFileName += rFileName;
- SfxMedium aMedium( sFileName,STREAM_READ, TRUE );
+ SfxMedium aMedium( sFileName,STREAM_READ, sal_True );
SvStream* pInStream = aMedium.GetInStream();
if( !pInStream )
return sal_False;
@@ -258,7 +258,7 @@ namespace preload
aArrow(this, ModuleRes(IMG_ARROW)),
aStrAccept( ModuleRes(LICENCE_ACCEPT) ),
aStrNotAccept( ModuleRes(LICENCE_NOTACCEPT) ),
- bEndReached(FALSE),
+ bEndReached(sal_False),
pPreloadDialog(pParent)
{
FreeResource();
@@ -324,7 +324,7 @@ namespace preload
//------------------------------------------------------------------------
IMPL_LINK( OEMLicenseTabPage, EndReachedHdl, LicenceView *, EMPTYARG )
{
- bEndReached = TRUE;
+ bEndReached = sal_True;
EnableControls();
aCBAccept.GrabFocus();
@@ -345,7 +345,7 @@ namespace preload
{
if( !bEndReached &&
( aLicenseML.IsEndReached() || !aLicenseML.GetText().Len() ) )
- bEndReached = TRUE;
+ bEndReached = sal_True;
if ( bEndReached )
{
@@ -371,7 +371,7 @@ namespace preload
if ( ! pNext->IsEnabled() )
{
pPreloadDialog->SetCancelString( aOldCancelText );
- pNext->Enable(TRUE);
+ pNext->Enable(sal_True);
}
}
else
@@ -380,7 +380,7 @@ namespace preload
if ( pNext->IsEnabled() )
{
pPreloadDialog->SetCancelString( aStrNotAccept );
- pNext->Enable(FALSE);
+ pNext->Enable(sal_False);
}
}
}
@@ -417,20 +417,20 @@ namespace preload
}
//------------------------------------------------------------------------
- BOOL LicenceView::IsEndReached() const
+ sal_Bool LicenceView::IsEndReached() const
{
- BOOL bEndReached;
+ sal_Bool bEndReached;
ExtTextView* pView = GetTextView();
ExtTextEngine* pEdit = GetTextEngine();
- ULONG nHeight = pEdit->GetTextHeight();
+ sal_uLong nHeight = pEdit->GetTextHeight();
Size aOutSize = pView->GetWindow()->GetOutputSizePixel();
Point aBottom( 0, aOutSize.Height() );
- if ( (ULONG) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
- bEndReached = TRUE;
+ if ( (sal_uLong) pView->GetDocPos( aBottom ).Y() >= nHeight - 1 )
+ bEndReached = sal_True;
else
- bEndReached = FALSE;
+ bEndReached = sal_False;
return bEndReached;
}
@@ -440,8 +440,8 @@ namespace preload
{
if ( rHint.IsA( TYPE(TextHint) ) )
{
- BOOL bLastVal = EndReached();
- ULONG nId = ((const TextHint&)rHint).GetId();
+ sal_Bool bLastVal = EndReached();
+ sal_uLong nId = ((const TextHint&)rHint).GetId();
if ( nId == TEXT_HINT_PARAINSERTED )
{
diff --git a/extensions/source/preload/oemwiz.hxx b/extensions/source/preload/oemwiz.hxx
index d6e8b9f276c6..1f7ae953010b 100644
--- a/extensions/source/preload/oemwiz.hxx
+++ b/extensions/source/preload/oemwiz.hxx
@@ -92,7 +92,7 @@ namespace preload
};
class LicenceView : public MultiLineEdit, public SfxListener
{
- BOOL mbEndReached;
+ sal_Bool mbEndReached;
Link maEndReachedHdl;
Link maScrolledHdl;
@@ -102,9 +102,9 @@ namespace preload
void ScrollDown( ScrollType eScroll );
- BOOL IsEndReached() const;
- BOOL EndReached() const { return mbEndReached; }
- void SetEndReached( BOOL bEnd ) { mbEndReached = bEnd; }
+ sal_Bool IsEndReached() const;
+ sal_Bool EndReached() const { return mbEndReached; }
+ void SetEndReached( sal_Bool bEnd ) { mbEndReached = bEnd; }
void SetEndReachedHdl( const Link& rHdl ) { maEndReachedHdl = rHdl; }
const Link& GetAutocompleteHdl() const { return maEndReachedHdl; }
@@ -130,7 +130,7 @@ namespace preload
String aStrAccept;
String aStrNotAccept;
String aOldCancelText;
- BOOL bEndReached;
+ sal_Bool bEndReached;
OEMPreloadDialog* pPreloadDialog;
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();
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 73cb48d479a9..c939baf668c5 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -70,7 +70,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() throw();
- BOOL SAL_CALL supportsService(const OUString& ServiceName) throw();
+ sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw();
Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw();
static Sequence< OUString > getSupportedServiceNames_Static(void) throw();
@@ -88,8 +88,8 @@ public:
Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw(IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException);
void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) throw(UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException);
Any SAL_CALL getValue(const OUString& PropertyName) throw(UnknownPropertyException, RuntimeException);
- BOOL SAL_CALL hasMethod(const OUString& Name) throw(RuntimeException);
- BOOL SAL_CALL hasProperty(const OUString& Name) throw(RuntimeException);
+ sal_Bool SAL_CALL hasMethod(const OUString& Name) throw(RuntimeException);
+ sal_Bool SAL_CALL hasProperty(const OUString& Name) throw(RuntimeException);
private:
Reference< XTypeConverter > getTypeConverter() const;
Reference< XInvocation > getDefaultInvocation() const;
@@ -129,14 +129,14 @@ OUString ResourceService::getImplementationName() throw()
}
// XServiceInfo
-BOOL SAL_CALL ResourceService::supportsService(const OUString& ServiceName) throw()
+sal_Bool SAL_CALL ResourceService::supportsService(const OUString& ServiceName) throw()
{
Sequence< OUString > aSNL = getSupportedServiceNames();
const OUString * pArray = aSNL.getConstArray();
for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
// XServiceInfo
@@ -273,7 +273,7 @@ Any SAL_CALL ResourceService::invoke
if( bGetBranch )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRING );
if( pResMgr->IsAvailable( aId ) )
{
@@ -288,7 +288,7 @@ Any SAL_CALL ResourceService::invoke
sal_Bool bRet = sal_False;
if( pResMgr )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRING );
bRet = pResMgr->IsAvailable( aId );
}
@@ -324,7 +324,7 @@ Any SAL_CALL ResourceService::invoke
if( FunctionName.equalsAscii("getStringList") )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRINGARRAY );
if( pResMgr->IsAvailable( aId ) )
{
@@ -349,7 +349,7 @@ Any SAL_CALL ResourceService::invoke
sal_Bool bRet = sal_False;
if( pResMgr )
{
- ResId aId( (USHORT)nId, *pResMgr );
+ ResId aId( (sal_uInt16)nId, *pResMgr );
aId.SetRT( RSC_STRINGARRAY );
bRet = pResMgr->IsAvailable( aId );
}
@@ -420,7 +420,7 @@ Any SAL_CALL ResourceService::getValue(const OUString& PropertyName)
}
// XInvokation
-BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
+sal_Bool SAL_CALL ResourceService::hasMethod(const OUString& Name)
throw(RuntimeException)
{
if( Name.equalsAscii("getString") ||
@@ -430,30 +430,30 @@ BOOL SAL_CALL ResourceService::hasMethod(const OUString& Name)
Name.equalsAscii("getStringList") ||
Name.equalsAscii("hasStringList")
)
- return TRUE;
+ return sal_True;
else
{
Reference< XInvocation > xI = getDefaultInvocation();
if( xI.is() )
return xI->hasMethod( Name );
else
- return FALSE;
+ return sal_False;
}
}
// XInvokation
-BOOL SAL_CALL ResourceService::hasProperty(const OUString& Name)
+sal_Bool SAL_CALL ResourceService::hasProperty(const OUString& Name)
throw(RuntimeException)
{
if( Name.equalsAscii("FileName") )
- return TRUE;
+ return sal_True;
else
{
Reference< XInvocation > xI = getDefaultInvocation();
if( xI.is() )
return xI->hasProperty( Name );
else
- return FALSE;
+ return sal_False;
}
}
diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx
index ac3e322bc258..6079d153cffc 100644
--- a/extensions/source/scanner/grid.cxx
+++ b/extensions/source/scanner/grid.cxx
@@ -50,7 +50,7 @@ ResId SaneResId( sal_uInt32 );
// ---------------------------------------------------------------------
-GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, BOOL bCutValues )
+GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window* pParent, sal_Bool bCutValues )
: ModalDialog( pParent, SaneResId( GRID_DIALOG ) ),
m_aGridArea( 50, 15, 100, 100 ),
m_pXValues( pXValues ),
@@ -66,7 +66,7 @@ GridWindow::GridWindow(double* pXValues, double* pYValues, int nValues, Window*
m_aResetTypeBox( this, SaneResId( GRID_DIALOG_TYPE_BOX ) ),
m_aResetButton( this, SaneResId( GRID_DIALOG_RESET_BTN ) )
{
- USHORT nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) );
+ sal_uInt16 nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_ASCENDING ) ) );
m_aResetTypeBox.SetEntryData( nPos, (void *)RESET_TYPE_LINEAR_ASCENDING );
nPos = m_aResetTypeBox.InsertEntry( String( SaneResId( RESET_TYPE_LINEAR_DESCENDING ) ) );
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 42791f355493..c5d4a14ed4e9 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -87,7 +87,7 @@ class GridWindow : public ModalDialog
sal_uInt16 m_BmOffX;
sal_uInt16 m_BmOffY;
- BOOL m_bCutValues;
+ sal_Bool m_bCutValues;
// stuff for handles
std::vector< impHandle > m_aHandles;
@@ -127,7 +127,7 @@ class GridWindow : public ModalDialog
virtual void MouseButtonUp( const MouseEvent& );
public:
GridWindow( double* pXValues, double* pYValues, int nValues,
- Window* pParent, BOOL bCutValues = TRUE );
+ Window* pParent, sal_Bool bCutValues = sal_True );
~GridWindow();
void setBoundings( double fMinX, double fMinY, double fMaxX, double fMaxY );
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index 43c50e6f8451..0ca6884e8202 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -117,7 +117,7 @@ SANE_Status (*Sane::p_set_io_mode)( SANE_Handle, SANE_Bool ) = 0;
SANE_Status (*Sane::p_get_select_fd)( SANE_Handle, SANE_Int* ) = 0;
SANE_String_Const (*Sane::p_strstatus)( SANE_Status ) = 0;
-static BOOL bSaneSymbolLoadFailed = FALSE;
+static sal_Bool bSaneSymbolLoadFailed = sal_False;
inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
{
@@ -126,7 +126,7 @@ inline oslGenericFunction Sane::LoadSymbol( const char* pSymbolname )
{
fprintf( stderr, "Could not load symbol %s\n",
pSymbolname );
- bSaneSymbolLoadFailed = TRUE;
+ bSaneSymbolLoadFailed = sal_True;
}
return pFunction;
}
@@ -203,7 +203,7 @@ void Sane::Init()
if( pSaneLib )
{
- bSaneSymbolLoadFailed = FALSE;
+ bSaneSymbolLoadFailed = sal_False;
p_init = (SANE_Status(*)(SANE_Int*, SANE_Auth_Callback ))
LoadSymbol( "sane_init" );
p_exit = (void(*)())
@@ -297,17 +297,17 @@ void Sane::ReloadOptions()
mppOptions[ i ] = (SANE_Option_Descriptor*)
p_get_option_descriptor( maHandle, i );
- CheckConsistency( NULL, TRUE );
+ CheckConsistency( NULL, sal_True );
maReloadOptionsLink.Call( this );
}
-BOOL Sane::Open( const char* name )
+sal_Bool Sane::Open( const char* name )
{
int i;
SANE_Status nStatus = p_open( (SANE_String_Const)name, &maHandle );
- FAIL_STATE( nStatus, "sane_open", FALSE );
+ FAIL_STATE( nStatus, "sane_open", sal_False );
ReloadOptions();
@@ -324,17 +324,17 @@ BOOL Sane::Open( const char* name )
}
}
- return TRUE;
+ return sal_True;
}
-BOOL Sane::Open( int n )
+sal_Bool Sane::Open( int n )
{
if( n >= 0 && n < nDevices )
{
mnDevice = n;
return Open( (char*)ppDevices[n]->name );
}
- return FALSE;
+ return sal_False;
}
void Sane::Close()
@@ -361,48 +361,48 @@ int Sane::GetOptionByName( const char* rName )
return -1;
}
-BOOL Sane::GetOptionValue( int n, BOOL& rRet )
+sal_Bool Sane::GetOptionValue( int n, sal_Bool& rRet )
{
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_BOOL )
- return FALSE;
+ return sal_False;
SANE_Word nRet;
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, &nRet );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
+ return sal_False;
rRet = nRet;
- return TRUE;
+ return sal_True;
}
-BOOL Sane::GetOptionValue( int n, ByteString& rRet )
+sal_Bool Sane::GetOptionValue( int n, ByteString& rRet )
{
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING )
- return FALSE;
+ return sal_False;
char* pRet = new char[mppOptions[n]->size+1];
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pRet );
if( nStatus == SANE_STATUS_GOOD )
{
- bSuccess = TRUE;
+ bSuccess = sal_True;
rRet = pRet;
}
delete [] pRet;
return bSuccess;
}
-BOOL Sane::GetOptionValue( int n, double& rRet, int nElement )
+sal_Bool Sane::GetOptionValue( int n, double& rRet, int nElement )
{
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
if( ! maHandle || ( mppOptions[n]->type != SANE_TYPE_INT &&
mppOptions[n]->type != SANE_TYPE_FIXED ) )
- return FALSE;
+ return sal_False;
SANE_Word* pRet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pRet );
if( nStatus == SANE_STATUS_GOOD )
{
- bSuccess = TRUE;
+ bSuccess = sal_True;
if( mppOptions[n]->type == SANE_TYPE_INT )
rRet = (double)pRet[ nElement ];
else
@@ -412,18 +412,18 @@ BOOL Sane::GetOptionValue( int n, double& rRet, int nElement )
return bSuccess;
}
-BOOL Sane::GetOptionValue( int n, double* pSet )
+sal_Bool Sane::GetOptionValue( int n, double* pSet )
{
if( ! maHandle || ! ( mppOptions[n]->type == SANE_TYPE_FIXED ||
mppOptions[n]->type == SANE_TYPE_INT ) )
- return FALSE;
+ return sal_False;
SANE_Word* pFixedSet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
SANE_Status nStatus = ControlOption( n, SANE_ACTION_GET_VALUE, pFixedSet );
if( nStatus != SANE_STATUS_GOOD )
{
delete [] pFixedSet;
- return FALSE;
+ return sal_False;
}
for( size_t i = 0; i <mppOptions[n]->size/sizeof(SANE_Word); i++ )
{
@@ -433,38 +433,38 @@ BOOL Sane::GetOptionValue( int n, double* pSet )
pSet[i] = (double) pFixedSet[i];
}
delete [] pFixedSet;
- return TRUE;
+ return sal_True;
}
-BOOL Sane::SetOptionValue( int n, BOOL bSet )
+sal_Bool Sane::SetOptionValue( int n, sal_Bool bSet )
{
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_BOOL )
- return FALSE;
+ return sal_False;
SANE_Word nRet = bSet ? SANE_TRUE : SANE_FALSE;
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, &nRet );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
-BOOL Sane::SetOptionValue( int n, const String& rSet )
+sal_Bool Sane::SetOptionValue( int n, const String& rSet )
{
if( ! maHandle || mppOptions[n]->type != SANE_TYPE_STRING )
- return FALSE;
+ return sal_False;
ByteString aSet( rSet, gsl_getSystemTextEncoding() );
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, (void*)aSet.GetBuffer() );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
-BOOL Sane::SetOptionValue( int n, double fSet, int nElement )
+sal_Bool Sane::SetOptionValue( int n, double fSet, int nElement )
{
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
if( ! maHandle || ( mppOptions[n]->type != SANE_TYPE_INT &&
mppOptions[n]->type != SANE_TYPE_FIXED ) )
- return FALSE;
+ return sal_False;
SANE_Status nStatus;
if( mppOptions[n]->size/sizeof(SANE_Word) > 1 )
@@ -487,16 +487,16 @@ BOOL Sane::SetOptionValue( int n, double fSet, int nElement )
nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, &nSetTo );
if( nStatus == SANE_STATUS_GOOD )
- bSuccess = TRUE;
+ bSuccess = sal_True;
}
return bSuccess;
}
-BOOL Sane::SetOptionValue( int n, double* pSet )
+sal_Bool Sane::SetOptionValue( int n, double* pSet )
{
if( ! maHandle || ( mppOptions[n]->type != SANE_TYPE_INT &&
mppOptions[n]->type != SANE_TYPE_FIXED ) )
- return FALSE;
+ return sal_False;
SANE_Word* pFixedSet = new SANE_Word[mppOptions[n]->size/sizeof(SANE_Word)];
for( size_t i = 0; i < mppOptions[n]->size/sizeof(SANE_Word); i++ )
{
@@ -508,8 +508,8 @@ BOOL Sane::SetOptionValue( int n, double* pSet )
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, pFixedSet );
delete [] pFixedSet;
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
enum FrameStyleType {
@@ -518,25 +518,25 @@ enum FrameStyleType {
#define BYTE_BUFFER_SIZE 32768
-static inline UINT8 _ReadValue( FILE* fp, int depth )
+static inline sal_uInt8 _ReadValue( FILE* fp, int depth )
{
if( depth == 16 )
{
- UINT16 nWord;
+ sal_uInt16 nWord;
// data always come in native byte order !
// 16 bits is not really supported by backends as of now
// e.g. UMAX Astra 1200S delivers 16 bit but in BIGENDIAN
// against SANE documentation (xscanimage gets the same result
// as we do
fread( &nWord, 1, 2, fp );
- return (UINT8)( nWord / 256 );
+ return (sal_uInt8)( nWord / 256 );
}
- UINT8 nByte;
+ sal_uInt8 nByte;
fread( &nByte, 1, 1, fp );
return nByte;
}
-BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
+sal_Bool Sane::CheckConsistency( const char* pMes, sal_Bool bInit )
{
static SANE_Option_Descriptor** pDescArray = NULL;
static SANE_Option_Descriptor* pZero = NULL;
@@ -546,15 +546,15 @@ BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
pDescArray = (SANE_Option_Descriptor**)mppOptions;
if( mppOptions )
pZero = (SANE_Option_Descriptor*)mppOptions[0];
- return TRUE;
+ return sal_True;
}
- BOOL bConsistent = TRUE;
+ sal_Bool bConsistent = sal_True;
if( pDescArray != mppOptions )
- bConsistent = FALSE;
+ bConsistent = sal_False;
if( pZero != mppOptions[0] )
- bConsistent = FALSE;
+ bConsistent = sal_False;
if( ! bConsistent )
dbg_msg( "Sane is not consistent. (%s)\n", pMes );
@@ -562,16 +562,16 @@ BOOL Sane::CheckConsistency( const char* pMes, BOOL bInit )
return bConsistent;
}
-BOOL Sane::Start( BitmapTransporter& rBitmap )
+sal_Bool Sane::Start( BitmapTransporter& rBitmap )
{
int nStream = 0, nLine = 0, i = 0;
SANE_Parameters aParams;
FrameStyleType eType = FrameStyle_Gray;
- BOOL bSuccess = TRUE;
- BOOL bWidthSet = FALSE;
+ sal_Bool bSuccess = sal_True;
+ sal_Bool bWidthSet = sal_False;
if( ! maHandle )
- return FALSE;
+ return sal_False;
int nWidthMM = 0;
int nHeightMM = 0;
@@ -602,7 +602,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
if( ( nOption = GetOptionByName( "resolution" ) ) != -1 )
GetOptionValue( nOption, fResl );
- BYTE* pBuffer = NULL;
+ sal_uInt8* pBuffer = NULL;
SANE_Status nStatus = SANE_STATUS_GOOD;
@@ -618,19 +618,19 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
aConverter << (sal_uInt32) 60;
// write BITMAPINFOHEADER
- aConverter << (UINT32)40;
- aConverter << (UINT32)0; // fill in width later
- aConverter << (UINT32)0; // fill in height later
- aConverter << (UINT16)1;
+ aConverter << (sal_uInt32)40;
+ aConverter << (sal_uInt32)0; // fill in width later
+ aConverter << (sal_uInt32)0; // fill in height later
+ aConverter << (sal_uInt16)1;
// create header for 24 bits
// correct later if necessary
- aConverter << (UINT16)24;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
- aConverter << (UINT32)0;
+ aConverter << (sal_uInt16)24;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
+ aConverter << (sal_uInt32)0;
for( nStream=0; nStream < 3 && bSuccess ; nStream++ )
{
@@ -644,7 +644,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
CheckConsistency( "sane_get_parameters" );
if (nStatus != SANE_STATUS_GOOD || aParams.bytes_per_line == 0)
{
- bSuccess = FALSE;
+ bSuccess = sal_False;
break;
}
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
@@ -662,7 +662,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
#endif
if( ! pBuffer )
{
- pBuffer = new BYTE[ BYTE_BUFFER_SIZE < 4*aParams.bytes_per_line ? 4*aParams.bytes_per_line : BYTE_BUFFER_SIZE ];
+ pBuffer = new sal_uInt8[ BYTE_BUFFER_SIZE < 4*aParams.bytes_per_line ? 4*aParams.bytes_per_line : BYTE_BUFFER_SIZE ];
}
if( aParams.last_frame )
@@ -687,14 +687,14 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
fprintf( stderr, "Warning: unknown frame style !!!\n" );
}
- BOOL bSynchronousRead = TRUE;
+ sal_Bool bSynchronousRead = sal_True;
// should be fail safe, but ... ??
nStatus = p_set_io_mode( maHandle, SANE_FALSE );
CheckConsistency( "sane_set_io_mode" );
if( nStatus != SANE_STATUS_GOOD )
{
- bSynchronousRead = FALSE;
+ bSynchronousRead = sal_False;
nStatus = p_set_io_mode( maHandle, SANE_TRUE );
CheckConsistency( "sane_set_io_mode" );
#if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
@@ -713,12 +713,12 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
DUMP_STATE( nStatus, "sane_get_select_fd" );
CheckConsistency( "sane_get_select_fd" );
if( nStatus != SANE_STATUS_GOOD )
- bSynchronousRead = TRUE;
+ bSynchronousRead = sal_True;
}
FILE* pFrame = tmpfile();
if( ! pFrame )
{
- bSuccess = FALSE;
+ bSuccess = sal_False;
break;
}
do {
@@ -748,14 +748,14 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
if( nStatus != SANE_STATUS_EOF )
{
fclose( pFrame );
- bSuccess = FALSE;
+ bSuccess = sal_False;
break;
}
int nFrameLength = ftell( pFrame );
fseek( pFrame, 0, SEEK_SET );
- UINT32 nWidth = (UINT32) aParams.pixels_per_line;
- UINT32 nHeight = (UINT32) (nFrameLength / aParams.bytes_per_line);
+ sal_uInt32 nWidth = (sal_uInt32) aParams.pixels_per_line;
+ sal_uInt32 nHeight = (sal_uInt32) (nFrameLength / aParams.bytes_per_line);
if( ! bWidthSet )
{
if( ! fResl )
@@ -769,12 +769,12 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
#endif
aConverter.Seek( 18 );
- aConverter << (UINT32)nWidth;
- aConverter << (UINT32)nHeight;
+ aConverter << (sal_uInt32)nWidth;
+ aConverter << (sal_uInt32)nHeight;
aConverter.Seek( 38 );
- aConverter << (UINT32)(1000*nWidth/nWidthMM);
- aConverter << (UINT32)(1000*nHeight/nHeightMM);
- bWidthSet = TRUE;
+ aConverter << (sal_uInt32)(1000*nWidth/nWidthMM);
+ aConverter << (sal_uInt32)(1000*nHeight/nHeightMM);
+ bWidthSet = sal_True;
}
aConverter.Seek(60);
@@ -783,13 +783,13 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
aConverter.Seek( 10 );
aConverter << (sal_uInt32)64;
aConverter.Seek( 28 );
- aConverter << (UINT16) 1;
+ aConverter << (sal_uInt16) 1;
aConverter.Seek( 54 );
// write color table
- aConverter << (UINT16)0xffff;
- aConverter << (UINT8)0xff;
- aConverter << (UINT8)0;
- aConverter << (UINT32)0;
+ aConverter << (sal_uInt16)0xffff;
+ aConverter << (sal_uInt8)0xff;
+ aConverter << (sal_uInt8)0;
+ aConverter << (sal_uInt32)0;
aConverter.Seek( 64 );
}
else if( eType == FrameStyle_Gray )
@@ -797,15 +797,15 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
aConverter.Seek( 10 );
aConverter << (sal_uInt32)1084;
aConverter.Seek( 28 );
- aConverter << (UINT16) 8;
+ aConverter << (sal_uInt16) 8;
aConverter.Seek( 54 );
// write color table
for( nLine = 0; nLine < 256; nLine++ )
{
- aConverter << (UINT8)nLine;
- aConverter << (UINT8)nLine;
- aConverter << (UINT8)nLine;
- aConverter << (UINT8)0;
+ aConverter << (sal_uInt8)nLine;
+ aConverter << (sal_uInt8)nLine;
+ aConverter << (sal_uInt8)nLine;
+ aConverter << (sal_uInt8)0;
}
aConverter.Seek( 1084 );
}
@@ -825,7 +825,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- UINT8 nGray = _ReadValue( pFrame, aParams.depth );
+ sal_uInt8 nGray = _ReadValue( pFrame, aParams.depth );
aConverter << nGray;
}
}
@@ -833,7 +833,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- UINT8 nRed, nGreen, nBlue;
+ sal_uInt8 nRed, nGreen, nBlue;
nRed = _ReadValue( pFrame, aParams.depth );
nGreen = _ReadValue( pFrame, aParams.depth );
nBlue = _ReadValue( pFrame, aParams.depth );
@@ -846,7 +846,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
{
for( i = 0; i < (aParams.pixels_per_line); i++ )
{
- UINT8 nValue = _ReadValue( pFrame, aParams.depth );
+ sal_uInt8 nValue = _ReadValue( pFrame, aParams.depth );
switch( aParams.format )
{
case SANE_FRAME_RED:
@@ -877,7 +877,7 @@ BOOL Sane::Start( BitmapTransporter& rBitmap )
break;
}
else
- bSuccess = FALSE;
+ bSuccess = sal_False;
}
// get stream length
aConverter.Seek( STREAM_SEEK_TO_END );
@@ -917,7 +917,7 @@ int Sane::GetRange( int n, double*& rpDouble )
rpDouble = 0;
int nItems, i;
- BOOL bIsFixed = mppOptions[n]->type == SANE_TYPE_FIXED ? TRUE : FALSE;
+ sal_Bool bIsFixed = mppOptions[n]->type == SANE_TYPE_FIXED ? sal_True : sal_False;
dbg_msg( "Sane::GetRange of option %s ", mppOptions[n]->name );
if(mppOptions[n]->constraint_type == SANE_CONSTRAINT_RANGE )
@@ -995,10 +995,10 @@ String Sane::GetOptionUnitName( int n )
return aText;
}
-BOOL Sane::ActivateButtonOption( int n )
+sal_Bool Sane::ActivateButtonOption( int n )
{
SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, NULL );
if( nStatus != SANE_STATUS_GOOD )
- return FALSE;
- return TRUE;
+ return sal_False;
+ return sal_True;
}
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 44ce0d295f42..2b6683477b56 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -114,16 +114,16 @@ private:
SANE_Status ControlOption( int, SANE_Action, void* );
- BOOL CheckConsistency( const char*, BOOL bInit = FALSE );
+ sal_Bool CheckConsistency( const char*, sal_Bool bInit = sal_False );
public:
Sane();
~Sane();
- static BOOL IsSane()
- { return pSaneLib ? TRUE : FALSE; }
- BOOL IsOpen()
- { return maHandle ? TRUE : FALSE; }
+ static sal_Bool IsSane()
+ { return pSaneLib ? sal_True : sal_False; }
+ sal_Bool IsOpen()
+ { return maHandle ? sal_True : sal_False; }
static int CountDevices()
{ return nDevices; }
static String GetName( int n )
@@ -154,28 +154,28 @@ public:
inline int GetOptionElements( int n );
int GetOptionByName( const char* );
- BOOL GetOptionValue( int, BOOL& );
- BOOL GetOptionValue( int, ByteString& );
- BOOL GetOptionValue( int, double&, int nElement = 0 );
- BOOL GetOptionValue( int, double* );
+ sal_Bool GetOptionValue( int, sal_Bool& );
+ sal_Bool GetOptionValue( int, ByteString& );
+ sal_Bool GetOptionValue( int, double&, int nElement = 0 );
+ sal_Bool GetOptionValue( int, double* );
- BOOL SetOptionValue( int, BOOL );
- BOOL SetOptionValue( int, const String& );
- BOOL SetOptionValue( int, double, int nElement = 0 );
- BOOL SetOptionValue( int, double* );
+ sal_Bool SetOptionValue( int, sal_Bool );
+ sal_Bool SetOptionValue( int, const String& );
+ sal_Bool SetOptionValue( int, double, int nElement = 0 );
+ sal_Bool SetOptionValue( int, double* );
- BOOL ActivateButtonOption( int );
+ sal_Bool ActivateButtonOption( int );
int CountOptions() { return mnOptions; }
int GetDeviceNumber() { return mnDevice; }
- BOOL Open( const char* );
- BOOL Open( int );
+ sal_Bool Open( const char* );
+ sal_Bool Open( int );
void Close();
void ReloadDevices();
void ReloadOptions();
- BOOL Start( BitmapTransporter& );
+ sal_Bool Start( BitmapTransporter& );
inline Link SetReloadOptionsHdl( const Link& rLink );
};
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 7b4b258ea43f..fc8119c07b4c 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -50,8 +50,8 @@ ResId SaneResId( sal_uInt32 nID )
SaneDlg::SaneDlg( Window* pParent, Sane& rSane ) :
ModalDialog( pParent, SaneResId( RID_SANE_DIALOG ) ),
mrSane( rSane ),
- mbIsDragging( FALSE ),
- mbDragDrawn( FALSE ),
+ mbIsDragging( sal_False ),
+ mbDragDrawn( sal_False ),
maMapMode( MAP_APPFONT ),
maOKButton( this, SaneResId( RID_SCAN_OK ) ),
maCancelButton( this, SaneResId( RID_SCAN_CANCEL ) ),
@@ -141,7 +141,7 @@ short SaneDlg::Execute()
ErrorBox aErrorBox( NULL, WB_OK | WB_DEF_OK,
String( SaneResId( RID_SANE_NOSANELIB_TXT ) ) );
aErrorBox.Execute();
- return FALSE;
+ return sal_False;
}
LoadState();
return ModalDialog::Execute();
@@ -173,7 +173,7 @@ void SaneDlg::InitFields()
int nOption, i, nValue;
double fValue;
- BOOL bSuccess = FALSE;
+ sal_Bool bSuccess = sal_False;
const char *ppSpecialOptions[] = {
"resolution",
"tl-x",
@@ -183,7 +183,7 @@ void SaneDlg::InitFields()
"preview"
};
- mbDragEnable = TRUE;
+ mbDragEnable = sal_True;
maReslBox.Clear();
maMinTopLeft = Point( 0, 0 );
maMaxBottomRight = Point( PREVIEW_WIDTH, PREVIEW_HEIGHT );
@@ -200,7 +200,7 @@ void SaneDlg::InitFields()
bSuccess = mrSane.GetOptionValue( nOption, fRes );
if( bSuccess )
{
- maReslBox.Enable( TRUE );
+ maReslBox.Enable( sal_True );
maReslBox.SetValue( (long)fRes );
double *pDouble = NULL;
@@ -241,11 +241,11 @@ void SaneDlg::InitFields()
delete [] pDouble;
}
else
- maReslBox.Enable( FALSE );
+ maReslBox.Enable( sal_False );
}
}
else
- maReslBox.Enable( FALSE );
+ maReslBox.Enable( sal_False );
// set scan area
for( i = 0; i < 4; i++ )
@@ -271,7 +271,7 @@ void SaneDlg::InitFields()
pField = &maBottomField;
}
nOption = pOptionName ? mrSane.GetOptionByName( pOptionName ) : -1;
- bSuccess = FALSE;
+ bSuccess = sal_False;
if( nOption != -1 )
{
bSuccess = mrSane.GetOptionValue( nOption, fValue, 0 );
@@ -323,11 +323,11 @@ void SaneDlg::InitFields()
case 3: maMaxBottomRight.Y() = (int)fValue;break;
}
}
- pField->Enable( TRUE );
+ pField->Enable( sal_True );
}
else
{
- mbDragEnable = FALSE;
+ mbDragEnable = sal_False;
pField->SetMin( 0 );
switch( i ) {
case 0:
@@ -355,7 +355,7 @@ void SaneDlg::InitFields()
pField->SetValue( PREVIEW_HEIGHT );
break;
}
- pField->Enable( FALSE );
+ pField->Enable( sal_False );
}
}
maTopLeft = GetPixelPos( maTopLeft );
@@ -367,23 +367,23 @@ void SaneDlg::InitFields()
// fill OptionBox
maOptionBox.Clear();
SvLBoxEntry* pParentEntry = 0;
- BOOL bGroupRejected = FALSE;
+ sal_Bool bGroupRejected = sal_False;
for( i = 1; i < mrSane.CountOptions(); i++ )
{
String aOption=mrSane.GetOptionName( i );
- BOOL bInsertAdvanced =
+ sal_Bool bInsertAdvanced =
mrSane.GetOptionCap( i ) & SANE_CAP_ADVANCED &&
- ! maAdvancedBox.IsChecked() ? FALSE : TRUE;
+ ! maAdvancedBox.IsChecked() ? sal_False : sal_True;
if( mrSane.GetOptionType( i ) == SANE_TYPE_GROUP )
{
if( bInsertAdvanced )
{
aOption = mrSane.GetOptionTitle( i );
pParentEntry = maOptionBox.InsertEntry( aOption );
- bGroupRejected = FALSE;
+ bGroupRejected = sal_False;
}
else
- bGroupRejected = TRUE;
+ bGroupRejected = sal_True;
}
else if( aOption.Len() &&
! ( mrSane.GetOptionCap( i ) &
@@ -393,12 +393,12 @@ void SaneDlg::InitFields()
) ) &&
bInsertAdvanced && ! bGroupRejected )
{
- BOOL bIsSpecial = FALSE;
+ sal_Bool bIsSpecial = sal_False;
for( size_t n = 0; !bIsSpecial &&
n < sizeof(ppSpecialOptions)/sizeof(ppSpecialOptions[0]); n++ )
{
if( aOption.EqualsAscii( ppSpecialOptions[n] ) )
- bIsSpecial=TRUE;
+ bIsSpecial=sal_True;
}
if( ! bIsSpecial )
{
@@ -432,7 +432,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
{
mrSane.SetOptionValue( mnCurrentOption,
maBoolCheckBox.IsChecked() ?
- (BOOL)TRUE : (BOOL)FALSE );
+ (sal_Bool)sal_True : (sal_Bool)sal_False );
}
else if( pButton == &maButtonOption )
{
@@ -479,7 +479,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, Button*, pButton )
double fRes = (double)maReslBox.GetValue();
SetAdjustedNumericalValue( "resolution", fRes );
mrSane.SetReloadOptionsHdl( maOldLink );
- UpdateScanArea( TRUE );
+ UpdateScanArea( sal_True );
SaveState();
EndDialog( mrSane.IsOpen() ? 1 : 0 );
}
@@ -567,8 +567,8 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
maVectorBox.SetMin( 1 );
maVectorBox.SetMax(
mrSane.GetOptionElements( mnCurrentOption ) );
- maVectorBox.Show( TRUE );
- maVectorTxt.Show( TRUE );
+ maVectorBox.Show( sal_True );
+ maVectorTxt.Show( sal_True );
}
else
{
@@ -623,7 +623,7 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit )
if( fRes > pDouble[ 1 ] )
fRes = pDouble[ 1 ];
}
- maReslBox.SetValue( (ULONG)fRes );
+ maReslBox.SetValue( (sal_uLong)fRes );
}
}
else if( pEdit == &maNumericEdit )
@@ -706,7 +706,7 @@ void SaneDlg::AcquirePreview()
if( ! mrSane.IsOpen() )
return;
- UpdateScanArea( TRUE );
+ UpdateScanArea( sal_True );
// set small resolution for preview
double fResl = (double)maReslBox.GetValue();
SetAdjustedNumericalValue( "resolution", 30.0 );
@@ -720,7 +720,7 @@ void SaneDlg::AcquirePreview()
return;
}
else
- mrSane.SetOptionValue( nOption, (BOOL)TRUE );
+ mrSane.SetOptionValue( nOption, (sal_Bool)sal_True );
BitmapTransporter aTransporter;
if( ! mrSane.Start( aTransporter ) )
@@ -736,11 +736,11 @@ void SaneDlg::AcquirePreview()
fprintf( stderr, "Previewbitmapstream contains %d bytes\n", (int)aTransporter.getStream().Tell() );
#endif
aTransporter.getStream().Seek( STREAM_SEEK_TO_BEGIN );
- maPreviewBitmap.Read( aTransporter.getStream(), TRUE );
+ maPreviewBitmap.Read( aTransporter.getStream(), sal_True );
}
SetAdjustedNumericalValue( "resolution", fResl );
- maReslBox.SetValue( (ULONG)fResl );
+ maReslBox.SetValue( (sal_uLong)fResl );
if( mbDragEnable )
maPreviewRect = Rectangle( maTopLeft,
@@ -781,7 +781,7 @@ void SaneDlg::Paint( const Rectangle& rRect )
DrawBitmap( maPreviewRect.TopLeft(), maPreviewRect.GetSize(),
maPreviewBitmap );
- mbDragDrawn = FALSE;
+ mbDragDrawn = sal_False;
DrawDrag();
ModalDialog::Paint( rRect );
@@ -789,43 +789,43 @@ void SaneDlg::Paint( const Rectangle& rRect )
void SaneDlg::DisableOption()
{
- maBoolCheckBox.Show( FALSE );
- maStringEdit.Show( FALSE );
- maNumericEdit.Show( FALSE );
- maQuantumRangeBox.Show( FALSE );
- maStringRangeBox.Show( FALSE );
- maButtonOption.Show( FALSE );
- maVectorBox.Show( FALSE );
- maVectorTxt.Show( FALSE );
- maOptionDescTxt.Show( FALSE );
+ maBoolCheckBox.Show( sal_False );
+ maStringEdit.Show( sal_False );
+ maNumericEdit.Show( sal_False );
+ maQuantumRangeBox.Show( sal_False );
+ maStringRangeBox.Show( sal_False );
+ maButtonOption.Show( sal_False );
+ maVectorBox.Show( sal_False );
+ maVectorTxt.Show( sal_False );
+ maOptionDescTxt.Show( sal_False );
}
void SaneDlg::EstablishBoolOption()
{
- BOOL bSuccess, bValue;
+ sal_Bool bSuccess, bValue;
bSuccess = mrSane.GetOptionValue( mnCurrentOption, bValue );
if( bSuccess )
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
maBoolCheckBox.Check( bValue );
- maBoolCheckBox.Show( TRUE );
+ maBoolCheckBox.Show( sal_True );
}
}
void SaneDlg::EstablishStringOption()
{
- BOOL bSuccess;
+ sal_Bool bSuccess;
ByteString aValue;
bSuccess = mrSane.GetOptionValue( mnCurrentOption, aValue );
if( bSuccess )
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
maStringEdit.SetText( String( aValue, osl_getThreadTextEncoding() ) );
- maStringEdit.Show( TRUE );
+ maStringEdit.Show( sal_True );
}
}
@@ -838,9 +838,9 @@ void SaneDlg::EstablishStringRange()
ByteString aValue;
mrSane.GetOptionValue( mnCurrentOption, aValue );
maStringRangeBox.SelectEntry( String( aValue, osl_getThreadTextEncoding() ) );
- maStringRangeBox.Show( TRUE );
+ maStringRangeBox.Show( sal_True );
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
}
void SaneDlg::EstablishQuantumRange()
@@ -876,18 +876,18 @@ void SaneDlg::EstablishQuantumRange()
sprintf( pBuf, "%g", fValue );
maQuantumRangeBox.SelectEntry( String( pBuf, osl_getThreadTextEncoding() ) );
}
- maQuantumRangeBox.Show( TRUE );
+ maQuantumRangeBox.Show( sal_True );
String aText( mrSane.GetOptionName( mnCurrentOption ) );
aText += ' ';
aText += mrSane.GetOptionUnitName( mnCurrentOption );
maOptionDescTxt.SetText( aText );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
}
}
void SaneDlg::EstablishNumericOption()
{
- BOOL bSuccess;
+ sal_Bool bSuccess;
double fValue;
bSuccess = mrSane.GetOptionValue( mnCurrentOption, fValue );
@@ -904,17 +904,17 @@ void SaneDlg::EstablishNumericOption()
aText += String( pBuf, osl_getThreadTextEncoding() );
}
maOptionDescTxt.SetText( aText );
- maOptionDescTxt.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
sprintf( pBuf, "%g", fValue );
maNumericEdit.SetText( String( pBuf, osl_getThreadTextEncoding() ) );
- maNumericEdit.Show( TRUE );
+ maNumericEdit.Show( sal_True );
}
void SaneDlg::EstablishButtonOption()
{
maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
- maOptionDescTxt.Show( TRUE );
- maButtonOption.Show( TRUE );
+ maOptionDescTxt.Show( sal_True );
+ maButtonOption.Show( sal_True );
}
#define RECT_SIZE_PIX 7
@@ -959,7 +959,7 @@ void SaneDlg::MouseMove( const MouseEvent& rMEvt )
maBottomRight.Y() = nSwap;
}
DrawDrag();
- UpdateScanArea( FALSE );
+ UpdateScanArea( sal_False );
}
ModalDialog::MouseMove( rMEvt );
}
@@ -980,21 +980,21 @@ void SaneDlg::MouseButtonDown( const MouseEvent& rMEvt )
{
meDragDirection = TopLeft;
aMousePixel = maTopLeft;
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() >= nMiddleX &&
aMousePixel.X() < nMiddleX + RECT_SIZE_PIX )
{
meDragDirection = Top;
aMousePixel.Y() = maTopLeft.Y();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() > maBottomRight.X() - RECT_SIZE_PIX &&
aMousePixel.X() <= maBottomRight.X() )
{
meDragDirection = TopRight;
aMousePixel = Point( maBottomRight.X(), maTopLeft.Y() );
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
}
else if( aMousePixel.Y() >= nMiddleY &&
@@ -1005,14 +1005,14 @@ void SaneDlg::MouseButtonDown( const MouseEvent& rMEvt )
{
meDragDirection = Left;
aMousePixel.X() = maTopLeft.X();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() > maBottomRight.X() - RECT_SIZE_PIX &&
aMousePixel.X() <= maBottomRight.X() )
{
meDragDirection = Right;
aMousePixel.X() = maBottomRight.X();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
}
else if( aMousePixel.Y() <= maBottomRight.Y() &&
@@ -1023,21 +1023,21 @@ void SaneDlg::MouseButtonDown( const MouseEvent& rMEvt )
{
meDragDirection = BottomLeft;
aMousePixel = Point( maTopLeft.X(), maBottomRight.Y() );
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() >= nMiddleX &&
aMousePixel.X() < nMiddleX + RECT_SIZE_PIX )
{
meDragDirection = Bottom;
aMousePixel.Y() = maBottomRight.Y();
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
else if( aMousePixel.X() > maBottomRight.X() - RECT_SIZE_PIX &&
aMousePixel.X() <= maBottomRight.X() )
{
meDragDirection = BottomRight;
aMousePixel = maBottomRight;
- mbIsDragging = TRUE;
+ mbIsDragging = sal_True;
}
}
}
@@ -1053,9 +1053,9 @@ void SaneDlg::MouseButtonUp( const MouseEvent& rMEvt )
{
if( mbIsDragging )
{
- UpdateScanArea( TRUE );
+ UpdateScanArea( sal_True );
}
- mbIsDragging = FALSE;
+ mbIsDragging = sal_False;
ModalDialog::MouseButtonUp( rMEvt );
}
@@ -1102,7 +1102,7 @@ void SaneDlg::DrawDrag()
aLastBR = maBottomRight;
DrawRectangles( maTopLeft, maBottomRight );
- mbDragDrawn = TRUE;
+ mbDragDrawn = sal_True;
SetRasterOp( eROP );
SetMapMode( maMapMode );
}
@@ -1141,7 +1141,7 @@ Point SaneDlg::GetLogicPos( const Point& rIn )
return aConvert;
}
-void SaneDlg::UpdateScanArea( BOOL bSend )
+void SaneDlg::UpdateScanArea( sal_Bool bSend )
{
if( ! mbDragEnable )
return;
@@ -1166,26 +1166,26 @@ void SaneDlg::UpdateScanArea( BOOL bSend )
}
}
-BOOL SaneDlg::LoadState()
+sal_Bool SaneDlg::LoadState()
{
#ifdef USE_SAVE_STATE
int i;
if( ! Sane::IsSane() )
- return FALSE;
+ return sal_False;
const char* pEnv = getenv("HOME");
String aFileName( pEnv ? pEnv : "", osl_getThreadTextEncoding() );
aFileName += String( RTL_CONSTASCII_USTRINGPARAM( "/.so_sane_state" ) );
Config aConfig( aFileName );
if( ! aConfig.HasGroup( "SANE" ) )
- return FALSE;
+ return sal_False;
aConfig.SetGroup( "SANE" );
ByteString aString = aConfig.ReadKey( "SO_LastSaneDevice" );
for( i = 0; i < Sane::CountDevices() && ! aString.Equals( ByteString( Sane::GetName( i ), osl_getThreadTextEncoding() ) ); i++ ) ;
if( i == Sane::CountDevices() )
- return FALSE;
+ return sal_False;
mrSane.Close();
mrSane.Open( aString.GetBuffer() );
@@ -1206,7 +1206,7 @@ BOOL SaneDlg::LoadState()
if( aValue.CompareTo( "BOOL=", 5 ) == COMPARE_EQUAL )
{
aValue.Erase( 0, 5 );
- BOOL aBOOL = (BOOL)aValue.ToInt32();
+ sal_Bool aBOOL = (sal_Bool)aValue.ToInt32();
mrSane.SetOptionValue( nOption, aBOOL );
}
else if( aValue.CompareTo( "STRING=", 7 ) == COMPARE_EQUAL )
@@ -1233,9 +1233,9 @@ BOOL SaneDlg::LoadState()
DisableOption();
InitFields();
- return TRUE;
+ return sal_True;
#else
- return FALSE;
+ return sal_False;
#endif
}
@@ -1263,11 +1263,11 @@ void SaneDlg::SaveState()
{
case SANE_TYPE_BOOL:
{
- BOOL bValue;
+ sal_Bool bValue;
if( mrSane.GetOptionValue( i, bValue ) )
{
ByteString aString( "BOOL=" );
- aString += (ULONG)bValue;
+ aString += (sal_uLong)bValue;
aConfig.WriteKey( aOption, aString );
}
}
@@ -1327,7 +1327,7 @@ void SaneDlg::SaveState()
{
case SANE_TYPE_BOOL:
{
- BOOL bValue;
+ sal_Bool bValue;
if( mrSane.GetOptionValue( nOption, bValue ) )
{
ByteString aString( "BOOL=" );
@@ -1377,22 +1377,22 @@ void SaneDlg::SaveState()
#endif
}
-BOOL SaneDlg::SetAdjustedNumericalValue(
+sal_Bool SaneDlg::SetAdjustedNumericalValue(
const char* pOption,
double fValue,
int nElement )
{
int nOption;
if( ! Sane::IsSane() || ! mrSane.IsOpen() || ( nOption = mrSane.GetOptionByName( pOption ) ) == -1 )
- return FALSE;
+ return sal_False;
if( nElement < 0 || nElement >= mrSane.GetOptionElements( nOption ) )
- return FALSE;
+ return sal_False;
double* pValues = NULL;
int nValues;
if( ( nValues = mrSane.GetRange( nOption, pValues ) ) < 0 )
- return FALSE;
+ return sal_False;
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "SaneDlg::SetAdjustedNumericalValue( \"%s\", %lg ) ",
@@ -1427,5 +1427,5 @@ BOOL SaneDlg::SetAdjustedNumericalValue(
#endif
- return TRUE;
+ return sal_True;
}
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index 2ea35ca33c83..5fc112732ef8 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -52,10 +52,10 @@ private:
Rectangle maPreviewRect;
Point maTopLeft, maBottomRight;
Point maMinTopLeft, maMaxBottomRight;
- BOOL mbDragEnable;
- BOOL mbIsDragging;
+ sal_Bool mbDragEnable;
+ sal_Bool mbIsDragging;
int mnDragMode;
- BOOL mbDragDrawn;
+ sal_Bool mbDragDrawn;
DragDirection meDragDirection;
MapMode maMapMode;
@@ -115,7 +115,7 @@ private:
DECL_LINK( OptionsBoxSelectHdl, SvTreeListBox* );
void SaveState();
- BOOL LoadState();
+ sal_Bool LoadState();
void InitDevices();
void InitFields();
@@ -132,10 +132,10 @@ private:
void DrawDrag();
Point GetPixelPos( const Point& );
Point GetLogicPos( const Point& );
- void UpdateScanArea( BOOL );
+ void UpdateScanArea( sal_Bool );
// helper
- BOOL SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 );
+ sal_Bool SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 );
virtual void Paint( const Rectangle& );
virtual void MouseMove( const MouseEvent& rMEvt );
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 3453598974a7..374c2adc3a25 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -88,7 +88,7 @@ public:
// XScannerManager
virtual SEQ( ScannerContext ) SAL_CALL getAvailableScanners() throw();
- virtual BOOL SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
+ virtual sal_Bool SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException );
virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const REF( com::sun::star::lang::XEventListener )& rxListener ) throw( ScannerException );
virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException );
virtual REF( AWT::XBitmap ) SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException );
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index 0a477a9dae7d..5307ac148487 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -203,7 +203,7 @@ void ScannerThread::run()
{
int nOption = m_pHolder->m_aSane.GetOptionByName( "preview" );
if( nOption != -1 )
- m_pHolder->m_aSane.SetOptionValue( nOption, (BOOL)FALSE );
+ m_pHolder->m_aSane.SetOptionValue( nOption, (sal_Bool)sal_False );
m_pHolder->m_nError =
m_pHolder->m_aSane.Start( *pTransporter ) ?
@@ -277,7 +277,7 @@ SEQ( ScannerContext ) ScannerManager::getAvailableScanners() throw()
// -----------------------------------------------------------------------------
-BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
+sal_Bool ScannerManager::configureScanner( ScannerContext& scanner_context ) throw( ScannerException )
{
vos::OGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
@@ -286,7 +286,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
fprintf( stderr, "ScannerManager::configureScanner\n" );
#endif
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
@@ -303,7 +303,7 @@ BOOL ScannerManager::configureScanner( ScannerContext& scanner_context ) throw(
pHolder->m_bBusy = true;
SaneDlg aDlg( NULL, pHolder->m_aSane );
- BOOL bRet = (BOOL)aDlg.Execute();
+ sal_Bool bRet = (sal_Bool)aDlg.Execute();
pHolder->m_bBusy = false;
return bRet;
@@ -321,7 +321,7 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
fprintf( stderr, "ScannerManager::startScan\n" );
#endif
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
@@ -347,7 +347,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
vos::OGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
@@ -366,7 +366,7 @@ REF( AWT::XBitmap ) ScannerManager::getBitmap( const ScannerContext& scanner_con
vos::OGuard aGuard( theSaneProtector::get() );
sanevec &rSanes = theSanes::get().m_aSanes;
- if( scanner_context.InternalData < 0 || (ULONG)scanner_context.InternalData >= rSanes.size() )
+ if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
throw ScannerException(
::rtl::OUString::createFromAscii( "Scanner does not exist" ),
REF( XScannerManager )( this ),
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index f245cc95d1f6..e910da58cc8a 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -1001,7 +1001,7 @@ SEQ( ScannerContext ) SAL_CALL ScannerManager::getAvailableScanners() throw()
// -----------------------------------------------------------------------------
-BOOL SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
+sal_Bool SAL_CALL ScannerManager::configureScanner( ScannerContext& rContext )
throw( ScannerException )
{
vos::OGuard aGuard( maProtector );
diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx
index d0fcaf411d6a..bd17f1e56117 100644
--- a/extensions/source/scanner/twain.cxx
+++ b/extensions/source/scanner/twain.cxx
@@ -176,7 +176,7 @@ void ImpTwain::Destroy()
// -----------------------------------------------------------------------------
-BOOL ImpTwain::SelectSource()
+sal_Bool ImpTwain::SelectSource()
{
TW_UINT16 nRet = TWRC_FAILURE;
@@ -201,9 +201,9 @@ BOOL ImpTwain::SelectSource()
// -----------------------------------------------------------------------------
-BOOL ImpTwain::InitXfer()
+sal_Bool ImpTwain::InitXfer()
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( !!aBitmap )
aBitmap = Bitmap();
@@ -435,7 +435,7 @@ void ImpTwain::ImplFallback( ULONG nEvent )
IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
{
const ULONG nEvent = (ULONG) pData;
- BOOL bFallback = TRUE;
+ sal_Bool bFallback = sal_True;
switch( nCurState )
{
@@ -490,7 +490,7 @@ IMPL_LINK( ImpTwain, ImplFallbackHdl, void*, pData )
if( nEvent != TWAIN_EVENT_NONE )
aNotifyLink.Call( (void*) nEvent );
- bFallback = FALSE;
+ bFallback = sal_False;
}
break;
}
diff --git a/extensions/source/scanner/twain.hxx b/extensions/source/scanner/twain.hxx
index 6f4605f5f796..bb9fa44b6cf6 100644
--- a/extensions/source/scanner/twain.hxx
+++ b/extensions/source/scanner/twain.hxx
@@ -58,21 +58,21 @@ class ImpTwain
Bitmap aBitmap;
DSMENTRYPROC pDSM;
vos:: OModule * pMod;
- ULONG nCurState;
+ sal_uLong nCurState;
void ImplCreate();
void ImplOpenSourceManager();
void ImplOpenSource();
- BOOL ImplEnableSource();
+ sal_Bool ImplEnableSource();
void ImplXfer();
- void ImplFallback( ULONG nEvent );
+ void ImplFallback( sal_uLong nEvent );
DECL_LINK( ImplFallbackHdl, void* );
DECL_LINK( ImplDestroyHdl, void* );
public:
- BOOL ImplHandleMsg( void* pMsg );
+ sal_Bool ImplHandleMsg( void* pMsg );
#ifdef OS2
HAB hAB;
@@ -90,8 +90,8 @@ public:
void Destroy();
- BOOL SelectSource();
- BOOL InitXfer();
+ sal_Bool SelectSource();
+ sal_Bool InitXfer();
Bitmap GetXferBitmap();
};
diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx
index dc2c47ecb937..fbe5badb17e6 100644
--- a/extensions/source/svg/svgaction.cxx
+++ b/extensions/source/svg/svgaction.cxx
@@ -401,7 +401,7 @@ void SVGAttributeWriter::SetFontAttr( const Font& rFont )
delete mpElemPaint, mpElemPaint = NULL;
delete mpElemFont;
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, GetFontStyle( maCurFont = rFont ) );
- mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ mpElemFont = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
}
}
@@ -413,7 +413,7 @@ void SVGAttributeWriter::SetPaintAttr( const Color& rLineColor, const Color& rFi
{
delete mpElemPaint;
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, GetPaintStyle( maCurLineColor = rLineColor, maCurFillColor = rFillColor ) );
- mpElemPaint = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ mpElemPaint = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
}
}
@@ -522,7 +522,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const
}
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemLine, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemLine, sal_True, sal_True );
}
}
@@ -549,7 +549,7 @@ void SVGActionWriter::ImplWriteRect( const Rectangle& rRect, long nRadX, long nR
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True );
}
}
@@ -570,7 +570,7 @@ void SVGActionWriter::ImplWriteEllipse( const Point& rCenter, long nRadX, long n
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStyle, *pStyle );
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemEllipse, sal_True, sal_True );
}
}
@@ -587,7 +587,7 @@ void SVGActionWriter::ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly
{
FastString aStyle;
FastString aPoints;
- USHORT i = 0, nSize = rPoly.GetSize();
+ sal_uInt16 i = 0, nSize = rPoly.GetSize();
const NMSP_RTL::OUString aBlank( B2UCONST( " " ) );
// points
@@ -626,7 +626,7 @@ void SVGActionWriter::ImplWritePolygon( const Polygon& rPoly, sal_Bool bLineOnly
{
// write polyline/polygon element
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, bLineOnly ? aXMLElemPolyLine : aXMLElemPolygon, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, bLineOnly ? aXMLElemPolyLine : aXMLElemPolygon, sal_True, sal_True );
}
}
}
@@ -651,8 +651,8 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
for( long i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
{
- const Polygon& rPoly = rPolyPoly[ (USHORT) i ];
- USHORT n = 1, nSize = rPoly.GetSize();
+ const Polygon& rPoly = rPolyPoly[ (sal_uInt16) i ];
+ sal_uInt16 n = 1, nSize = rPoly.GetSize();
if( nSize > 1 )
{
@@ -716,7 +716,7 @@ void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon& rPolyPoly, sal_Bo
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrD, aPathData.GetString() );
{
// write polyline/polygon element
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemPath, sal_True, sal_True );
}
}
}
@@ -729,7 +729,7 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
{
if( rPolyPoly.Count() )
{
- SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ SvXMLElementExport aElemG( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
FastString aClipId;
FastString aClipStyle;
@@ -737,12 +737,12 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
aClipId += NMSP_RTL::OUString::valueOf( ImplGetNextClipId() );
{
- SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, TRUE, TRUE );
+ SvXMLElementExport aElemDefs( mrExport, XML_NAMESPACE_NONE, aXMLElemDefs, sal_True, sal_True );
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrId, aClipId.GetString() );
{
- SvXMLElementExport aElemClipPath( mrExport, XML_NAMESPACE_NONE, aXMLElemClipPath, TRUE, TRUE );
+ SvXMLElementExport aElemClipPath( mrExport, XML_NAMESPACE_NONE, aXMLElemClipPath, sal_True, sal_True );
ImplWritePolyPolygon( rPolyPoly, sal_False );
}
}
@@ -756,7 +756,7 @@ void SVGActionWriter::ImplWriteGradientEx( const PolyPolygon& rPolyPoly, const G
{
GDIMetaFile aTmpMtf;
- SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ SvXMLElementExport aElemG2( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
mpVDev->AddGradientActions( rPolyPoly.GetBoundRect(), rGradient, aTmpMtf );
ImplWriteActions( aTmpMtf, pStyle );
@@ -771,7 +771,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
const NMSP_RTL::OUString* pStyle )
{
String aText( rText ); aText.EraseLeadingChars( ' ' );
- UINT32 nLen = aText.Len(), i;
+ sal_uInt32 nLen = aText.Len(), i;
if( nLen )
{
@@ -795,7 +795,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
if( nLen > 1 )
{
- aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( aText.GetChar( (USHORT) nLen - 1 ) );
+ aNormSize.Width() = pDX[ nLen - 2 ] + mpVDev->GetTextWidth( aText.GetChar( (sal_uInt16) nLen - 1 ) );
if( nWidth && aNormSize.Width() && ( nWidth != aNormSize.Width() ) )
{
@@ -861,7 +861,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
aTransform += ')';
mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrTransform, aTransform );
- pTransform = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, TRUE, TRUE );
+ pTransform = new SvXMLElementExport( mrExport, XML_NAMESPACE_NONE, aXMLElemG, sal_True, sal_True );
}
// add additional style if requested
@@ -872,7 +872,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
#ifdef _SVG_USE_TSPANS
if( pDXArray )
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_True );
FastString aTSpanX;
const NMSP_RTL::OUString aSpace( ' ' );
long i, nX, nCount;
@@ -894,7 +894,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
{
try
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTSpan, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemTSpan, sal_True, sal_True );
mrExport.GetDocHandler()->characters( NMSP_RTL::OUString( UniString( aText ) ) );
}
catch( ::com::sun::star::xml::sax::SAXException& )
@@ -912,7 +912,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
try
{
- SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, TRUE, TRUE );
+ SvXMLElementExport aElem( mrExport, XML_NAMESPACE_NONE, aXMLElemText, sal_True, sal_True );
mrExport.GetDocHandler()->characters( NMSP_RTL::OUString( UniString( aText ) ) );
}
catch( ::com::sun::star::xml::sax::SAXException& )
@@ -938,7 +938,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
- ImplWritePolygon( aPoly, FALSE );
+ ImplWritePolygon( aPoly, sal_False );
}
if( rFont.GetUnderline() )
@@ -950,7 +950,7 @@ void SVGActionWriter::ImplWriteText( const Point& rPos, const String& rText,
aPoly[ 2 ].X() = aPoly[ 1 ].X(); aPoly[ 2 ].Y() = aPoly[ 0 ].Y() + nLineHeight - 1;
aPoly[ 3 ].X() = aPoly[ 0 ].X(); aPoly[ 3 ].Y() = aPoly[ 2 ].Y();
- ImplWritePolygon( aPoly, FALSE );
+ ImplWritePolygon( aPoly, sal_False );
}
}
@@ -1049,10 +1049,10 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
{
ImplAcquireContext();
- for( ULONG i = 0, nCount = rMtf.GetActionCount(); i < nCount; i++ )
+ for( sal_uLong i = 0, nCount = rMtf.GetActionCount(); i < nCount; i++ )
{
const MetaAction* pAction = rMtf.GetAction( i );
- const USHORT nType = pAction->GetType();
+ const sal_uInt16 nType = pAction->GetType();
switch( nType )
{
@@ -1253,7 +1253,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf, const NMSP_RTL:
const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
sal_Bool bFound = sal_False;
- for( ULONG j = 0, nCount2 = aGDIMetaFile.GetActionCount(); ( j < nCount2 ) && !bFound; j++ )
+ for( sal_uLong j = 0, nCount2 = aGDIMetaFile.GetActionCount(); ( j < nCount2 ) && !bFound; j++ )
{
const MetaAction* pSubstAct = aGDIMetaFile.GetAction( j );
diff --git a/extensions/source/svg/svgaction.hxx b/extensions/source/svg/svgaction.hxx
index 8e7bececb87d..b73fba3e95c5 100644
--- a/extensions/source/svg/svgaction.hxx
+++ b/extensions/source/svg/svgaction.hxx
@@ -158,7 +158,7 @@ public:
virtual ~SVGActionWriter();
const VirtualDevice& GetVDev() const { return *mpVDev; }
- BOOL HasDoublePoints() const { return mbDoublePoints; }
+ sal_Bool HasDoublePoints() const { return mbDoublePoints; }
};
#endif
diff --git a/extensions/source/svg/svgprinter.cxx b/extensions/source/svg/svgprinter.cxx
index c7605a8af16d..24a6244d0b79 100644
--- a/extensions/source/svg/svgprinter.cxx
+++ b/extensions/source/svg/svgprinter.cxx
@@ -71,7 +71,7 @@ private:
protected:
virtual void _ExportMeta() {}
- virtual void _ExportStyles( BOOL /*bUsed*/ ) {}
+ virtual void _ExportStyles( sal_Bool /*bUsed*/ ) {}
virtual void _ExportAutoStyles() {}
virtual void _ExportContent() {}
virtual void _ExportMasterStyles() {}
@@ -139,14 +139,14 @@ SVGPrinterExport::SVGPrinterExport(
mpOuterElement = ImplCreateSVGElement( rSetup, aOutputSize );
// write description
- SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, TRUE, TRUE );
+ SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, sal_True, sal_True );
NMSP_RTL::OUString aDesc( B2UCONST( "document name: " ) );
GetDocHandler()->characters( aDesc += rJobName );
delete pDescElem;
// write meta attributes
- ImplWriteMetaAttr( TRUE, FALSE );
+ ImplWriteMetaAttr( sal_True, sal_False );
}
// -----------------------------------------------------------------------------
@@ -166,7 +166,7 @@ SvXMLElementExport* SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSet
delete mpVDev;
mpVDev = new VirtualDevice;
- mpVDev->EnableOutput( FALSE );
+ mpVDev->EnableOutput( sal_False );
mpVDev->SetMapMode( MAP_100TH_MM );
maPrinter.SetJobSetup( rSetup );
@@ -184,14 +184,14 @@ SvXMLElementExport* SVGPrinterExport::ImplCreateSVGElement( const JobSetup& rSet
aAttr += SVGActionWriter::GetValueString( rOutputSize.Height(), sal_True );
AddAttribute( XML_NAMESPACE_NONE, aXMLAttrViewBox, aAttr );
- return( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemSVG, TRUE, TRUE ) );
+ return( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemSVG, sal_True, sal_True ) );
}
// -----------------------------------------------------------------------------
void SVGPrinterExport::ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage )
{
- SvXMLElementExport aMetaData( *this, XML_NAMESPACE_NONE, aXMLElemMeta, TRUE, TRUE );
+ SvXMLElementExport aMetaData( *this, XML_NAMESPACE_NONE, aXMLElemMeta, sal_True, sal_True );
NMSP_RTL::OUString aAttr;
aAttr = bOuter ? B2UCONST( "true" ) : B2UCONST( "false" );
@@ -201,7 +201,7 @@ void SVGPrinterExport::ImplWriteMetaAttr( sal_Bool bOuter, sal_Bool bPage )
AddAttribute( XML_NAMESPACE_NONE, aXMLAttrMetaSVGPage, aAttr );
{
- delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemMetaSVG, TRUE, TRUE ) );
+ delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemMetaSVG, sal_True, sal_True ) );
}
}
@@ -214,14 +214,14 @@ void SVGPrinterExport::writePage( const JobSetup& rSetup, const GDIMetaFile& rMt
SvXMLElementExport* pPageElem = ImplCreateSVGElement( rSetup, aOutputSize );
// write description
- SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, TRUE, TRUE );
+ SvXMLElementExport* pDescElem = new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemDesc, sal_True, sal_True );
NMSP_RTL::OUString aDesc( B2UCONST( "page: " ) );
GetDocHandler()->characters( aDesc += NMSP_RTL::OUString::valueOf( (sal_Int32) ++mnPage ) );
delete pDescElem;
// write meta attributes
- ImplWriteMetaAttr( FALSE, TRUE );
+ ImplWriteMetaAttr( sal_False, sal_True );
// write dummy rect element
aAttr = B2UCONST( "0.0" );
@@ -234,8 +234,8 @@ void SVGPrinterExport::writePage( const JobSetup& rSetup, const GDIMetaFile& rMt
aAttr = SVGActionWriter::GetValueString( aOutputSize.Height(), sal_True );
AddAttribute( XML_NAMESPACE_NONE, aXMLAttrHeight, aAttr );
- delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemRect, TRUE, TRUE ) );
- delete( new SVGActionWriter( *this, rMtf, mpVDev, TRUE ) );
+ delete( new SvXMLElementExport( *this, XML_NAMESPACE_NONE, aXMLElemRect, sal_True, sal_True ) );
+ delete( new SVGActionWriter( *this, rMtf, mpVDev, sal_True ) );
delete pPageElem;
}
diff --git a/extensions/source/svg/svgwriter.cxx b/extensions/source/svg/svgwriter.cxx
index 0a2ae22242ff..341891cc9003 100644
--- a/extensions/source/svg/svgwriter.cxx
+++ b/extensions/source/svg/svgwriter.cxx
@@ -45,7 +45,7 @@ private:
protected:
virtual void _ExportMeta() {}
- virtual void _ExportStyles( BOOL /*bUsed*/ ) {}
+ virtual void _ExportStyles( sal_Bool /*bUsed*/ ) {}
virtual void _ExportAutoStyles() {}
virtual void _ExportContent() {}
virtual void _ExportMasterStyles() {}
@@ -107,7 +107,7 @@ void SVGMtfExport::writeMtf( const GDIMetaFile& rMtf )
AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
{
- SvXMLElementExport aSVG( *this, XML_NAMESPACE_NONE, "svg", TRUE, TRUE );
+ SvXMLElementExport aSVG( *this, XML_NAMESPACE_NONE, "svg", sal_True, sal_True );
SVGActionWriter* pWriter = new SVGActionWriter( *this, rMtf );
delete pWriter;
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 3456b58c778e..b0b5f684bcc0 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -123,7 +123,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
virtual void Paint( const Rectangle& rRect );
void Resize();
- void Show( BOOL bVisible = TRUE, USHORT nFlags = SHOW_NOACTIVATE );
+ void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE );
void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; }
void SetTitleAndText( const XubString& rTitle, const XubString& rText,
const Image& rImage );
@@ -151,10 +151,10 @@ class UpdateCheckUI : public ::cppu::WeakImplHelper3
bool mbShowBubble;
bool mbShowMenuIcon;
bool mbBubbleChanged;
- USHORT mnIconID;
+ sal_uInt16 mnIconID;
private:
- DECL_LINK( ClickHdl, USHORT* );
+ DECL_LINK( ClickHdl, sal_uInt16* );
DECL_LINK( HighlightHdl, MenuBar::MenuBarButtonCallbackArg* );
DECL_LINK( WaitTimeOutHdl, Timer* );
DECL_LINK( TimeOutHdl, Timer* );
@@ -416,7 +416,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl )
mpBubbleWin = GetBubbleWindow();
if ( mpBubbleWin )
{
- mpBubbleWin->Show( TRUE );
+ mpBubbleWin->Show( sal_True );
maTimeoutTimer.Start();
}
mbShowBubble = false;
@@ -485,7 +485,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
if ( mbShowBubble )
Application::PostUserEvent( LINK( this, UpdateCheckUI, UserEventHdl ) );
else if ( mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
}
else if( rPropertyName.compareToAscii( PROPERTY_CLICK_HDL ) == 0 ) {
uno::Reference< task::XJob > aJob;
@@ -511,7 +511,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName,
throw beans::UnknownPropertyException();
if ( mbBubbleChanged && mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
}
//------------------------------------------------------------------------------
@@ -642,13 +642,13 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon )
}
// -----------------------------------------------------------------------
-IMPL_LINK( UpdateCheckUI, ClickHdl, USHORT*, EMPTYARG )
+IMPL_LINK( UpdateCheckUI, ClickHdl, sal_uInt16*, EMPTYARG )
{
vos::OGuard aGuard( Application::GetSolarMutex() );
maWaitTimer.Stop();
if ( mpBubbleWin )
- mpBubbleWin->Show( FALSE );
+ mpBubbleWin->Show( sal_False );
if ( mrJob.is() )
{
@@ -734,7 +734,7 @@ IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG )
// -----------------------------------------------------------------------
IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent )
{
- ULONG nEventID = pEvent->GetId();
+ sal_uLong nEventID = pEvent->GetId();
if ( VCLEVENT_OBJECT_DYING == nEventID )
{
@@ -927,11 +927,11 @@ void BubbleWindow::Paint( const Rectangle& )
//------------------------------------------------------------------------------
void BubbleWindow::MouseButtonDown( const MouseEvent& )
{
- Show( FALSE );
+ Show( sal_False );
}
//------------------------------------------------------------------------------
-void BubbleWindow::Show( BOOL bVisible, USHORT nFlags )
+void BubbleWindow::Show( sal_Bool bVisible, sal_uInt16 nFlags )
{
vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -983,7 +983,7 @@ void BubbleWindow::Show( BOOL bVisible, USHORT nFlags )
void BubbleWindow::RecalcTextRects()
{
Size aTotalSize;
- BOOL bFinished = FALSE;
+ sal_Bool bFinished = sal_False;
Font aOldFont = GetFont();
Font aBoldFont = aOldFont;
@@ -1015,7 +1015,7 @@ void BubbleWindow::RecalcTextRects()
maMaxTextSize.Height() = maMaxTextSize.Height() * 3 / 2;
}
else
- bFinished = TRUE;
+ bFinished = sal_True;
}
maTitleRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT );
maTextRect.Move( 2*BUBBLE_BORDER, BUBBLE_BORDER + TIP_HEIGHT + maTitleRect.GetHeight() + aBoldFont.GetHeight() * 3 / 4 );
diff --git a/extensions/source/xmlextract/xmxtrct.cxx b/extensions/source/xmlextract/xmxtrct.cxx
index a50c1816bd02..8ffa0530700d 100644
--- a/extensions/source/xmlextract/xmxtrct.cxx
+++ b/extensions/source/xmlextract/xmxtrct.cxx
@@ -188,7 +188,7 @@ REF( NMSP_IO::XInputStream ) SAL_CALL XMLExtractor::extract( const REF( NMSP_IO:
aCodec.Decompress( *xStream, *pMemStm );
aCodec.EndCompression();
- xRet = new ::utl::OInputStreamHelper( new SvLockBytes( pMemStm, TRUE ), 65535 );
+ xRet = new ::utl::OInputStreamHelper( new SvLockBytes( pMemStm, sal_True ), 65535 );
}
}
}