Skip to content

C
core
Kaydet (Commit) b41badb8 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

svtools: sal_Bool->bool 

Change-Id: I37352e90a5304e75ce0c8ae922a167b1e70625e8
üst f7074d8d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 45 deletions
dbaccess/qa/unit/firebird.cxx
Dosyayı görüntüle @ b41badb8
...@@ -41,7 +41,7 @@ void FirebirdTest::setUp() ...@@ -41,7 +41,7 @@ void FirebirdTest::setUp()
{ {
DBTestBase::setUp(); DBTestBase::setUp();
SvtMiscOptions aMiscOptions; SvtMiscOptions aMiscOptions;
aMiscOptions.SetExperimentalMode(sal_True); aMiscOptions.SetExperimentalMode(true);
} }
/** /**
......
desktop/source/app/app.cxx
Dosyayı görüntüle @ b41badb8
...@@ -1565,7 +1565,7 @@ int Desktop::Main() ...@@ -1565,7 +1565,7 @@ int Desktop::Main()
// which does only work for VCL dialogs!! // which does only work for VCL dialogs!!
SvtMiscOptions aMiscOptions; SvtMiscOptions aMiscOptions;
pExecGlobals->bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog(); pExecGlobals->bUseSystemFileDialog = aMiscOptions.UseSystemFileDialog();
aMiscOptions.SetUseSystemFileDialog( sal_False ); aMiscOptions.SetUseSystemFileDialog( false );
} }
pExecGlobals->bRestartRequested = xRestartManager->isRestartRequested( pExecGlobals->bRestartRequested = xRestartManager->isRestartRequested(
......
include/svtools/localresaccess.hxx
Dosyayı görüntüle @ b41badb8
...@@ -60,7 +60,7 @@ namespace svt ...@@ -60,7 +60,7 @@ namespace svt
FreeResource(); FreeResource();
} }
inline sal_Bool IsAvailableRes( const ResId& _rId ) const inline bool IsAvailableRes( const ResId& _rId ) const
{ {
return Resource::IsAvailableRes( _rId ); return Resource::IsAvailableRes( _rId );
} }
......
include/svtools/menuoptions.hxx
Dosyayı görüntüle @ b41badb8
...@@ -87,7 +87,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options ...@@ -87,7 +87,7 @@ class SVT_DLLPUBLIC SAL_WARN_UNUSED SvtMenuOptions: public utl::detail::Options
@seealso configuration package "org.openoffice.Office.Common/View/Menu" @seealso configuration package "org.openoffice.Office.Common/View/Menu"
*//*-*****************************************************************************************************/ *//*-*****************************************************************************************************/
sal_Bool IsEntryHidingEnabled() const; bool IsEntryHidingEnabled() const;
TriState GetMenuIconsState() const; TriState GetMenuIconsState() const;
void SetMenuIconsState(TriState eState); void SetMenuIconsState(TriState eState);
......
include/svtools/miscopt.hxx
Dosyayı görüntüle @ b41badb8
...@@ -70,16 +70,16 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options ...@@ -70,16 +70,16 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
SvtMiscOptions(); SvtMiscOptions();
virtual ~SvtMiscOptions(); virtual ~SvtMiscOptions();
void AddListenerLink( const Link& rLink ); void AddListenerLink( const Link& rLink );
void RemoveListenerLink( const Link& rLink ); void RemoveListenerLink( const Link& rLink );
sal_Bool UseSystemFileDialog() const; bool UseSystemFileDialog() const;
void SetUseSystemFileDialog( sal_Bool bSet ); void SetUseSystemFileDialog( bool bSet );
sal_Bool IsUseSystemFileDialogReadOnly() const; bool IsUseSystemFileDialogReadOnly() const;
sal_Bool DisableUICustomization() const; bool DisableUICustomization() const;
sal_Bool IsPluginsEnabled() const; bool IsPluginsEnabled() const;
sal_Int16 GetSymbolsSize() const; sal_Int16 GetSymbolsSize() const;
void SetSymbolsSize( sal_Int16 eSet ); void SetSymbolsSize( sal_Int16 eSet );
...@@ -94,24 +94,24 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options ...@@ -94,24 +94,24 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
sal_Int16 GetToolboxStyle() const; sal_Int16 GetToolboxStyle() const;
void SetToolboxStyle( sal_Int16 nStyle ); void SetToolboxStyle( sal_Int16 nStyle );
sal_Bool IsModifyByPrinting() const; bool IsModifyByPrinting() const;
void SetModifyByPrinting(sal_Bool bSet ); void SetModifyByPrinting(bool bSet );
sal_Bool UseSystemPrintDialog() const; bool UseSystemPrintDialog() const;
void SetUseSystemPrintDialog( sal_Bool bSet ); void SetUseSystemPrintDialog( bool bSet );
sal_Bool ShowLinkWarningDialog() const; bool ShowLinkWarningDialog() const;
void SetShowLinkWarningDialog( sal_Bool bSet ); void SetShowLinkWarningDialog( bool bSet );
sal_Bool IsShowLinkWarningDialogReadOnly() const; bool IsShowLinkWarningDialogReadOnly() const;
void SetSaveAlwaysAllowed( sal_Bool bSet ); void SetSaveAlwaysAllowed( bool bSet );
sal_Bool IsSaveAlwaysAllowed() const; bool IsSaveAlwaysAllowed() const;
void SetExperimentalMode( sal_Bool bSet ); void SetExperimentalMode( bool bSet );
sal_Bool IsExperimentalMode() const; bool IsExperimentalMode() const;
void SetMacroRecorderMode( sal_Bool bSet ); void SetMacroRecorderMode( bool bSet );
sal_Bool IsMacroRecorderMode() const; bool IsMacroRecorderMode() const;
private: private:
......
sfx2/source/appl/newhelp.cxx
Dosyayı görüntüle @ b41badb8
...@@ -2466,7 +2466,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) ...@@ -2466,7 +2466,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt )
aMenu.InsertItem( TBI_SOURCEVIEW, SfxResId(STR_HELP_BUTTON_SOURCEVIEW).toString() ); aMenu.InsertItem( TBI_SOURCEVIEW, SfxResId(STR_HELP_BUTTON_SOURCEVIEW).toString() );
} }
if( SvtMenuOptions().IsEntryHidingEnabled() == sal_False ) if( ! SvtMenuOptions().IsEntryHidingEnabled() )
aMenu.SetMenuFlags( aMenu.GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES ); aMenu.SetMenuFlags( aMenu.GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
sal_uInt16 nId = aMenu.Execute( this, aPos ); sal_uInt16 nId = aMenu.Execute( this, aPos );
......
sfx2/source/menu/mnumgr.cxx
Dosyayı görüntüle @ b41badb8
...@@ -72,7 +72,7 @@ using namespace com::sun::star; ...@@ -72,7 +72,7 @@ using namespace com::sun::star;
void TryToHideDisabledEntries_Impl( Menu* pMenu ) void TryToHideDisabledEntries_Impl( Menu* pMenu )
{ {
DBG_ASSERT( pMenu, "invalid menu" ); DBG_ASSERT( pMenu, "invalid menu" );
if( SvtMenuOptions().IsEntryHidingEnabled() == sal_False ) if( ! SvtMenuOptions().IsEntryHidingEnabled() )
{ {
pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES ); pMenu->SetMenuFlags( pMenu->GetMenuFlags() | MENU_FLAG_HIDEDISABLEDENTRIES );
} }
......
svtools/source/config/menuoptions.cxx
Dosyayı görüntüle @ b41badb8
...@@ -41,8 +41,8 @@ using namespace ::osl ; ...@@ -41,8 +41,8 @@ using namespace ::osl ;
using namespace ::com::sun::star::uno ; using namespace ::com::sun::star::uno ;
#define ROOTNODE_MENU OUString("Office.Common/View/Menu" ) #define ROOTNODE_MENU OUString("Office.Common/View/Menu" )
#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False #define DEFAULT_DONTHIDEDISABLEDENTRIES false
#define DEFAULT_FOLLOWMOUSE sal_True #define DEFAULT_FOLLOWMOUSE true
#define DEFAULT_MENUICONS TRISTATE_INDET #define DEFAULT_MENUICONS TRISTATE_INDET
#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString("DontHideDisabledEntry" ) #define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString("DontHideDisabledEntry" )
...@@ -71,8 +71,8 @@ class SvtMenuOptions_Impl : public ConfigItem ...@@ -71,8 +71,8 @@ class SvtMenuOptions_Impl : public ConfigItem
private: private:
::std::list<Link> aList; ::std::list<Link> aList;
sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
TriState m_eMenuIcons ; /// cache "MenuIcons" of Menu section TriState m_eMenuIcons ; /// cache "MenuIcons" of Menu section
...@@ -143,16 +143,16 @@ class SvtMenuOptions_Impl : public ConfigItem ...@@ -143,16 +143,16 @@ class SvtMenuOptions_Impl : public ConfigItem
@onerror - @onerror -
*//*-*****************************************************************************************************/ *//*-*****************************************************************************************************/
sal_Bool IsEntryHidingEnabled() const bool IsEntryHidingEnabled() const
{ return m_bDontHideDisabledEntries; } { return m_bDontHideDisabledEntries; }
sal_Bool IsFollowMouseEnabled() const bool IsFollowMouseEnabled() const
{ return m_bFollowMouse; } { return m_bFollowMouse; }
TriState GetMenuIconsState() const TriState GetMenuIconsState() const
{ return m_eMenuIcons; } { return m_eMenuIcons; }
void SetEntryHidingState ( sal_Bool bState ) void SetEntryHidingState ( bool bState )
{ {
m_bDontHideDisabledEntries = bState; m_bDontHideDisabledEntries = bState;
SetModified(); SetModified();
...@@ -161,7 +161,7 @@ class SvtMenuOptions_Impl : public ConfigItem ...@@ -161,7 +161,7 @@ class SvtMenuOptions_Impl : public ConfigItem
Commit(); Commit();
} }
void SetFollowMouseState ( sal_Bool bState ) void SetFollowMouseState ( bool bState )
{ {
m_bFollowMouse = bState; m_bFollowMouse = bState;
SetModified(); SetModified();
...@@ -221,13 +221,13 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl() ...@@ -221,13 +221,13 @@ SvtMenuOptions_Impl::SvtMenuOptions_Impl()
// Follow assignment use order of values in relation to our list of key names! // Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" ); DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
sal_Bool bMenuIcons = sal_True; bool bMenuIcons = true;
sal_Bool bSystemMenuIcons = sal_True; bool bSystemMenuIcons = true;
if (m_eMenuIcons == TRISTATE_INDET) if (m_eMenuIcons == TRISTATE_INDET)
bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetPreferredUseImagesInMenus()); bMenuIcons = Application::GetSettings().GetStyleSettings().GetPreferredUseImagesInMenus();
else else
{ {
bSystemMenuIcons = sal_False; bSystemMenuIcons = false;
bMenuIcons = m_eMenuIcons ? sal_True : sal_False; bMenuIcons = m_eMenuIcons ? sal_True : sal_False;
} }
...@@ -299,13 +299,13 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames ) ...@@ -299,13 +299,13 @@ void SvtMenuOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNames )
DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" ); DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
bool bMenuSettingsChanged = false; bool bMenuSettingsChanged = false;
sal_Bool bMenuIcons = sal_True; bool bMenuIcons = true;
sal_Bool bSystemMenuIcons = sal_True; bool bSystemMenuIcons = true;
if (m_eMenuIcons == TRISTATE_INDET) if (m_eMenuIcons == TRISTATE_INDET)
bMenuIcons = (sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus()); bMenuIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
else else
{ {
bSystemMenuIcons = sal_False; bSystemMenuIcons = false;
bMenuIcons = m_eMenuIcons ? sal_True : sal_False; bMenuIcons = m_eMenuIcons ? sal_True : sal_False;
} }
...@@ -468,7 +468,7 @@ SvtMenuOptions::~SvtMenuOptions() ...@@ -468,7 +468,7 @@ SvtMenuOptions::~SvtMenuOptions()
// public method // public method
sal_Bool SvtMenuOptions::IsEntryHidingEnabled() const bool SvtMenuOptions::IsEntryHidingEnabled() const
{ {
MutexGuard aGuard( GetOwnStaticMutex() ); MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->IsEntryHidingEnabled(); return m_pDataContainer->IsEntryHidingEnabled();
......
svx/source/dialog/linkwarn.cxx
Dosyayı görüntüle @ b41badb8
...@@ -32,7 +32,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString& _rF ...@@ -32,7 +32,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const OUString& _rF
// load state of "warning on" checkbox from misc options // load state of "warning on" checkbox from misc options
SvtMiscOptions aMiscOpt; SvtMiscOptions aMiscOpt;
m_pWarningOnBox->Check( aMiscOpt.ShowLinkWarningDialog() == sal_True ); m_pWarningOnBox->Check( aMiscOpt.ShowLinkWarningDialog() );
if( aMiscOpt.IsShowLinkWarningDialogReadOnly() ) if( aMiscOpt.IsShowLinkWarningDialogReadOnly() )
m_pWarningOnBox->Disable(); m_pWarningOnBox->Disable();
} }
...@@ -41,7 +41,7 @@ SvxLinkWarningDialog::~SvxLinkWarningDialog() ...@@ -41,7 +41,7 @@ SvxLinkWarningDialog::~SvxLinkWarningDialog()
{ {
// save value of "warning off" checkbox, if necessary // save value of "warning off" checkbox, if necessary
SvtMiscOptions aMiscOpt; SvtMiscOptions aMiscOpt;
sal_Bool bChecked = m_pWarningOnBox->IsChecked(); bool bChecked = m_pWarningOnBox->IsChecked();
if ( aMiscOpt.ShowLinkWarningDialog() != bChecked ) if ( aMiscOpt.ShowLinkWarningDialog() != bChecked )
aMiscOpt.SetShowLinkWarningDialog( bChecked ); aMiscOpt.SetShowLinkWarningDialog( bChecked );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment