summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-20 11:53:43 +0200
committerNoel Grandin <noel@peralex.com>2014-03-24 08:12:09 +0200
commit9604eb87581ae7d8714fb69cf56a0442c4740100 (patch)
tree64af14bb768b28167743563c8d6704cb558d4f44 /include
parentf661ac03e049844fd529fb6ff02e628b32cac650 (diff)
svtools: sal_Bool->bool
Change-Id: I8f171f7f61ea06a79183e9bf9b15b8c35c98cc9b
Diffstat (limited to 'include')
-rw-r--r--include/svtools/filectrl.hxx10
-rw-r--r--include/svtools/fileview.hxx26
-rw-r--r--include/svtools/fmtfield.hxx72
-rw-r--r--include/svtools/fontsubstconfig.hxx14
-rw-r--r--include/svtools/framestatuslistener.hxx4
5 files changed, 63 insertions, 63 deletions
diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx
index a79fb20b37c7..dd80a3f938c6 100644
--- a/include/svtools/filectrl.hxx
+++ b/include/svtools/filectrl.hxx
@@ -46,7 +46,7 @@ private:
PushButton maButton;
OUString maButtonText;
- sal_Bool mbOpenDlg;
+ bool mbOpenDlg;
Link maDialogCreatedHdl;
@@ -72,8 +72,8 @@ public:
void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags );
- void SetOpenDialog( sal_Bool bOpen ) { mbOpenDlg = bOpen; }
- sal_Bool IsOpenDialog() const { return mbOpenDlg; }
+ void SetOpenDialog( bool bOpen ) { mbOpenDlg = bOpen; }
+ bool IsOpenDialog() const { return mbOpenDlg; }
void SetText( const OUString& rStr );
OUString GetText() const;
@@ -82,8 +82,8 @@ public:
void SetSelection( const Selection& rSelection ) { maEdit.SetSelection( rSelection ); }
Selection GetSelection() const { return maEdit.GetSelection(); }
- void SetReadOnly( sal_Bool bReadOnly = sal_True ) { maEdit.SetReadOnly( bReadOnly ); }
- sal_Bool IsReadOnly() const { return maEdit.IsReadOnly(); }
+ void SetReadOnly( bool bReadOnly = true ) { maEdit.SetReadOnly( bReadOnly ); }
+ bool IsReadOnly() const { return maEdit.IsReadOnly(); }
//use this to manipulate the dialog bevore executing it:
diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx
index 25f3a54c839a..4d845b6527c2 100644
--- a/include/svtools/fileview.hxx
+++ b/include/svtools/fileview.hxx
@@ -69,7 +69,7 @@ class SVT_DLLPUBLIC SvtFileView : public Control
{
private:
SvtFileView_Impl* mpImp;
- sal_Bool bSortColumn;
+ bool bSortColumn;
::com::sun::star::uno::Sequence< OUString > mpBlackList;
@@ -80,7 +80,7 @@ protected:
virtual void GetFocus();
public:
- SvtFileView( Window* pParent, const ResId& rResId, sal_Bool bOnlyFolder, sal_Bool bMultiSelection );
+ SvtFileView( Window* pParent, const ResId& rResId, bool bOnlyFolder, bool bMultiSelection );
SvtFileView( Window* pParent, const ResId& rResId, sal_uInt8 nFlags );
~SvtFileView();
@@ -88,15 +88,15 @@ public:
OUString GetURL( SvTreeListEntry* pEntry ) const;
OUString GetCurrentURL() const;
- sal_Bool GetParentURL( OUString& _rParentURL ) const;
+ bool GetParentURL( OUString& _rParentURL ) const;
void CreatedFolder( const OUString& rUrl, const OUString& rNewFolder );
void SetHelpId( const OString& rHelpId );
- const OString& GetHelpId( ) const;
+ const OString& GetHelpId( ) const;
void SetSizePixel( const Size& rNewSize );
virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize );
- void SetSortColumn( sal_Bool bValue ) { bSortColumn = bValue; }
- sal_Bool GetSortColumn() { return bSortColumn; }
+ void SetSortColumn( bool bValue ) { bSortColumn = bValue; }
+ bool GetSortColumn() { return bSortColumn; }
/** initialize the view with the content of a folder given by URL, and aply an immediate filter
@@ -124,11 +124,11 @@ public:
This method will never return <member>eStillRunning</member>, since it will fill the
view synchronously
*/
- sal_Bool Initialize( const ::com::sun::star::uno::Sequence< OUString >& aContents );
+ bool Initialize( const ::com::sun::star::uno::Sequence< OUString >& aContents );
/** initializes the view with the content of a folder given by an UCB content
*/
- sal_Bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent,
+ bool Initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent,
const OUString& rFilter );
/** reads the current content of the current folder again, and applies the given filter to it
@@ -182,9 +182,9 @@ public:
void EnableAutoResize();
void SetFocus();
- void EnableContextMenu( sal_Bool bEnable );
- void EnableDelete( sal_Bool bEnable );
- void EnableNameReplacing( sal_Bool bEnable = sal_True );
+ void EnableContextMenu( bool bEnable );
+ void EnableDelete( bool bEnable );
+ void EnableNameReplacing( bool bEnable = true );
// translate folder names or display doc-title instead of file name
// EnableContextMenu( sal_True )/EnableDelete(sal_True) disable name replacing!
@@ -202,10 +202,10 @@ protected:
struct SvtContentEntry
{
- sal_Bool mbIsFolder;
+ bool mbIsFolder;
OUString maURL;
- SvtContentEntry( const OUString& rURL, sal_Bool bIsFolder ) :
+ SvtContentEntry( const OUString& rURL, bool bIsFolder ) :
mbIsFolder( bIsFolder ), maURL( rURL ) {}
};
diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx
index 9c474d8be22c..3dc58ab5e912 100644
--- a/include/svtools/fmtfield.hxx
+++ b/include/svtools/fmtfield.hxx
@@ -59,15 +59,15 @@ protected:
double m_dMinValue;
double m_dMaxValue;
- sal_Bool m_bHasMin : 1;
- sal_Bool m_bHasMax : 1;
+ bool m_bHasMin : 1;
+ bool m_bHasMax : 1;
- sal_Bool m_bStrictFormat : 1;
+ bool m_bStrictFormat : 1;
- sal_Bool m_bValueDirty : 1;
- sal_Bool m_bEnableEmptyField : 1;
- sal_Bool m_bAutoColor : 1;
- sal_Bool m_bEnableNaN : 1;
+ bool m_bValueDirty : 1;
+ bool m_bEnableEmptyField : 1;
+ bool m_bAutoColor : 1;
+ bool m_bEnableNaN : 1;
double m_dCurrentValue;
double m_dDefaultValue;
@@ -82,7 +82,7 @@ protected:
// es macht einen Unterschied, ob man bei eingestellter Textformatierung beim LostFocus den aktuellen String durch
// den Formatter jagt und das Ergebnis anzeigt oder erst aus dem String ein double macht, das formatiert und dann
// ausgibt
- sal_Bool m_bTreatAsNumber;
+ bool m_bTreatAsNumber;
// und mit den folgenden Members koennen wir das Ganze hier auch zur formatierten Text-Ausgabe benutzen ...
OUString m_sCurrentTextValue;
OUString m_sDefaultText;
@@ -98,13 +98,13 @@ public:
virtual ~FormattedField();
// Min-/Max-Verwaltung
- sal_Bool HasMinValue() const { return m_bHasMin; }
- void ClearMinValue() { m_bHasMin = sal_False; }
+ bool HasMinValue() const { return m_bHasMin; }
+ void ClearMinValue() { m_bHasMin = false; }
void SetMinValue(double dMin);
double GetMinValue() const { return m_dMinValue; }
- sal_Bool HasMaxValue() const { return m_bHasMax; }
- void ClearMaxValue() { m_bHasMax = sal_False; }
+ bool HasMaxValue() const { return m_bHasMax; }
+ void ClearMaxValue() { m_bHasMax = false; }
void SetMaxValue(double dMax);
double GetMaxValue() const { return m_dMaxValue; }
@@ -118,11 +118,11 @@ public:
void SetTextValue(const OUString& rText);
// der String wird in ein double umgewandelt (durch den Formatter) und anschliessen in SetValue gesteckt
- sal_Bool IsEmptyFieldEnabled() const { return m_bEnableEmptyField; }
- void EnableEmptyField(sal_Bool bEnable);
+ bool IsEmptyFieldEnabled() const { return m_bEnableEmptyField; }
+ void EnableEmptyField(bool bEnable);
// wenn nicht enabled, wird beim Verlassen des Feldes der Text auf den letzten gueltigen zurueckgesetzt
- void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_bValueDirty = sal_True; }
+ void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_bValueDirty = true; }
// wenn der aktuelle String ungueltig ist, liefert GetValue() diesen Default-Wert
double GetDefaultValue() const { return m_dDefaultValue; }
@@ -131,13 +131,13 @@ public:
void SetFormatKey(sal_uLong nFormatKey);
SvNumberFormatter* GetFormatter() const { return m_pFormatter; }
- void SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bResetFormat = sal_True);
+ void SetFormatter(SvNumberFormatter* pFormatter, bool bResetFormat = true);
// wenn bResetFormat sal_False ist, wird versucht, das alte eingestellte Format mit 'hinueberzuretten' (teuer, wenn es sich nicht
// um eines der Standard-Formate handelt, die in allen Formattern gleich sind)
// wenn sal_True, wird als neuer FormatKey 0 gesetzt
- sal_Bool GetThousandsSep() const;
- void SetThousandsSep(sal_Bool _bUseSeparator);
+ bool GetThousandsSep() const;
+ void SetThousandsSep(bool _bUseSeparator);
// the is no check if the current format is numeric, so be cautious when calling these functions
sal_uInt16 GetDecimalDigits() const;
@@ -149,12 +149,12 @@ public:
// Das hier gelieferte Objekt wird allerdings zwischen allen Instanzen der Klasse geteilt (aus Zeit- und Platzgruenden),
// also ist etwas Vorsicht angebracht ...
- OUString GetFormat(LanguageType& eLang) const;
- sal_Bool SetFormat(const OUString& rFormatString, LanguageType eLang);
+ OUString GetFormat(LanguageType& eLang) const;
+ bool SetFormat(const OUString& rFormatString, LanguageType eLang);
// sal_False, wenn der FormatString nicht gesetzt werden konnte (also wahrscheinlich ungueltig ist)
- sal_Bool IsStrictFormat() const { return m_bStrictFormat; }
- void SetStrictFormat(sal_Bool bEnable) { m_bStrictFormat = bEnable; }
+ bool IsStrictFormat() const { return m_bStrictFormat; }
+ void SetStrictFormat(bool bEnable) { m_bStrictFormat = bEnable; }
// Formatueberpruefung waehrend der Eingabe ?
// Spin-Handling
@@ -174,8 +174,8 @@ public:
void SetSpinLast(double dLast) { m_dSpinLast = dLast; }
double GetSpinLast() const { return m_dSpinLast; }
- sal_Bool TreatingAsNumber() const { return m_bTreatAsNumber; }
- void TreatAsNumber(sal_Bool bDoSo) { m_bTreatAsNumber = bDoSo; }
+ bool TreatingAsNumber() const { return m_bTreatAsNumber; }
+ void TreatAsNumber(bool bDoSo) { m_bTreatAsNumber = bDoSo; }
public:
virtual void SetText( const OUString& rStr );
@@ -206,8 +206,8 @@ public:
// says that it has to be painted in a special color (e.g. a format where negative numbers should be printed
// red), the text is painted with that color automatically.
// The color used is the same as returned by GetLastOutputColor()
- void SetAutoColor(sal_Bool _bAutomatic);
- sal_Bool GetAutoColor() const { return m_bAutoColor; }
+ void SetAutoColor(bool _bAutomatic);
+ bool GetAutoColor() const { return m_bAutoColor; }
/** enables handling of not-a-number value.
@@ -223,8 +223,8 @@ public:
control, and then tabs out of it, the text "foo" will persist, and GetValue will
return NaN in subsequent calls.
*/
- void EnableNotANumber( sal_Bool _bEnable );
- sal_Bool IsNotANumberEnabled( ) const { return m_bEnableNaN; }
+ void EnableNotANumber( bool _bEnable );
+ bool IsNotANumberEnabled( ) const { return m_bEnableNaN; }
/** When being set to true, the strings in the field are formatted using the
InputLine format. That's also what you get in Calc when you edit a cell
@@ -239,14 +239,14 @@ protected:
virtual void Modify();
// CheckText ueberschreiben fuer Ueberpruefung zur Eingabezeit
- virtual sal_Bool CheckText(const OUString&) const { return sal_True; }
+ virtual bool CheckText(const OUString&) const { return true; }
// any aspect of the current format has changed
virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat);
void ImplSetTextImpl(const OUString& rNew, Selection* pNewSel);
- void ImplSetValue(double dValue, sal_Bool bForce);
- sal_Bool ImplGetValue(double& dNewVal);
+ void ImplSetValue(double dValue, bool bForce);
+ bool ImplGetValue(double& dNewVal);
void ImplSetFormatKey(sal_uLong nFormatKey);
// SetFormatKey without FormatChanged notification
@@ -276,7 +276,7 @@ public:
virtual ~DoubleNumericField();
protected:
- virtual sal_Bool CheckText(const OUString& sText) const;
+ virtual bool CheckText(const OUString& sText) const;
virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat);
void ResetConformanceTester();
@@ -290,8 +290,8 @@ protected:
class DoubleCurrencyField : public FormattedField
{
OUString m_sCurrencySymbol;
- sal_Bool m_bPrependCurrSym;
- sal_Bool m_bChangingFormat;
+ bool m_bPrependCurrSym;
+ bool m_bChangingFormat;
public:
DoubleCurrencyField(Window* pParent, WinBits nStyle = 0);
@@ -299,8 +299,8 @@ public:
OUString getCurrencySymbol() const { return m_sCurrencySymbol; }
void setCurrencySymbol(const OUString& rSymbol);
- sal_Bool getPrependCurrSym() const { return m_bPrependCurrSym; }
- void setPrependCurrSym(sal_Bool _bPrepend);
+ bool getPrependCurrSym() const { return m_bPrependCurrSym; }
+ void setPrependCurrSym(bool _bPrepend);
protected:
virtual void FormatChanged(FORMAT_CHANGE_TYPE nWhat);
diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx
index 053be31409b2..0ad275989cb1 100644
--- a/include/svtools/fontsubstconfig.hxx
+++ b/include/svtools/fontsubstconfig.hxx
@@ -29,23 +29,23 @@ struct SubstitutionStruct
{
OUString sFont;
OUString sReplaceBy;
- sal_Bool bReplaceAlways;
- sal_Bool bReplaceOnScreenOnly;
+ bool bReplaceAlways;
+ bool bReplaceOnScreenOnly;
};
class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem
{
- sal_Bool bIsEnabled;
+ bool bIsEnabled;
SvtFontSubstConfig_Impl* pImpl;
public:
SvtFontSubstConfig();
virtual ~SvtFontSubstConfig();
- virtual void Commit();
- virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
+ virtual void Commit();
+ virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
- sal_Bool IsEnabled() const {return bIsEnabled;}
- void Enable(sal_Bool bSet) {bIsEnabled = bSet; SetModified();}
+ bool IsEnabled() const {return bIsEnabled;}
+ void Enable(bool bSet) {bIsEnabled = bSet; SetModified();}
sal_Int32 SubstitutionCount() const;
void ClearSubstitutions();
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index deed0be000b9..fe735a20d515 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -51,7 +51,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
void addStatusListener( const OUString& aCommandURL );
void bindListener();
void unbindListener();
- sal_Bool isBound() const;
+ bool isBound() const;
// XInterface
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception);
@@ -87,7 +87,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
OUStringHash,
::std::equal_to< OUString > > URLToDispatchMap;
- sal_Bool m_bInitialized : 1,
+ bool m_bInitialized : 1,
m_bDisposed : 1;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;