[ooo-build-commit] .: 3 commits - svl/inc svl/source svtools/inc svtools/source toolkit/inc toolkit/source unotools/source vcl/source vcl/unx
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 4 09:06:04 PDT 2010
svl/inc/svl/cenumitm.hxx | 8 +-
svl/inc/svl/cintitem.hxx | 16 ++---
svl/inc/svl/cntwall.hxx | 4 -
svl/inc/svl/ctypeitm.hxx | 4 -
svl/inc/svl/custritm.hxx | 4 -
svl/inc/svl/dateitem.hxx | 4 -
svl/inc/svl/globalnameitem.hxx | 4 -
svl/inc/svl/ilstitem.hxx | 4 -
svl/inc/svl/imageitm.hxx | 4 -
svl/inc/svl/intitem.hxx | 4 -
svl/inc/svl/lckbitem.hxx | 4 -
svl/inc/svl/poolitem.hxx | 4 -
svl/inc/svl/ptitem.hxx | 4 -
svl/inc/svl/rectitem.hxx | 4 -
svl/inc/svl/slstitm.hxx | 4 -
svl/inc/svl/srchitem.hxx | 4 -
svl/inc/svl/szitem.hxx | 4 -
svl/inc/svl/visitem.hxx | 4 -
svl/source/items/cenumitm.cxx | 8 +-
svl/source/items/cintitem.cxx | 40 ++++++-------
svl/source/items/cntwall.cxx | 8 +-
svl/source/items/ctypeitm.cxx | 4 -
svl/source/items/custritm.cxx | 4 -
svl/source/items/dateitem.cxx | 10 +--
svl/source/items/globalnameitem.cxx | 10 +--
svl/source/items/ilstitem.cxx | 8 +-
svl/source/items/imageitm.cxx | 10 +--
svl/source/items/intitem.cxx | 10 +--
svl/source/items/lckbitem.cxx | 12 ++--
svl/source/items/poolitem.cxx | 8 +-
svl/source/items/ptitem.cxx | 16 ++---
svl/source/items/rectitem.cxx | 12 ++--
svl/source/items/slstitm.cxx | 10 +--
svl/source/items/srchitem.cxx | 10 +--
svl/source/items/szitem.cxx | 10 +--
svl/source/items/visitem.cxx | 10 +--
svtools/inc/svtools/accessibletableprovider.hxx | 2
svtools/inc/svtools/brwbox.hxx | 4 -
svtools/inc/svtools/svtabbx.hxx | 2
svtools/inc/svtools/textview.hxx | 2
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox3.cxx | 2
svtools/source/contnr/imivctl1.cxx | 2
svtools/source/contnr/svimpicn.cxx | 2
svtools/source/contnr/svtabbx.cxx | 2
svtools/source/svhtml/parhtml.cxx | 2
toolkit/inc/toolkit/awt/vclxmenu.hxx | 2
toolkit/inc/toolkit/helper/unowrapper.hxx | 2
toolkit/source/helper/unowrapper.cxx | 2
unotools/source/config/fltrcfg.cxx | 70 ++++++++++++------------
vcl/source/app/unohelp.cxx | 2
vcl/source/window/window.cxx | 24 ++++----
vcl/unx/gtk/a11y/atkwindow.cxx | 4 -
vcl/unx/gtk/app/gtkdata.cxx | 2
vcl/unx/inc/saldisp.hxx | 2
vcl/unx/source/app/keysymnames.cxx | 2
vcl/unx/source/app/saldisp.cxx | 2
57 files changed, 212 insertions(+), 212 deletions(-)
New commits:
commit ed324dd38e2f7574c5b0aa058d0778542c75f7bc
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 4 15:44:00 2010 +0100
harmonized BOOL vs sal_Bool usage
diff --git a/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx
index 17ab339..4b9c0e3 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/svtools/inc/svtools/accessibletableprovider.hxx
@@ -87,7 +87,7 @@ public:
virtual sal_Bool HasRowHeader() const = 0; //GetColumnId
/** @return <TRUE/>, if the object can focus a cell. */
virtual sal_Bool IsCellFocusable() const = 0;
- virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
+ virtual BOOL GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) = 0;
virtual void SetNoSelection() = 0;
virtual void SelectAll() = 0;
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index f8ff110..ec6c444 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -369,7 +369,7 @@ protected:
@param nRow
nRow starts at 0
*/
- virtual BOOL SeekRow( long nRow ) = 0;
+ virtual sal_Bool SeekRow( long nRow ) = 0;
virtual void DrawCursor();
virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect );
virtual void PaintData( Window& rWin, const Rectangle& rRect );
@@ -470,7 +470,7 @@ public:
virtual void EndScroll();
virtual void Select();
virtual void DoubleClick( const BrowserMouseEvent& rEvt );
- virtual BOOL IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const;
+ virtual sal_Bool IsCursorMoveAllowed( long nNewRow, USHORT nNewColId ) const;
virtual void CursorMoved();
virtual void ColumnMoved( USHORT nColId );
virtual void ColumnResized( USHORT nColId );
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 34d158a..5300b51 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -202,7 +202,7 @@ public:
virtual sal_Bool HasRowHeader() const; //GetColumnId
/** @return <TRUE/>, if the object can focus a cell. */
virtual sal_Bool IsCellFocusable() const;
- virtual sal_Bool GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
+ virtual BOOL GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn );
virtual void SetNoSelection();
using SvListView::SelectAll;
diff --git a/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx
index a149702..09bfb47 100644
--- a/svtools/inc/svtools/textview.hxx
+++ b/svtools/inc/svtools/textview.hxx
@@ -76,7 +76,7 @@ protected:
void ImpShowHideSelection( BOOL bShow, const TextSelection* pRange = NULL );
TextSelection ImpMoveCursor( const KeyEvent& rKeyEvent );
- TextPaM ImpDelete( BOOL bForward, BYTE nMode );
+ TextPaM ImpDelete( BYTE nMode, BYTE nDelMode );
void ImpSetSelection( const TextSelection& rNewSel, BOOL bUI );
BOOL IsInSelection( const TextPaM& rPaM );
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 26d25c6..6b243af 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2594,7 +2594,7 @@ void BrowseBox::VisibleRowsChanged( long, USHORT )
//-------------------------------------------------------------------
-BOOL BrowseBox::IsCursorMoveAllowed( long, USHORT ) const
+sal_Bool BrowseBox::IsCursorMoveAllowed( long, USHORT ) const
/* [Beschreibung]
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 631a555..7d56511 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -459,7 +459,7 @@ sal_Bool BrowseBox::IsCellFocusable() const
return sal_True;
}
// -----------------------------------------------------------------------------
-sal_Bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
+BOOL BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
{
return GoToRowColumnId( _nRow, GetColumnId( _nColumn ) );
}
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index b691088..b410d63 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3636,7 +3636,7 @@ void SvxIconChoiceCtrl_Impl::DrawFocusRect ( OutputDevice* pOut )
pOut->DrawPolyLine ( aPolygon, aLineInfo );
}
-sal_Bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const
+BOOL SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, ULONG& rPos ) const
{
sal_Bool bRet = sal_False;
const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper();
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index ae33b3c..c3c0d09 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -3562,7 +3562,7 @@ void ImpIcnCursor::ExpandGrid()
if( pGridMap )
{
long nNewGridRows = nGridRows + 20;
- unsigned char* pTempMap = new unsigned char[ nNewGridRows * nGridCols ];
+ BOOL* pTempMap = new BOOL[ nNewGridRows * nGridCols ];
memcpy( pTempMap, pGridMap, nGridRows * nGridCols );
delete pGridMap;
pGridMap = pTempMap;
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index a63d218..d196c52 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -841,7 +841,7 @@ sal_Bool SvHeaderTabListBox::IsCellFocusable() const
return IsCellFocusEnabled();
}
// -----------------------------------------------------------------------
-sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
+BOOL SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
{
sal_Bool bRet = ( IsCellFocusEnabled() == TRUE );
if ( bRet )
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 4bb7c34..e5cb275 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -181,7 +181,7 @@ INT32 HTMLOption::GetSNumber() const
return aTmp.ToInt32();
}
-void HTMLOption::GetNumbers( SvULongs &rLongs, BOOL bSpaceDelim ) const
+void HTMLOption::GetNumbers( SvULongs &rLongs, sal_Bool bSpaceDelim ) const
{
if( rLongs.Count() )
rLongs.Remove( 0, rLongs.Count() );
diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx
index 9fefbe9..590f7b8 100644
--- a/toolkit/inc/toolkit/awt/vclxmenu.hxx
+++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx
@@ -70,7 +70,7 @@ protected:
DECL_LINK( MenuEventListener, VclSimpleEvent* );
- void ImplCreateMenu( BOOL bPopup );
+ void ImplCreateMenu( sal_Bool bPopup );
public:
VCLXMenu();
diff --git a/toolkit/inc/toolkit/helper/unowrapper.hxx b/toolkit/inc/toolkit/helper/unowrapper.hxx
index 0f41292..8d7adbd 100644
--- a/toolkit/inc/toolkit/helper/unowrapper.hxx
+++ b/toolkit/inc/toolkit/helper/unowrapper.hxx
@@ -60,7 +60,7 @@ public:
virtual void ReleaseAllGraphics( OutputDevice* pOutDev );
// Window
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, BOOL bCreate );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate );
virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xIFace );
void WindowDestroyed( Window* pWindow );
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 827f4f7..6db061a 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -162,7 +162,7 @@ UnoWrapper::~UnoWrapper()
return mxToolkit.get();
}
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, BOOL bCreate )
+::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> UnoWrapper::GetWindowInterface( Window* pWindow, sal_Bool bCreate )
{
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer();
if ( !xPeer.is() && bCreate )
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index ecc69da..0ab43ba 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -190,7 +190,7 @@ uno::Reference < i18n::XCollator > vcl::unohelper::CreateCollator()
return xB;
}
-::rtl::OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, BOOL bSUPD )
+::rtl::OUString vcl::unohelper::CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD )
{
// create variable library name suffixes
OUString aDLLSuffix = OUString::createFromAscii( STRING(DLLPOSTFIX) );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b1049d3..bd7604a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -641,7 +641,7 @@ void Window::ImplInitWindowData( WindowType nType )
mpWindowImpl->mbMenuFloatingWindow= FALSE; // TRUE: MenuFloatingWindow is the base class
mpWindowImpl->mbToolbarFloatingWindow= FALSE; // TRUE: ImplPopupFloatWin is the base class, used for subtoolbars
mpWindowImpl->mbSplitter = FALSE; // TRUE: Splitter is the base class
- mpWindowImpl->mbVisible = FALSE; // TRUE: Show( TRUE ) called
+ mpWindowImpl->mbVisible = FALSE; // TRUE: Show( true ) called
mpWindowImpl->mbOverlapVisible = FALSE; // TRUE: Hide called for visible window from ImplHideAllOverlapWindow()
mpWindowImpl->mbDisabled = FALSE; // TRUE: Enable( FALSE ) called
mpWindowImpl->mbInputDisabled = FALSE; // TRUE: EnableInput( FALSE ) called
@@ -1763,7 +1763,7 @@ BOOL Window::ImplSysObjClip( const Region* pOldRegion )
if ( mpWindowImpl->mpSysObj )
{
- BOOL bVisibleState = mpWindowImpl->mbReallyVisible;
+ bool bVisibleState = mpWindowImpl->mbReallyVisible;
if ( bVisibleState )
{
@@ -3109,7 +3109,7 @@ void Window::ImplUpdateWindowPtr()
void Window::ImplUpdateOverlapWindowPtr( BOOL bNewFrame )
{
BOOL bVisible = IsVisible();
- Show( FALSE );
+ Show( false );
ImplRemoveWindow( bNewFrame );
Window* pRealParent = mpWindowImpl->mpRealParent;
ImplInsertWindow( ImplGetParent() );
@@ -3130,7 +3130,7 @@ void Window::ImplUpdateOverlapWindowPtr( BOOL bNewFrame )
}
if ( bVisible )
- Show( TRUE );
+ Show( true );
}
// -----------------------------------------------------------------------
@@ -3757,7 +3757,7 @@ void Window::ImplShowAllOverlaps()
{
if ( pOverlapWindow->mpWindowImpl->mbOverlapVisible )
{
- pOverlapWindow->Show( TRUE, SHOW_NOACTIVATE );
+ pOverlapWindow->Show( true, SHOW_NOACTIVATE );
pOverlapWindow->mpWindowImpl->mbOverlapVisible = FALSE;
}
@@ -3775,7 +3775,7 @@ void Window::ImplHideAllOverlaps()
if ( pOverlapWindow->IsVisible() )
{
pOverlapWindow->mpWindowImpl->mbOverlapVisible = TRUE;
- pOverlapWindow->Show( FALSE );
+ pOverlapWindow->Show( false );
}
pOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext;
@@ -4785,7 +4785,7 @@ void Window::doLazyDelete()
DockingWindow* pDockWin = dynamic_cast<DockingWindow*>(this);
if( pSysWin || ( pDockWin && pDockWin->IsFloatingMode() ) )
{
- Show( FALSE );
+ Show( false );
SetParent( ImplGetDefaultWindow() );
}
vcl::LazyDeletor<Window>::Delete( this );
@@ -6304,7 +6304,7 @@ void Window::SetParent( Window* pNewParent )
mpWindowImpl->mpFrame->SetParent( pNewParent->mpWindowImpl->mpFrame );
BOOL bVisible = IsVisible();
- Show( FALSE, SHOW_NOFOCUSCHANGE );
+ Show( false, SHOW_NOFOCUSCHANGE );
// Testen, ob sich das Overlap-Window aendert
Window* pOldOverlapWindow;
@@ -6420,7 +6420,7 @@ void Window::SetParent( Window* pNewParent )
ImplGetOwnerDrawList().push_back( this );
if ( bVisible )
- Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
}
// -----------------------------------------------------------------------
@@ -6445,10 +6445,10 @@ void Window::Show( BOOL bVisible, USHORT nFlags )
if ( mpWindowImpl->mpBorderWindow )
{
- BOOL bOldUpdate = mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate;
+ bool bOldUpdate = mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate;
if ( mpWindowImpl->mbNoParentUpdate )
mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate = TRUE;
- mpWindowImpl->mpBorderWindow->Show( FALSE, nFlags );
+ mpWindowImpl->mpBorderWindow->Show( false, nFlags );
mpWindowImpl->mpBorderWindow->mpWindowImpl->mbNoParentUpdate = bOldUpdate;
}
else if ( mpWindowImpl->mbFrame )
@@ -6586,7 +6586,7 @@ void Window::Show( BOOL bVisible, USHORT nFlags )
}
if ( mpWindowImpl->mpBorderWindow )
- mpWindowImpl->mpBorderWindow->Show( TRUE, nFlags );
+ mpWindowImpl->mpBorderWindow->Show( true, nFlags );
else if ( mpWindowImpl->mbFrame )
{
ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index bcc00bc..4c0403f 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -55,9 +55,9 @@ init_from_window( AtkObject *accessible, Window *pWindow )
// by their parents already.
if( aDefaultRole == ATK_ROLE_INVALID )
aDefaultRole = atk_role_register( "redundant object" );
-
+
AtkRole role = aDefaultRole;
-
+
// Determine the appropriate role for the GtkWindow
switch( pWindow->GetAccessibleRole() )
{
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 265e52b..fd08974 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -114,7 +114,7 @@ GdkFilterReturn call_filterGdkEvent( GdkXEvent* sys_event,
void signalKeysChanged( GdkKeymap*, gpointer data )
{
GtkSalDisplay* pDisp = (GtkSalDisplay*)data;
- pDisp->GetKeyboardName(TRUE);
+ pDisp->GetKeyboardName(true);
}
void signalScreenSizeChanged( GdkScreen* pScreen, gpointer data )
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index 4f4185a..a3bd771 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.hxx
@@ -512,7 +512,7 @@ public:
{ mpInputMethod = pInputMethod; }
void SetKbdExtension(SalI18N_KeyboardExtension *pKbdExtension)
{ mpKbdExtension = pKbdExtension; }
- const char* GetKeyboardName( BOOL bRefresh = FALSE );
+ const char* GetKeyboardName( bool bRefresh = false );
::vcl_sal::WMAdaptor* getWMAdaptor() const { return m_pWMAdaptor; }
DtIntegrator* getDtIntegrator() const { return m_pDtIntegrator; }
bool IsXinerama() const { return m_bXinerama; }
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index 2f48378..7a4f984 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.cxx
@@ -597,7 +597,7 @@ static const keyboard_layout type6_layout[] =
#include <stdio.h>
#endif
-const char* SalDisplay::GetKeyboardName( BOOL bRefresh )
+const char* SalDisplay::GetKeyboardName( bool bRefresh )
{
if( bRefresh || ! m_aKeyboardName.Len() )
{
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 4d7fabb..a176367 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -2419,7 +2419,7 @@ long SalX11Display::Dispatch( XEvent *pEvent )
if( MappingModifier == pEvent->xmapping.request )
ModifierMapping();
if( MappingKeyboard == pEvent->xmapping.request ) // refresh mapping
- GetKeyboardName( TRUE );
+ GetKeyboardName( true );
}
break;
case ButtonPress:
commit fb8b06c7ca99cd49112fac02e9db1766688ffb05
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 4 15:36:53 2010 +0100
native bool support in SvXMLUnitConverter
diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index 35f13c0..e42343f 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.cxx
@@ -399,106 +399,106 @@ void SvtFilterOptions::Load()
}
// -----------------------------------------------------------------------
-void SvtFilterOptions::SetLoadWordBasicCode( BOOL bFlag )
+void SvtFilterOptions::SetLoadWordBasicCode( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WORD_CODE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadWordBasicCode() const
+sal_Bool SvtFilterOptions::IsLoadWordBasicCode() const
{
return pImp->IsFlag( FILTERCFG_WORD_CODE );
}
-void SvtFilterOptions::SetLoadWordBasicStorage( BOOL bFlag )
+void SvtFilterOptions::SetLoadWordBasicStorage( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WORD_STORAGE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadWordBasicStorage() const
+sal_Bool SvtFilterOptions::IsLoadWordBasicStorage() const
{
return pImp->IsFlag( FILTERCFG_WORD_STORAGE );
}
// -----------------------------------------------------------------------
-void SvtFilterOptions::SetLoadExcelBasicCode( BOOL bFlag )
+void SvtFilterOptions::SetLoadExcelBasicCode( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_EXCEL_CODE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadExcelBasicCode() const
+sal_Bool SvtFilterOptions::IsLoadExcelBasicCode() const
{
return pImp->IsFlag( FILTERCFG_EXCEL_CODE );
}
-void SvtFilterOptions::SetLoadExcelBasicExecutable( BOOL bFlag )
+void SvtFilterOptions::SetLoadExcelBasicExecutable( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_EXCEL_EXECTBL, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadExcelBasicExecutable() const
+sal_Bool SvtFilterOptions::IsLoadExcelBasicExecutable() const
{
return pImp->IsFlag( FILTERCFG_EXCEL_EXECTBL );
}
-void SvtFilterOptions::SetLoadExcelBasicStorage( BOOL bFlag )
+void SvtFilterOptions::SetLoadExcelBasicStorage( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_EXCEL_STORAGE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadExcelBasicStorage() const
+sal_Bool SvtFilterOptions::IsLoadExcelBasicStorage() const
{
return pImp->IsFlag( FILTERCFG_EXCEL_STORAGE );
}
// -----------------------------------------------------------------------
-void SvtFilterOptions::SetLoadPPointBasicCode( BOOL bFlag )
+void SvtFilterOptions::SetLoadPPointBasicCode( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_PPOINT_CODE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadPPointBasicCode() const
+sal_Bool SvtFilterOptions::IsLoadPPointBasicCode() const
{
return pImp->IsFlag( FILTERCFG_PPOINT_CODE );
}
-void SvtFilterOptions::SetLoadPPointBasicStorage( BOOL bFlag )
+void SvtFilterOptions::SetLoadPPointBasicStorage( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_PPOINT_STORAGE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsLoadPPointBasicStorage() const
+sal_Bool SvtFilterOptions::IsLoadPPointBasicStorage() const
{
return pImp->IsFlag( FILTERCFG_PPOINT_STORAGE );
}
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsMathType2Math() const
+sal_Bool SvtFilterOptions::IsMathType2Math() const
{
return pImp->IsFlag( FILTERCFG_MATH_LOAD );
}
-void SvtFilterOptions::SetMathType2Math( BOOL bFlag )
+void SvtFilterOptions::SetMathType2Math( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_MATH_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsMath2MathType() const
+sal_Bool SvtFilterOptions::IsMath2MathType() const
{
return pImp->IsFlag( FILTERCFG_MATH_SAVE );
}
-void SvtFilterOptions::SetMath2MathType( BOOL bFlag )
+void SvtFilterOptions::SetMath2MathType( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_MATH_SAVE, bFlag );
SetModified();
@@ -506,57 +506,57 @@ void SvtFilterOptions::SetMath2MathType( BOOL bFlag )
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsWinWord2Writer() const
+sal_Bool SvtFilterOptions::IsWinWord2Writer() const
{
return pImp->IsFlag( FILTERCFG_WRITER_LOAD );
}
-void SvtFilterOptions::SetWinWord2Writer( BOOL bFlag )
+void SvtFilterOptions::SetWinWord2Writer( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WRITER_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsWriter2WinWord() const
+sal_Bool SvtFilterOptions::IsWriter2WinWord() const
{
return pImp->IsFlag( FILTERCFG_WRITER_SAVE );
}
-void SvtFilterOptions::SetWriter2WinWord( BOOL bFlag )
+void SvtFilterOptions::SetWriter2WinWord( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_WRITER_SAVE, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsUseEnhancedFields() const
+sal_Bool SvtFilterOptions::IsUseEnhancedFields() const
{
return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS );
}
-void SvtFilterOptions::SetUseEnhancedFields( BOOL bFlag )
+void SvtFilterOptions::SetUseEnhancedFields( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_USE_ENHANCED_FIELDS, bFlag );
SetModified();
}
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsExcel2Calc() const
+sal_Bool SvtFilterOptions::IsExcel2Calc() const
{
return pImp->IsFlag( FILTERCFG_CALC_LOAD );
}
-void SvtFilterOptions::SetExcel2Calc( BOOL bFlag )
+void SvtFilterOptions::SetExcel2Calc( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_CALC_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsCalc2Excel() const
+sal_Bool SvtFilterOptions::IsCalc2Excel() const
{
return pImp->IsFlag( FILTERCFG_CALC_SAVE );
}
-void SvtFilterOptions::SetCalc2Excel( BOOL bFlag )
+void SvtFilterOptions::SetCalc2Excel( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_CALC_SAVE, bFlag );
SetModified();
@@ -564,23 +564,23 @@ void SvtFilterOptions::SetCalc2Excel( BOOL bFlag )
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsPowerPoint2Impress() const
+sal_Bool SvtFilterOptions::IsPowerPoint2Impress() const
{
return pImp->IsFlag( FILTERCFG_IMPRESS_LOAD );
}
-void SvtFilterOptions::SetPowerPoint2Impress( BOOL bFlag )
+void SvtFilterOptions::SetPowerPoint2Impress( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_IMPRESS_LOAD, bFlag );
SetModified();
}
-BOOL SvtFilterOptions::IsImpress2PowerPoint() const
+sal_Bool SvtFilterOptions::IsImpress2PowerPoint() const
{
return pImp->IsFlag( FILTERCFG_IMPRESS_SAVE );
}
-void SvtFilterOptions::SetImpress2PowerPoint( BOOL bFlag )
+void SvtFilterOptions::SetImpress2PowerPoint( sal_Bool bFlag )
{
pImp->SetFlag( FILTERCFG_IMPRESS_SAVE, bFlag );
SetModified();
@@ -595,19 +595,19 @@ SvtFilterOptions* SvtFilterOptions::Get()
// -----------------------------------------------------------------------
-BOOL SvtFilterOptions::IsEnablePPTPreview() const
+sal_Bool SvtFilterOptions::IsEnablePPTPreview() const
{
return pImp->IsFlag( FILTERCFG_ENABLE_PPT_PREVIEW );
}
-BOOL SvtFilterOptions::IsEnableCalcPreview() const
+sal_Bool SvtFilterOptions::IsEnableCalcPreview() const
{
return pImp->IsFlag( FILTERCFG_ENABLE_EXCEL_PREVIEW );
}
-BOOL SvtFilterOptions::IsEnableWordPreview() const
+sal_Bool SvtFilterOptions::IsEnableWordPreview() const
{
return pImp->IsFlag( FILTERCFG_ENABLE_WORD_PREVIEW );
}
commit 652b14d1c554ca0f5ea930ac0fd6d78f5bbe50c1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Oct 4 15:23:50 2010 +0100
Convert all Query/Put Value() to bool
diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 93be5cc..43121e6 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.hxx
@@ -54,9 +54,9 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
+ virtual bool QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
- virtual BOOL PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
+ virtual bool PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
virtual USHORT GetValueCount() const = 0;
@@ -154,9 +154,9 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const;
+ virtual bool QueryValue(com::sun::star::uno::Any& rVal, BYTE = 0) const;
- virtual BOOL PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0);
+ virtual bool PutValue(const com::sun::star::uno::Any& rVal, BYTE = 0);
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index d343986..a9e2fe8 100644
--- a/svl/inc/svl/cintitem.hxx
+++ b/svl/inc/svl/cintitem.hxx
@@ -64,10 +64,10 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0) const;
- virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0);
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
@@ -126,10 +126,10 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0) const;
- virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0);
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
@@ -188,10 +188,10 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0) const;
- virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0);
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
@@ -250,10 +250,10 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0) const;
- virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0);
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index b81fa57..11c1cdd 100644
--- a/svl/inc/svl/cntwall.hxx
+++ b/svl/inc/svl/cntwall.hxx
@@ -60,9 +60,9 @@ public:
virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
void SetBitmapURL( const UniString& rURL ) { _aURL = rURL; }
diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index 2532395..5260e99 100644
--- a/svl/inc/svl/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
@@ -68,9 +68,9 @@ public:
XubString &rText,
const IntlWrapper* pIntlWrapper = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0);
INetContentType GetEnumValue() const;
diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx
index 85d5bbc..1306252 100644
--- a/svl/inc/svl/custritm.hxx
+++ b/svl/inc/svl/custritm.hxx
@@ -68,10 +68,10 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue(com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue(com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0) const;
- virtual BOOL PutValue(const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue(const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0);
virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index 8efd044..6db2bbd 100644
--- a/svl/inc/svl/dateitem.hxx
+++ b/svl/inc/svl/dateitem.hxx
@@ -74,9 +74,9 @@ public:
"SetDateTime() with pooled item" );
aDateTime = rDT; }
- virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
};
diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
index 4c60641..3ced83c 100644
--- a/svl/inc/svl/globalnameitem.hxx
+++ b/svl/inc/svl/globalnameitem.hxx
@@ -49,9 +49,9 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
SvGlobalName GetValue() const { return m_aName; }
- virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
};
diff --git a/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx
index fab4a8d..a377e1a 100644
--- a/svl/inc/svl/ilstitem.hxx
+++ b/svl/inc/svl/ilstitem.hxx
@@ -55,8 +55,8 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue ( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
};
#endif // _SFXINTITEM_HXX
diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index 7d5a841..45d8bd4 100644
--- a/svl/inc/svl/imageitm.hxx
+++ b/svl/inc/svl/imageitm.hxx
@@ -46,8 +46,8 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
void SetRotation( long nValue );
long GetRotation() const;
diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
index e6f1312..c7adf5d 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/svl/inc/svl/intitem.hxx
@@ -82,10 +82,10 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
diff --git a/svl/inc/svl/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx
index d2246cb..0749fb1 100644
--- a/svl/inc/svl/lckbitem.hxx
+++ b/svl/inc/svl/lckbitem.hxx
@@ -55,9 +55,9 @@ public:
SvLockBytes* GetValue() const { return _xVal; }
- virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
};
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index e371bc5..7c22509 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -231,8 +231,8 @@ public:
virtual int ScaleMetrics( long lMult, long lDiv );
virtual int HasMetrics() const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual SfxPoolItem* Create( SvStream &, USHORT nItemVersion ) const;
virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const;
diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index 61f99f3..a36ab89 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/svl/inc/svl/ptitem.hxx
@@ -68,9 +68,9 @@ public:
aVal = rNewVal;
}
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
};
diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index d2e15f3..fb1abc6 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/svl/inc/svl/rectitem.hxx
@@ -67,9 +67,9 @@ public:
DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
aVal = rNewVal;
}
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
};
diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index ac42e15..58cbf38 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.hxx
@@ -76,9 +76,9 @@ public:
virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const;
void Sort( BOOL bAscending = TRUE, List* pParallelList = 0 );
- virtual BOOL PutValue ( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue ( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
};
#endif
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
index d8caf48..1fb3a21 100644
--- a/svl/inc/svl/srchitem.hxx
+++ b/svl/inc/svl/srchitem.hxx
@@ -90,8 +90,8 @@ public:
SvxSearchItem( const SvxSearchItem& rItem );
virtual ~SvxSearchItem();
- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
virtual int operator == ( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx
index e20ef1e..672abd5 100644
--- a/svl/inc/svl/szitem.hxx
+++ b/svl/inc/svl/szitem.hxx
@@ -58,9 +58,9 @@ public:
const IntlWrapper * = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
index f4e1c8a..d1b1894 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/svl/inc/svl/visitem.hxx
@@ -69,10 +69,10 @@ public:
const IntlWrapper * = 0)
const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId = 0 );
virtual SfxPoolItem * Create(SvStream & rStream, USHORT) const;
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index a3d1090..072f083 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -70,7 +70,7 @@ SfxEnumItemInterface::GetPresentation(SfxItemPresentation, SfxMapUnit,
//============================================================================
// virtual
-BOOL SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
+bool SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
const
{
rVal <<= sal_Int32(GetEnumValue());
@@ -79,7 +79,7 @@ BOOL SfxEnumItemInterface::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
//============================================================================
// virtual
-BOOL SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
+bool SfxEnumItemInterface::PutValue(const com::sun::star::uno::Any& rVal,
BYTE)
{
sal_Int32 nTheValue = 0;
@@ -233,7 +233,7 @@ SfxItemPresentation CntBoolItem::GetPresentation(SfxItemPresentation,
//============================================================================
// virtual
-BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
+bool CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
{
rVal <<= sal_Bool(m_bValue);
return true;
@@ -241,7 +241,7 @@ BOOL CntBoolItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
//============================================================================
// virtual
-BOOL CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE)
+bool CntBoolItem::PutValue(const com::sun::star::uno::Any& rVal, BYTE)
{
sal_Bool bTheValue = sal_Bool();
if (rVal >>= bTheValue)
diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index ad78496..1f9be90 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -87,26 +87,26 @@ SfxItemPresentation CntByteItem::GetPresentation(SfxItemPresentation,
//============================================================================
// virtual
-BOOL CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
+bool CntByteItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
{
sal_Int8 nValue = m_nValue;
rVal <<= nValue;
- return TRUE;
+ return true;
}
//============================================================================
// virtual
-BOOL CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
+bool CntByteItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
{
sal_Int8 nValue = sal_Int8();
if (rVal >>= nValue)
{
m_nValue = nValue;
- return TRUE;
+ return true;
}
DBG_ERROR( "CntByteItem::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//============================================================================
@@ -222,27 +222,27 @@ SfxItemPresentation CntUInt16Item::GetPresentation(SfxItemPresentation,
//============================================================================
// virtual
-BOOL CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
+bool CntUInt16Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
{
sal_Int32 nValue = m_nValue;
rVal <<= nValue;
- return TRUE;
+ return true;
}
//============================================================================
// virtual
-BOOL CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
+bool CntUInt16Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
{
sal_Int32 nValue = 0;
if (rVal >>= nValue)
{
DBG_ASSERT( nValue <= USHRT_MAX, "Overflow in UInt16 value!");
m_nValue = (sal_uInt16)nValue;
- return TRUE;
+ return true;
}
DBG_ERROR( "CntUInt16Item::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//============================================================================
@@ -354,26 +354,26 @@ SfxItemPresentation CntInt32Item::GetPresentation(SfxItemPresentation,
//============================================================================
// virtual
-BOOL CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
+bool CntInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
{
sal_Int32 nValue = m_nValue;
rVal <<= nValue;
- return TRUE;
+ return true;
}
//============================================================================
// virtual
-BOOL CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
+bool CntInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
{
sal_Int32 nValue = 0;
if (rVal >>= nValue)
{
m_nValue = nValue;
- return TRUE;
+ return true;
}
DBG_ERROR( "CntInt32Item::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//============================================================================
@@ -487,28 +487,28 @@ SfxItemPresentation CntUInt32Item::GetPresentation(SfxItemPresentation,
//============================================================================
// virtual
-BOOL CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
+bool CntUInt32Item::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
{
sal_Int32 nValue = m_nValue;
DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!");
rVal <<= nValue;
- return TRUE;
+ return true;
}
//============================================================================
// virtual
-BOOL CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
+bool CntUInt32Item::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
{
sal_Int32 nValue = 0;
if (rVal >>= nValue)
{
DBG_ASSERT( nValue>=0, "Overflow in UInt32 value!");
m_nValue = nValue;
- return TRUE;
+ return true;
}
DBG_ERROR( "CntUInt32Item::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//============================================================================
diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 4031ed8..7370837 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.cxx
@@ -150,18 +150,18 @@ SfxPoolItem* CntWallpaperItem::Clone( SfxItemPool* ) const
//----------------------------------------------------------------------------
// virtual
-BOOL CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
+bool CntWallpaperItem::QueryValue( com::sun::star::uno::Any&,BYTE ) const
{
DBG_ERROR("Not implemented!");
- return FALSE;
+ return false;
}
//----------------------------------------------------------------------------
// virtual
-BOOL CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE )
+bool CntWallpaperItem::PutValue( const com::sun::star::uno::Any&,BYTE )
{
DBG_ERROR("Not implemented!");
- return FALSE;
+ return false;
}
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index d76357b..654c20a 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -223,7 +223,7 @@ void CntContentTypeItem::SetValue( const INetContentType eType )
//----------------------------------------------------------------------------
// virtual
-BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
+bool CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
{
rVal <<= rtl::OUString(GetValue());
return true;
@@ -231,7 +231,7 @@ BOOL CntContentTypeItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
//----------------------------------------------------------------------------
// virtual
-BOOL CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
+bool CntContentTypeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
{
rtl::OUString aValue;
if ( rVal >>= aValue )
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 580b674..7cb407f 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.cxx
@@ -106,7 +106,7 @@ CntUnencodedStringItem::GetPresentation(SfxItemPresentation, SfxMapUnit,
//============================================================================
// virtual
-BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
+bool CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
const
{
rVal <<= rtl::OUString(m_aValue);
@@ -115,7 +115,7 @@ BOOL CntUnencodedStringItem::QueryValue(com::sun::star::uno::Any& rVal, BYTE)
//============================================================================
// virtual
-BOOL CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
+bool CntUnencodedStringItem::PutValue(const com::sun::star::uno::Any& rVal,
BYTE)
{
rtl::OUString aTheValue;
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index 08436fc..ef7733d 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.cxx
@@ -174,7 +174,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
//----------------------------------------------------------------------------
// virtual
-BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
+bool SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
@@ -188,16 +188,16 @@ BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
aValue.Minutes,
aValue.Seconds,
aValue.HundredthSeconds ) );
- return TRUE;
+ return true;
}
DBG_ERROR( "SfxDateTimeItem::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//----------------------------------------------------------------------------
// virtual
-BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
+bool SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -209,7 +209,7 @@ BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
aDateTime.GetMonth(),
aDateTime.GetYear() );
rVal <<= aValue;
- return TRUE;
+ return true;
}
// -----------------------------------------------------------------------
diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 06eee5c..4bd7dc6 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.cxx
@@ -80,7 +80,7 @@ SfxPoolItem* SfxGlobalNameItem::Clone(SfxItemPool *) const
//----------------------------------------------------------------------------
// virtual
-BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
{
com::sun::star::uno::Reference < com::sun::star::script::XTypeConverter > xConverter
( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
@@ -94,21 +94,21 @@ BOOL SfxGlobalNameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
if ( aSeq.getLength() == 16 )
{
m_aName.MakeFromMemory( (void*) aSeq.getConstArray() );
- return TRUE;
+ return true;
}
DBG_ERROR( "SfxGlobalNameItem::PutValue - Wrong type!" );
- return FALSE;
+ return true;
}
//----------------------------------------------------------------------------
// virtual
-BOOL SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+bool SfxGlobalNameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
{
com::sun::star::uno::Sequence< sal_Int8 > aSeq( 16 );
void* pData = ( void* ) &m_aName.GetCLSID();
memcpy( aSeq.getArray(), pData, 16 );
rVal <<= aSeq;
- return TRUE;
+ return true;
}
diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 6396d2f..802324e 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.cxx
@@ -75,7 +75,7 @@ SfxPoolItem* SfxIntegerListItem::Clone( SfxItemPool * ) const
return new SfxIntegerListItem( *this );
}
-BOOL SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, BYTE )
+bool SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, BYTE )
{
::com::sun::star::uno::Reference < ::com::sun::star::script::XTypeConverter > xConverter
( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.script.Converter")),
@@ -84,16 +84,16 @@ BOOL SfxIntegerListItem::PutValue ( const com::sun::star::uno::Any& rVal, BYTE
try { aNew = xConverter->convertTo( rVal, ::getCppuType((const ::com::sun::star::uno::Sequence < sal_Int32 >*)0) ); }
catch (::com::sun::star::uno::Exception&)
{
- return FALSE;
+ return true;
}
return ( aNew >>= m_aList );
}
-BOOL SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+bool SfxIntegerListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
{
rVal <<= m_aList;
- return TRUE;
+ return true;
}
void SfxIntegerListItem::GetList( SvULongs& rList ) const
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 6cca552..ec3ca31 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -87,7 +87,7 @@ int SfxImageItem::operator==( const SfxPoolItem& rItem ) const
return( ((SfxImageItem&) rItem).GetValue() == GetValue() && (*pImp == *(((SfxImageItem&)rItem).pImp) ) );
}
-BOOL SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
+bool SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
{
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq( 4 );
aSeq[0] = ::com::sun::star::uno::makeAny( GetValue() );
@@ -96,10 +96,10 @@ BOOL SfxImageItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
aSeq[3] = ::com::sun::star::uno::makeAny( rtl::OUString( pImp->aURL ));
rVal = ::com::sun::star::uno::makeAny( aSeq );
- return TRUE;
+ return true;
}
-BOOL SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
{
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSeq;
if (( rVal >>= aSeq ) && ( aSeq.getLength() == 4 ))
@@ -112,10 +112,10 @@ BOOL SfxImageItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
aSeq[2] >>= pImp->bMirrored;
if ( aSeq[3] >>= aURL )
pImp->aURL = aURL;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void SfxImageItem::SetRotation( long nValue )
diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index a1c107a..93d4c1a 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.cxx
@@ -111,26 +111,26 @@ SfxItemPresentation SfxInt16Item::GetPresentation(SfxItemPresentation,
//============================================================================
// virtual
-BOOL SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
+bool SfxInt16Item::QueryValue(com::sun::star::uno::Any& rVal, BYTE) const
{
sal_Int16 nValue = m_nValue;
rVal <<= nValue;
- return TRUE;
+ return true;
}
//============================================================================
// virtual
-BOOL SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE )
+bool SfxInt16Item::PutValue(const com::sun::star::uno::Any& rVal, BYTE )
{
sal_Int16 nValue = sal_Int16();
if (rVal >>= nValue)
{
m_nValue = nValue;
- return TRUE;
+ return true;
}
DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//============================================================================
diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 5bfddc6..394d961 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.cxx
@@ -137,7 +137,7 @@ SvStream& SfxLockBytesItem::Store(SvStream &rStream, USHORT ) const
//----------------------------------------------------------------------------
// virtual
-BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
{
com::sun::star::uno::Sequence< sal_Int8 > aSeq;
if ( rVal >>= aSeq )
@@ -153,16 +153,16 @@ BOOL SfxLockBytesItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
else
_xVal = NULL;
- return TRUE;
+ return true;
}
DBG_ERROR( "SfxLockBytesItem::PutValue - Wrong type!" );
- return FALSE;
+ return true;
}
//----------------------------------------------------------------------------
// virtual
-BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
+bool SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
{
if ( _xVal.Is() )
{
@@ -172,7 +172,7 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
if ( _xVal->Stat( &aStat, SVSTATFLAG_DEFAULT ) == ERRCODE_NONE )
nLen = aStat.nSize;
else
- return FALSE;
+ return false;
ULONG nRead = 0;
com::sun::star::uno::Sequence< sal_Int8 > aSeq( nLen );
@@ -186,6 +186,6 @@ BOOL SfxLockBytesItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
rVal <<= aSeq;
}
- return TRUE;
+ return true;
}
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index c8d7962..12828ac 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -504,18 +504,18 @@ void SfxPoolItem::Store(SvStream &rStream) const
// -----------------------------------------------------------------------
-BOOL SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
+bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
{
DBG_ERROR("There is no implementation for QueryValue for this item!");
- return FALSE;
+ return false;
}
// -----------------------------------------------------------------------
-BOOL SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE )
+bool SfxPoolItem::PutValue( const com::sun::star::uno::Any&, BYTE )
{
DBG_ERROR("There is no implementation for PutValue for this item!");
- return FALSE;
+ return false;
}
SfxVoidItem::~SfxVoidItem()
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 93f7e17..a3263f5 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -139,7 +139,7 @@ SvStream& SfxPointItem::Store(SvStream &rStream, USHORT ) const
// -----------------------------------------------------------------------
-BOOL SfxPointItem::QueryValue( uno::Any& rVal,
+bool SfxPointItem::QueryValue( uno::Any& rVal,
BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -155,33 +155,33 @@ BOOL SfxPointItem::QueryValue( uno::Any& rVal,
case 0: rVal <<= aTmp; break;
case MID_X: rVal <<= aTmp.X; break;
case MID_Y: rVal <<= aTmp.Y; break;
- default: DBG_ERROR("Wrong MemberId!"); return FALSE;
+ default: DBG_ERROR("Wrong MemberId!"); return true;
}
- return TRUE;
+ return true;
}
// -----------------------------------------------------------------------
-BOOL SfxPointItem::PutValue( const uno::Any& rVal,
+bool SfxPointItem::PutValue( const uno::Any& rVal,
BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
- BOOL bRet = FALSE;
+ bool bRet = FALSE;
awt::Point aValue;
sal_Int32 nVal = 0;
if ( !nMemberId )
- {
+ {
bRet = ( rVal >>= aValue );
if( bConvert )
{
aValue.X = MM100_TO_TWIP(aValue.X);
aValue.Y = MM100_TO_TWIP(aValue.Y);
- }
+ }
}
else
- {
+ {
bRet = ( rVal >>= nVal );
if( bConvert )
nVal = MM100_TO_TWIP( nVal );
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 146caa1..430a99a 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.cxx
@@ -139,7 +139,7 @@ SvStream& SfxRectangleItem::Store(SvStream &rStream, USHORT ) const
// -----------------------------------------------------------------------
-BOOL SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
+bool SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -157,17 +157,17 @@ BOOL SfxRectangleItem::QueryValue( com::sun::star::uno::Any& rVal,
case MID_RECT_RIGHT: rVal <<= aVal.getY(); break;
case MID_WIDTH: rVal <<= aVal.getWidth(); break;
case MID_HEIGHT: rVal <<= aVal.getHeight(); break;
- default: DBG_ERROR("Wrong MemberID!"); return FALSE;
+ default: DBG_ERROR("Wrong MemberID!"); return false;
}
- return TRUE;
+ return true;
}
// -----------------------------------------------------------------------
-BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
+bool SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId )
{
- BOOL bRet = FALSE;
+ bool bRet = false;
nMemberId &= ~CONVERT_TWIPS;
com::sun::star::awt::Rectangle aValue;
sal_Int32 nVal = 0;
@@ -190,7 +190,7 @@ BOOL SfxRectangleItem::PutValue( const com::sun::star::uno::Any& rVal,
case MID_RECT_RIGHT: aVal.setY( nVal ); break;
case MID_WIDTH: aVal.setWidth( nVal ); break;
case MID_HEIGHT: aVal.setHeight( nVal ); break;
- default: DBG_ERROR("Wrong MemberID!"); return FALSE;
+ default: DBG_ERROR("Wrong MemberID!"); return false;
}
}
diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index eb1d22f..66c5af9 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.cxx
@@ -393,22 +393,22 @@ void SfxStringListItem::GetStringList( com::sun::star::uno::Sequence< rtl::OUStr
//----------------------------------------------------------------------------
// virtual
-BOOL SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
+bool SfxStringListItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
{
com::sun::star::uno::Sequence< rtl::OUString > aValue;
if ( rVal >>= aValue )
{
SetStringList( aValue );
- return TRUE;
+ return true;
}
DBG_ERROR( "SfxStringListItem::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//----------------------------------------------------------------------------
// virtual
-BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
+bool SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
{
// GetString() is not const!!!
SfxStringListItem* pThis = const_cast< SfxStringListItem * >( this );
@@ -416,7 +416,7 @@ BOOL SfxStringListItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
com::sun::star::uno::Sequence< rtl::OUString > aStringList;
pThis->GetStringList( aStringList );
rVal = ::com::sun::star::uno::makeAny( aStringList );
- return TRUE;
+ return true;
}
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 4b0d1d9..f08d0e9 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -429,7 +429,7 @@ void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags )
aSearchOpt.transliterateFlags = nFlags;
}
-sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -513,18 +513,18 @@ sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
default:
DBG_ERRORFILE( "SvxSearchItem::QueryValue(): Unknown MemberId" );
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
-sal_Bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_Int32 nInt = 0;
switch ( nMemberId )
{
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index 775b604..d00307d 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.cxx
@@ -135,7 +135,7 @@ SvStream& SfxSizeItem::Store(SvStream &rStream, USHORT ) const
}
// -----------------------------------------------------------------------
-BOOL SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
+bool SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
BYTE nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -159,20 +159,20 @@ BOOL SfxSizeItem::QueryValue( com::sun::star::uno::Any& rVal,
rVal <<= aTmp.getWidth(); break;
case MID_HEIGHT:
rVal <<= aTmp.getHeight(); break;
- default: DBG_ERROR("Wrong MemberId!"); return FALSE;
+ default: DBG_ERROR("Wrong MemberId!"); return false;
}
- return TRUE;
+ return true;
}
// -----------------------------------------------------------------------
-BOOL SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal,
+bool SfxSizeItem::PutValue( const com::sun::star::uno::Any& rVal,
BYTE nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
- BOOL bRet = FALSE;
+ bool bRet = false;
com::sun::star::awt::Size aValue;
sal_Int32 nVal = 0;
if ( !nMemberId )
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 1ff01a3..487f222 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -85,21 +85,21 @@ SfxItemPresentation SfxVisibilityItem::GetPresentation(SfxItemPresentation,
//============================================================================
// virtual
-BOOL SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
+bool SfxVisibilityItem::QueryValue(com::sun::star::uno::Any& rVal,BYTE) const
{
rVal <<= m_nValue;
- return TRUE;
+ return true;
}
//============================================================================
// virtual
-BOOL SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
+bool SfxVisibilityItem::PutValue(const com::sun::star::uno::Any& rVal,BYTE)
{
if (rVal >>= m_nValue)
- return TRUE;
+ return true;
DBG_ERROR( "SfxInt16Item::PutValue - Wrong type!" );
- return FALSE;
+ return false;
}
//============================================================================
More information about the ooo-build-commit
mailing list