From a6287e21f1dab6ae382c24ceeb4c0212b7cad2d7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 4 Apr 2014 15:53:21 +0200 Subject: framework: sal_Bool->bool Change-Id: Ia6e87e2b382bd4005637e14088bde9e809996a25 --- .../source/inc/accelerators/acceleratorcache.hxx | 4 ++-- .../inc/accelerators/acceleratorconfiguration.hxx | 14 +++++++------- framework/source/inc/accelerators/keymapping.hxx | 2 +- framework/source/inc/accelerators/presethandler.hxx | 12 ++++++------ framework/source/inc/accelerators/storageholder.hxx | 4 ++-- framework/source/inc/loadenv/actionlockguard.hxx | 18 +++++++++--------- framework/source/inc/loadenv/loadenv.hxx | 20 ++++++++++---------- framework/source/inc/loadenv/targethelper.hxx | 4 ++-- framework/source/inc/pattern/frame.hxx | 12 ++++++------ framework/source/inc/pattern/window.hxx | 6 +++--- 10 files changed, 48 insertions(+), 48 deletions(-) (limited to 'framework/source/inc') diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index a49cb1ca3393..e9779f770824 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -107,8 +107,8 @@ class AcceleratorCache @return [bool] sal_True if the speicfied key exists inside this container. */ - virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const; - virtual sal_Bool hasCommand(const OUString& sCommand) const; + virtual bool hasKey(const css::awt::KeyEvent& aKey) const; + virtual bool hasCommand(const OUString& sCommand) const; /** TODO document me */ virtual TKeyList getAllKeys() const; diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 8065456744f6..15fe9a5bc236 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -241,7 +241,7 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, */ css::uno::Reference< css::uno::XInterface > impl_ts_openSubStorage(const css::uno::Reference< css::embed::XStorage >& xRootStorage, const OUString& sSubStorage , - sal_Bool bOutStream ); + bool bOutStream ); /** @short returns a reference to one of our internal cache members. @@ -261,7 +261,7 @@ class XMLBasedAcceleratorConfiguration : public IStorageListener, @return [AcceleratorCache] c++ reference(!) to one of our internal caches. */ - AcceleratorCache& impl_getCFG(sal_Bool bWriteAccessRequested = sal_False); + AcceleratorCache& impl_getCFG(bool bWriteAccessRequested = false); }; @@ -410,14 +410,14 @@ class XCUBasedAcceleratorConfiguration : public ::cppu::WeakImplHelper4< private: - void impl_ts_load(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); - void impl_ts_save(sal_Bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); + void impl_ts_load(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); + void impl_ts_save(bool bPreferred, const css::uno::Reference< css::container::XNameAccess >& xCfg); - void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const sal_Bool bPreferred); - void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const sal_Bool bPreferred); + void insertKeyToConfiguration(const css::awt::KeyEvent& aKeyEvent, const OUString& sCommand, const bool bPreferred); + void removeKeyFromConfiguration(const css::awt::KeyEvent& aKeyEvent, const bool bPreferred); void reloadChanged(const OUString& sPrimarySecondary, const OUString& sGlobalModules, const OUString& sModule, const OUString& sKey); - AcceleratorCache& impl_getCFG(sal_Bool bPreferred, sal_Bool bWriteAccessRequested = sal_False); + AcceleratorCache& impl_getCFG(bool bPreferred, bool bWriteAccessRequested = false); }; diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 18562325b487..9d79e3188775 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -123,7 +123,7 @@ class KeyMapping @return [boolean] sal_True if conversion was successfully. */ - sal_Bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, + bool impl_st_interpretIdentifierAsPureKeyCode(const OUString& sIdentifier, sal_uInt16& rCode ); }; diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index d7cea6a7e097..31bf59874cfa 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -335,7 +335,7 @@ class PresetHandler @return The opened preset stream ... or NULL if the preset does not exists. */ css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset, - sal_Bool bUseNoLangGlobal = sal_False); + bool bUseNoLangGlobal = false); /** @short open the specified target as stream object and return it. @@ -356,7 +356,7 @@ class PresetHandler or couldnt be created as new one. */ css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget , - sal_Bool bCreateIfMissing); + bool bCreateIfMissing); /** @short do anything which is necessary to flush all changes back to disk. @@ -392,7 +392,7 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > impl_openPathIgnoringErrors(const OUString& sPath , sal_Int32 eMode , - sal_Bool bShare); + bool bShare); /** @short try to find the specified locale inside list of possible ones. @@ -418,7 +418,7 @@ class PresetHandler */ ::std::vector< OUString >::const_iterator impl_findMatchingLocalizedValue(const ::std::vector< OUString >& lLocalizedValues, OUString& rLanguageTag , - sal_Bool bAllowFallbacks ); + bool bAllowFallbacks ); /** @short open a config path ignoring errors (catching exceptions). @@ -449,9 +449,9 @@ class PresetHandler */ css::uno::Reference< css::embed::XStorage > impl_openLocalizedPathIgnoringErrors(OUString& sPath , sal_Int32 eMode , - sal_Bool bShare , + bool bShare , OUString& rLanguageTag , - sal_Bool bAllowFallback); + bool bAllowFallback); /** @short returns the names of all sub storages of specified storage. diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index c0c4269dba66..cdd292957ebf 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -168,12 +168,12 @@ class StorageHolder static css::uno::Reference< css::embed::XStorage > openSubStorageWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStorage , sal_Int32 eOpenMode , - sal_Bool bAllowFallback); + bool bAllowFallback); static css::uno::Reference< css::io::XStream > openSubStreamWithFallback(const css::uno::Reference< css::embed::XStorage >& xBaseStorage , const OUString& sSubStream , sal_Int32 eOpenMode , - sal_Bool bAllowFallback); + bool bAllowFallback); // helper private: diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx index accc6fa003a5..bbf6a01829a6 100644 --- a/framework/source/inc/loadenv/actionlockguard.hxx +++ b/framework/source/inc/loadenv/actionlockguard.hxx @@ -43,7 +43,7 @@ class ActionLockGuard /** @short knows if a lock exists on the internal lock object forced by this guard instance. */ - sal_Bool m_bActionLocked; + bool m_bActionLocked; // interface @@ -56,7 +56,7 @@ class ActionLockGuard in a mode "use guard for more then one resources". */ ActionLockGuard() - : m_bActionLocked(sal_False) + : m_bActionLocked(false) { } @@ -66,7 +66,7 @@ class ActionLockGuard points to the outside resource, which should be locked. */ ActionLockGuard(const css::uno::Reference< css::document::XActionLockable >& xLock) - : m_bActionLocked(sal_False) + : m_bActionLocked(false) { setResource(xLock); } @@ -90,18 +90,18 @@ class ActionLockGuard @return sal_True, if new resource could be set and locked. sal_False otherwise. */ - virtual sal_Bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock) + virtual bool setResource(const css::uno::Reference< css::document::XActionLockable >& xLock) { osl::MutexGuard g(m_mutex); if (m_bActionLocked || !xLock.is()) - return sal_False; + return false; m_xActionLock = xLock; m_xActionLock->addActionLock(); m_bActionLocked = m_xActionLock->isActionLocked(); - return sal_True; + return true; } /** @short set a new resource for locking at this guard. @@ -121,10 +121,10 @@ class ActionLockGuard osl::ClearableMutexGuard aMutexLock(m_mutex); css::uno::Reference< css::document::XActionLockable > xLock = m_xActionLock; - sal_Bool bLocked = m_bActionLocked; + bool bLocked = m_bActionLocked; m_xActionLock.clear(); - m_bActionLocked = sal_False; + m_bActionLocked = false; aMutexLock.clear(); // <- SAFE .......................... @@ -153,7 +153,7 @@ class ActionLockGuard m_xActionLock->removeActionLock(); // dont check for any locks here ... // May another guard use the same lock object :-( - m_bActionLocked = sal_False; + m_bActionLocked = false; } } }; diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 3006e82adbc1..876366ae63c4 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -163,7 +163,7 @@ private: load request and must be closed in case loading (not handling!) operation failed. The default value is sal_False! */ - sal_Bool m_bCloseFrameOnError; + bool m_bCloseFrameOnError; /** @short it indicates, that the old document (which was located inside m_xBaseFrame in combination with the m_sTarget value "_self") was suspended. @@ -171,7 +171,7 @@ private: loading (not handling!) failed, it must be reactivated. The default value is sal_False! */ - sal_Bool m_bReactivateControllerOnError; + bool m_bReactivateControllerOnError; /** @short it holds one (!) asynchronous used contenthandler or frameloader alive, till the asynchronous operation will be finished. @@ -184,7 +184,7 @@ private: (in case the micht existing old document was reactivated) we must hold the result of the load process explicitly. */ - sal_Bool m_bLoaded; + bool m_bLoaded; /** @short holds an XActionLock on the internal used task member. @@ -323,7 +323,7 @@ public: @throw A RuntimeException in case any internal process indicates, that the whole runtime cant be used any longer. */ - sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0); + bool waitWhileLoading(sal_uInt32 nTimeout = 0); /** TODO document me ... */ css::uno::Reference< css::lang::XComponent > getTargetComponent() const; @@ -371,7 +371,7 @@ public: ); /** TODO document me ... */ - void impl_setResult(sal_Bool bResult); + void impl_setResult(bool bResult); /** TODO document me ... */ css::uno::Reference< css::uno::XInterface > impl_searchLoader(); @@ -445,7 +445,7 @@ private: @throw A RuntimeException in case any internal process indicates, that the whole runtime cant be used any longer. */ - sal_Bool impl_handleContent() + bool impl_handleContent() throw(LoadEnvException, css::uno::RuntimeException); /** @short tries to use FrameLoader objects for loading. @@ -464,7 +464,7 @@ private: @throw A RuntimeException in case any internal process indicates, that the whole runtime cant be used any longer. */ - sal_Bool impl_loadContent() + bool impl_loadContent() throw(LoadEnvException, css::uno::RuntimeException); /** @short checks if the specified content is already loaded. @@ -550,7 +550,7 @@ private: This mode is needed by a) */ void impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow , - sal_Bool bForceToFront); + bool bForceToFront); /** @short checks whether a frame is already used for another load request or not. @@ -563,7 +563,7 @@ private: sal_True if this frame is already used for loading, sal_False otherwise. */ - sal_Bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const; + bool impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const; /** @short try to determine the used application module of this load request and applay right position and size @@ -573,7 +573,7 @@ private: /** @short determine if it's allowed to open new document frames. */ - sal_Bool impl_furtherDocsAllowed(); + bool impl_furtherDocsAllowed(); /** @short jumps to the requested bookmark inside a given document. */ diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 618cc486d8a7..d0c960df754d 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -71,7 +71,7 @@ class TargetHelper @return It returns if sCheckTarget represent the expected eSpecialTarget value; otherwise. */ - static sal_Bool matchSpecialTarget(const OUString& sCheckTarget , + static bool matchSpecialTarget(const OUString& sCheckTarget , ESpecialTarget eSpecialTarget); /** @short it checks, if the given name can be used @@ -93,7 +93,7 @@ class TargetHelper @param sName the new frame name, which sould be checked. */ - static sal_Bool isValidNameForFrame(const OUString& sName); + static bool isValidNameForFrame(const OUString& sName); }; } // namespace framework diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 38a0b8551274..ffba8acf26bb 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -68,8 +68,8 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un @return [bool] sal_True if closing failed. */ -inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource , - sal_Bool bDelegateOwnership) +inline bool closeIt(const css::uno::Reference< css::uno::XInterface >& xResource , + bool bDelegateOwnership) { css::uno::Reference< css::util::XCloseable > xClose (xResource, css::uno::UNO_QUERY); css::uno::Reference< css::lang::XComponent > xDispose(xResource, css::uno::UNO_QUERY); @@ -82,19 +82,19 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso if (xDispose.is()) xDispose->dispose(); else - return sal_False; + return false; } catch(const css::util::CloseVetoException&) - { return sal_False; } + { return false; } catch(const css::lang::DisposedException&) {} // disposed is closed is ... catch(const css::uno::RuntimeException&) { throw; } // should not be suppressed! catch(const css::uno::Exception&) - { return sal_False; } // ??? We defined to return a boolen value instead of throwing exceptions ... + { return false; } // ??? We defined to return a boolen value instead of throwing exceptions ... // (OK: RuntimeExceptions should not be catched inside the core ..) - return sal_True; + return true; } } // namespace frame diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 19ff84bb55e7..71744ed546ec 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -95,7 +95,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind // <- SOLAR SAFE ---------------------------- } -static sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) +static bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow) { // even child frame containing top level windows (e.g. query designer of database) will be closed css::uno::Reference< css::awt::XTopWindow > xTopWindowCheck(xWindow, css::uno::UNO_QUERY); @@ -112,10 +112,10 @@ static sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWin (pWindow ) && (pWindow->IsSystemWindow()) ) - return sal_True; + return true; } - return sal_False; + return false; } }; -- cgit