summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx2
-rw-r--r--include/svx/fmmodel.hxx18
-rw-r--r--include/svx/fmsearch.hxx2
-rw-r--r--include/svx/fmshell.hxx16
-rw-r--r--include/svx/fmsrccfg.hxx86
-rw-r--r--include/svx/fmsrcimp.hxx84
-rw-r--r--include/svx/fmtools.hxx12
-rw-r--r--include/svx/fmview.hxx8
-rw-r--r--include/svx/fntctrl.hxx2
-rw-r--r--sd/source/ui/view/drviews1.cxx2
-rw-r--r--sd/source/ui/view/drviews5.cxx2
-rw-r--r--svx/source/dialog/fntctrl.cxx12
-rw-r--r--svx/source/form/fmmodel.cxx12
-rw-r--r--svx/source/form/fmshell.cxx12
-rw-r--r--svx/source/form/fmshimp.cxx16
-rw-r--r--svx/source/form/fmsrccfg.cxx22
-rw-r--r--svx/source/form/fmsrcimp.cxx112
-rw-r--r--svx/source/form/fmtools.cxx12
-rw-r--r--svx/source/form/fmview.cxx10
19 files changed, 221 insertions, 221 deletions
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 0d79f33a4e11..08b41d084400 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -72,7 +72,7 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
m_aHalfFullFormsCJK.Hide();
// never ignore the width (ignoring is expensive) if the option is not available at all
- m_pSearchEngine->SetIgnoreWidthCJK( sal_False );
+ m_pSearchEngine->SetIgnoreWidthCJK( false );
}
// some initial record texts
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index f6d51d23a579..a441ff2d726f 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -39,8 +39,8 @@ private:
FmFormModelImplData* m_pImpl;
SfxObjectShell* m_pObjShell;
- sal_Bool m_bOpenInDesignMode : 1;
- sal_Bool m_bAutoControlFocus : 1;
+ bool m_bOpenInDesignMode : 1;
+ bool m_bAutoControlFocus : 1;
SVX_DLLPRIVATE FmFormModel( const FmFormModel& ); // never implemented
SVX_DLLPRIVATE void operator=(const FmFormModel& rSrcModel); // never implemented
@@ -67,25 +67,25 @@ public:
SfxObjectShell* GetObjectShell() const { return m_pObjShell; }
void SetObjectShell( SfxObjectShell* pShell );
- sal_Bool GetOpenInDesignMode() const { return m_bOpenInDesignMode; }
- void SetOpenInDesignMode( sal_Bool _bOpenDesignMode );
+ bool GetOpenInDesignMode() const { return m_bOpenInDesignMode; }
+ void SetOpenInDesignMode( bool _bOpenDesignMode );
- sal_Bool GetAutoControlFocus() const { return m_bAutoControlFocus; }
- void SetAutoControlFocus( sal_Bool _bAutoControlFocus );
+ bool GetAutoControlFocus() const { return m_bAutoControlFocus; }
+ void SetAutoControlFocus( bool _bAutoControlFocus );
/** check whether the OpenInDesignMode has been set explicitly or been loaded (<FALSE/>)
or if it still has the default value from construction (<TRUE/>)
*/
- sal_Bool OpenInDesignModeIsDefaulted();
+ bool OpenInDesignModeIsDefaulted();
/** determines whether form controls should use the SdrModel's reference device for text rendering
*/
- sal_Bool ControlsUseRefDevice() const;
+ bool ControlsUseRefDevice() const;
FmXUndoEnvironment& GetUndoEnv();
private:
- void implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _bForce );
+ void implSetOpenInDesignMode( bool _bOpenDesignMode, bool _bForce );
};
#endif // _FM_FMMODEL_HXX
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index 68a02da5064a..95b7c44a236f 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star {
// Helper methods
-SVX_DLLPUBLIC sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xControl,
+SVX_DLLPUBLIC bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xControl,
OUString* pCurrentText = NULL);
// check if the control has one of the interfaces we can use for searching
// *pCurrentText will be filled with the current text of the control (as used when searching this control)
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index b749efe137d2..c36b26d1dfa7 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -57,14 +57,14 @@ namespace svx
class SVX_DLLPUBLIC FmDesignModeChangedHint : public SfxHint
{
- sal_Bool m_bDesignMode;
+ bool m_bDesignMode;
public:
TYPEINFO();
- FmDesignModeChangedHint( sal_Bool bDesMode );
+ FmDesignModeChangedHint( bool bDesMode );
virtual ~FmDesignModeChangedHint();
- sal_Bool GetDesignMode() const { return m_bDesignMode; }
+ bool GetDesignMode() const { return m_bDesignMode; }
};
@@ -113,7 +113,7 @@ public:
void ExecuteTextAttribute( SfxRequest& );
void GetTextAttributeState( SfxItemSet& );
- sal_Bool GetY2KState(sal_uInt16& nReturn);
+ bool GetY2KState(sal_uInt16& nReturn);
void SetY2KState(sal_uInt16 n);
void SetView(FmFormView* pView);
@@ -123,7 +123,7 @@ public:
FmFormPage* GetCurPage() const;
FmXFormShell* GetImpl() const {return m_pImpl;};
- bool PrepareClose(sal_Bool bUI = sal_True);
+ bool PrepareClose(bool bUI = true);
bool IsActiveControl() const;
void ForgetActiveControl();
@@ -161,15 +161,15 @@ public:
const OutputDevice& i_rDevice
) const;
- sal_Bool IsDesignMode() const { return m_bDesignMode; }
+ bool IsDesignMode() const { return m_bDesignMode; }
void SetDesignMode( bool _bDesignMode );
protected:
void GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich);
// is there a form on the current page?
- void DetermineForms(sal_Bool bInvalidate);
- void impl_setDesignMode( sal_Bool bDesign);
+ void DetermineForms(bool bInvalidate);
+ void impl_setDesignMode( bool bDesign);
};
// ***************************************************************************************************
diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx
index e3f6e0c7549c..ce869e1c5376 100644
--- a/include/svx/fmsrccfg.hxx
+++ b/include/svx/fmsrccfg.hxx
@@ -54,37 +54,37 @@ namespace svxform
public:
// no bit fields at all (want to pass the addresses to the OConfigurationValueContainer)
- ::com::sun::star::uno::Sequence< OUString >
- aHistory;
- OUString sSingleSearchField;
-
- sal_Int16 nSearchForType;
- sal_Int16 nPosition;
- sal_Int16 nLevOther;
- sal_Int16 nLevShorter;
- sal_Int16 nLevLonger;
- sal_Bool bLevRelaxed;
-
- sal_Bool bAllFields;
- sal_Bool bUseFormatter;
- sal_Bool bBackwards;
- sal_Bool bWildcard;
- sal_Bool bRegular;
- sal_Bool bApproxSearch;
+ ::css::uno::Sequence< OUString >
+ aHistory;
+ OUString sSingleSearchField;
+
+ sal_Int16 nSearchForType;
+ sal_Int16 nPosition;
+ sal_Int16 nLevOther;
+ sal_Int16 nLevShorter;
+ sal_Int16 nLevLonger;
+ bool bLevRelaxed;
+
+ bool bAllFields;
+ bool bUseFormatter;
+ bool bBackwards;
+ bool bWildcard;
+ bool bRegular;
+ bool bApproxSearch;
// the last three are mutually exclusive
- sal_Bool bSoundsLikeCJK;
+ bool bSoundsLikeCJK;
FmSearchParams();
- sal_Bool isIgnoreWidthCJK( ) const;
+ bool isIgnoreWidthCJK( ) const;
sal_Int32 getTransliterationFlags( ) const { return nTransliterationFlags; }
void setTransliterationFlags( sal_Int32 _nFlags ) { nTransliterationFlags = _nFlags; }
- sal_Bool isCaseSensitive( ) const;
- void setCaseSensitive( sal_Bool _bCase );
+ bool isCaseSensitive( ) const;
+ void setCaseSensitive( bool _bCase );
};
@@ -101,28 +101,28 @@ namespace svxform
// wrapper properties:
// some of the members of FmSearchParams are must be translated to be stored in the configuration
- OUString m_sSearchForType;
- OUString m_sSearchPosition;
-
- sal_Bool m_bIsMatchCase;
- sal_Bool m_bIsMatchFullHalfWidthForms;
- sal_Bool m_bIsMatchHiraganaKatakana;
- sal_Bool m_bIsMatchContractions;
- sal_Bool m_bIsMatchMinusDashCho_on;
- sal_Bool m_bIsMatchRepeatCharMarks;
- sal_Bool m_bIsMatchVariantFormKanji;
- sal_Bool m_bIsMatchOldKanaForms;
- sal_Bool m_bIsMatch_DiZi_DuZu;
- sal_Bool m_bIsMatch_BaVa_HaFa;
- sal_Bool m_bIsMatch_TsiThiChi_DhiZi;
- sal_Bool m_bIsMatch_HyuIyu_ByuVyu;
- sal_Bool m_bIsMatch_SeShe_ZeJe;
- sal_Bool m_bIsMatch_IaIya;
- sal_Bool m_bIsMatch_KiKu;
- sal_Bool m_bIsIgnorePunctuation;
- sal_Bool m_bIsIgnoreWhitespace;
- sal_Bool m_bIsIgnoreProlongedSoundMark;
- sal_Bool m_bIsIgnoreMiddleDot;
+ OUString m_sSearchForType;
+ OUString m_sSearchPosition;
+
+ bool m_bIsMatchCase;
+ bool m_bIsMatchFullHalfWidthForms;
+ bool m_bIsMatchHiraganaKatakana;
+ bool m_bIsMatchContractions;
+ bool m_bIsMatchMinusDashCho_on;
+ bool m_bIsMatchRepeatCharMarks;
+ bool m_bIsMatchVariantFormKanji;
+ bool m_bIsMatchOldKanaForms;
+ bool m_bIsMatch_DiZi_DuZu;
+ bool m_bIsMatch_BaVa_HaFa;
+ bool m_bIsMatch_TsiThiChi_DhiZi;
+ bool m_bIsMatch_HyuIyu_ByuVyu;
+ bool m_bIsMatch_SeShe_ZeJe;
+ bool m_bIsMatch_IaIya;
+ bool m_bIsMatch_KiKu;
+ bool m_bIsIgnorePunctuation;
+ bool m_bIsIgnoreWhitespace;
+ bool m_bIsIgnoreProlongedSoundMark;
+ bool m_bIsIgnoreMiddleDot;
public:
FmSearchConfigItem();
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 70ad5ef0b991..8b2358610dbe 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -64,12 +64,12 @@ struct FmSearchProgress
enum STATE { STATE_PROGRESS, STATE_PROGRESS_COUNTING, STATE_CANCELED, STATE_SUCCESSFULL, STATE_NOTHINGFOUND, STATE_ERROR };
// (move to new record; progress during counting of records; cancelled; record found; nothing found;
// any non-processable error)
- STATE aSearchState;
+ STATE aSearchState;
// current record - always valid (e.g. of interest for continuing search in case of cancellation)
sal_uInt32 nCurrentRecord;
// Overflow - only valid in case of STATE_PROGRESS
- sal_Bool bOverflow;
+ bool bOverflow;
// the position of the search cursor - valid in case of STATE_SUCCESSFULL, STATE_CANCELED and STATE_NOTHING_FOUND
::com::sun::star::uno::Any aBookmark;
@@ -184,7 +184,7 @@ class SVX_DLLPUBLIC FmSearchEngine
{
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn > xContents;
sal_uInt32 nFormatKey;
- sal_Bool bDoubleHandling;
+ bool bDoubleHandling;
};
typedef std::vector<FieldInfo> FieldCollection;
@@ -194,7 +194,7 @@ class SVX_DLLPUBLIC FmSearchEngine
typedef std::vector<svxform::ControlTextWrapper*> ControlTextSuppliers;
ControlTextSuppliers m_aControlTexts;
- sal_Bool m_bUsingTextComponents;
+ bool m_bUsingTextComponents;
CursorWrapper m_xOriginalIterator;
CursorWrapper m_xClonedIterator;
@@ -209,21 +209,21 @@ class SVX_DLLPUBLIC FmSearchEngine
// The link we broadcast the progress and the result to
Link m_aProgressHandler;
- sal_Bool m_bSearchingCurrently : 1; // is an (asynchronous) search running?
- sal_Bool m_bCancelAsynchRequest : 1; // should be cancelled?
+ bool m_bSearchingCurrently : 1; // is an (asynchronous) search running?
+ bool m_bCancelAsynchRequest : 1; // should be cancelled?
::osl::Mutex m_aCancelAsynchAccess; // access to_bCancelAsynchRequest (technically only
// relevant for m_eMode == SM_USETHREAD)
FMSEARCH_MODE m_eMode; // current mode
// parameters for the search
- sal_Bool m_bFormatter : 1; // use field formatting
- sal_Bool m_bForward : 1; // direction
- sal_Bool m_bWildcard : 1; // wildcard search
- sal_Bool m_bRegular : 1; // regular expression
- sal_Bool m_bLevenshtein : 1; // Levenshtein search
- sal_Bool m_bTransliteration : 1; // Levenshtein search
-
- sal_Bool m_bLevRelaxed : 1; // parameters for Levenshtein search
+ bool m_bFormatter : 1; // use field formatting
+ bool m_bForward : 1; // direction
+ bool m_bWildcard : 1; // wildcard search
+ bool m_bRegular : 1; // regular expression
+ bool m_bLevenshtein : 1; // Levenshtein search
+ bool m_bTransliteration : 1; // Levenshtein search
+
+ bool m_bLevRelaxed : 1; // parameters for Levenshtein search
sal_uInt16 m_nLevOther;
sal_uInt16 m_nLevShorter;
sal_uInt16 m_nLevLonger;
@@ -235,35 +235,35 @@ class SVX_DLLPUBLIC FmSearchEngine
// member access
private:
- SVX_DLLPRIVATE sal_Bool CancelRequested(); // provides a through m_aCancelAsynchAccess backed interpretation of m_bCancelAsynchRequest
+ SVX_DLLPRIVATE bool CancelRequested(); // provides a through m_aCancelAsynchAccess backed interpretation of m_bCancelAsynchRequest
public:
- void SetCaseSensitive(sal_Bool bSet);
- sal_Bool GetCaseSensitive() const;
+ void SetCaseSensitive(bool bSet);
+ bool GetCaseSensitive() const;
- void SetFormatterUsing(sal_Bool bSet); // this is somewhat more extensive, so no inline ... here
- sal_Bool GetFormatterUsing() const { return m_bFormatter; }
+ void SetFormatterUsing(bool bSet); // this is somewhat more extensive, so no inline ... here
+ bool GetFormatterUsing() const { return m_bFormatter; }
- void SetDirection(sal_Bool bForward) { m_bForward = bForward; }
- sal_Bool GetDirection() const { return m_bForward; }
+ void SetDirection(bool bForward) { m_bForward = bForward; }
+ bool GetDirection() const { return m_bForward; }
- void SetWildcard(sal_Bool bSet) { m_bWildcard = bSet; }
- sal_Bool GetWildcard() const { return m_bWildcard; }
+ void SetWildcard(bool bSet) { m_bWildcard = bSet; }
+ bool GetWildcard() const { return m_bWildcard; }
- void SetRegular(sal_Bool bSet) { m_bRegular = bSet; }
- sal_Bool GetRegular() const { return m_bRegular; }
+ void SetRegular(bool bSet) { m_bRegular = bSet; }
+ bool GetRegular() const { return m_bRegular; }
- void SetLevenshtein(sal_Bool bSet) { m_bLevenshtein = bSet; }
- sal_Bool GetLevenshtein() const { return m_bLevenshtein; }
+ void SetLevenshtein(bool bSet) { m_bLevenshtein = bSet; }
+ bool GetLevenshtein() const { return m_bLevenshtein; }
- void SetIgnoreWidthCJK(sal_Bool bSet);
- sal_Bool GetIgnoreWidthCJK() const;
+ void SetIgnoreWidthCJK(bool bSet);
+ bool GetIgnoreWidthCJK() const;
- void SetTransliteration(sal_Bool bSet) { m_bTransliteration = bSet; }
- sal_Bool GetTransliteration() const { return m_bTransliteration; }
+ void SetTransliteration(bool bSet) { m_bTransliteration = bSet; }
+ bool GetTransliteration() const { return m_bTransliteration; }
- void SetLevRelaxed(sal_Bool bSet) { m_bLevRelaxed = bSet; }
- sal_Bool GetLevRelaxed() const { return m_bLevRelaxed; }
+ void SetLevRelaxed(bool bSet) { m_bLevRelaxed = bSet; }
+ bool GetLevRelaxed() const { return m_bLevRelaxed; }
void SetLevOther(sal_uInt16 nHowMuch) { m_nLevOther = nHowMuch; }
sal_uInt16 GetLevOther() const { return m_nLevOther; }
void SetLevShorter(sal_uInt16 nHowMuch) { m_nLevShorter = nHowMuch; }
@@ -314,11 +314,11 @@ public:
/// search for the next appearance (for nDirection values check DIRECTION_*-defines)
void SearchNext(const OUString& strExpression);
/// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL"
- void SearchNextSpecial(sal_Bool _bSearchForNull);
+ void SearchNextSpecial(bool _bSearchForNull);
/// search for the next appearance, dependent on nDirection from the start or end
void StartOver(const OUString& strExpression);
/// analogous, search for "NULL" (_bSearchForNull==sal_True) or "not NULL"
- void StartOverSpecial(sal_Bool _bSearchForNull);
+ void StartOverSpecial(bool _bSearchForNull);
/// invalidate previous search reference
void InvalidatePreviousLoc();
@@ -326,7 +326,7 @@ public:
if bForce is not set, nothing will happen in case of nFieldIndex == m_nCurrentFieldIndex
(calls InvalidatePreviousLoc)
*/
- void RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce = sal_False);
+ void RebuildUsedFields(sal_Int32 nFieldIndex, bool bForce = false);
OUString FormatField(sal_Int32 nWhich);
/// returns directly; once it was really aborted, ProgressHandler is called with STATE_CANCELED
@@ -335,7 +335,7 @@ public:
/** only valid, if not an (asynchronous) search is running, the next search will then be executed
on top of the new iterator with the new parameter
*/
- sal_Bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields,
+ bool SwitchToContext(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor, const OUString& strVisibleFields, const InterfaceArray& arrFields,
sal_Int32 nFieldIndex);
protected:
@@ -354,20 +354,20 @@ private:
// three methods implementing a complete search loop (null/not null, wildcard, SearchText)
// (they all have some code in common, but with this solution we have do do a distinction only once per search (before
// starting the loop), not in every loop step
- SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
+ SVX_DLLPRIVATE SEARCH_RESULT SearchSpecial(bool _bSearchForNull, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
SVX_DLLPRIVATE SEARCH_RESULT SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
SVX_DLLPRIVATE SEARCH_RESULT SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos, FieldCollection::iterator& iterFieldLoop,
const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
- SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow);
+ SVX_DLLPRIVATE void PropagateProgress(bool _bDontPropagateOverflow);
// call the ProgressHandler with STATE_PROGRESS and the current position of the search iterator
// helpers, that are needed several times
- SVX_DLLPRIVATE sal_Bool MoveCursor();
+ SVX_DLLPRIVATE bool MoveCursor();
// moves m_xSearchIterator with respect to direction/overflow cursor
- SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
+ SVX_DLLPRIVATE bool MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd);
// moves the iterator with respect to the direction/overflow iterator/overflow cursor
SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField);
// builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields
@@ -375,7 +375,7 @@ private:
SVX_DLLPRIVATE OUString FormatField(const FieldInfo& rField);
// formats the field with the NumberFormatter
- SVX_DLLPRIVATE sal_Bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); }
+ SVX_DLLPRIVATE bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); }
DECL_LINK(OnSearchTerminated, FmSearchThread*);
// is used by SearchThread, after the return from this handler the thread removes itself
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 1756cbc36b18..6a274ca1f9fc 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -104,8 +104,8 @@ private:
public:
// Construction/Destruction
CursorWrapper() { }
- CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned = sal_False);
- SVX_DLLPUBLIC CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned = sal_False);
+ CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, bool bUseCloned = false);
+ SVX_DLLPUBLIC CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned = false);
// if bUseCloned == sal_True, the cursor is first doubled over the XCloneable interface (which it must implement)
// and then used
@@ -114,8 +114,8 @@ public:
return lhs.m_xGeneric.get() == rhs.m_xGeneric.get();
}
- sal_Bool is() const { return m_xMoveOperations.is(); }
- sal_Bool Is() const { return m_xMoveOperations.is(); }
+ bool is() const { return m_xMoveOperations.is(); }
+ bool Is() const { return m_xMoveOperations.is(); }
CursorWrapper* operator ->() { return this; }
operator const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& () const{ return m_xGeneric; }
@@ -166,7 +166,7 @@ public:
// ::com::sun::star::sdbcx::XColumnsSupplier
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getColumns() const throw( ::com::sun::star::uno::RuntimeException ) { return m_xColumnsSupplier->getColumns(); }
private:
- void ImplConstruct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned);
+ void ImplConstruct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned);
};
@@ -212,7 +212,7 @@ sal_Int16 getControlTypeByObject(const ::com::sun::star::uno::Reference< :
// get the object type (OBJ_FM_...) from the services the object supports
-sal_Bool isRowSetAlive(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxRowSet);
+bool isRowSetAlive(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxRowSet);
// checks if the ::com::sun::star::sdbcx::XColumnsSupplier provided by _rxRowSet supllies any columns
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index af984addf64f..7770b138ca64 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -117,7 +117,7 @@ public:
@param _bForceSync
<TRUE/> if the handling should be done synchronously.
*/
- SVX_DLLPRIVATE void GrabFirstControlFocus( sal_Bool _bForceSync = sal_False );
+ SVX_DLLPRIVATE void GrabFirstControlFocus( bool _bForceSync = false );
/** returns the form controller for a given form and a given device
*/
@@ -133,9 +133,9 @@ public:
SVX_DLLPRIVATE void ActivateControls(SdrPageView*);
SVX_DLLPRIVATE void DeactivateControls(SdrPageView*);
- SVX_DLLPRIVATE void ChangeDesignMode(sal_Bool bDesign);
+ SVX_DLLPRIVATE void ChangeDesignMode(bool bDesign);
- SVX_DLLPRIVATE FmXFormView* GetImpl() const { return pImpl; }
+ SVX_DLLPRIVATE FmXFormView* GetImpl() const { return pImpl; }
SVX_DLLPRIVATE FmFormShell* GetFormShell() const { return pFormShell; }
struct FormShellAccess { friend class FmFormShell; private: FormShellAccess() { } };
@@ -150,7 +150,7 @@ public:
virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer);
SVX_DLLPRIVATE const OutputDevice* GetActualOutDev() const {return pActualOutDev;}
- SVX_DLLPRIVATE sal_Bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource);
+ SVX_DLLPRIVATE bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource);
private:
SVX_DLLPRIVATE void AdjustMarks(const SdrMarkList& rMarkList);
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index b8c5745e0481..b431c418a123 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -40,7 +40,7 @@ class SVX_DLLPUBLIC SvxFontPrevWindow : public Window
private:
FontPrevWin_Impl* pImpl;
- SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground );
+ SVX_DLLPRIVATE void InitSettings( bool bForeground, bool bBackground );
SVX_DLLPRIVATE void Init ();
SVX_DLLPRIVATE void SetFontSize(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
SVX_DLLPRIVATE void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 82d86c90104a..dd24f970c39a 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -1115,7 +1115,7 @@ sal_Bool DrawViewShell::IsSwitchPageAllowed() const
bool bOK = true;
FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell();
- if (pFormShell!=NULL && !pFormShell->PrepareClose (sal_False))
+ if (pFormShell != NULL && !pFormShell->PrepareClose(false))
bOK = false;
return bOK;
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index fd3fe884d8c3..5fbbf82dc9dc 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -466,7 +466,7 @@ void DrawViewShell::HidePage()
{
FmFormShell* pFormShell = GetViewShellBase().GetFormShellManager()->GetFormShell();
if (pFormShell != NULL)
- pFormShell->PrepareClose (sal_False);
+ pFormShell->PrepareClose(false);
}
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index ba2532d817d1..37b41ca06983 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -452,7 +452,7 @@ void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev )
// class SvxFontPrevWindow -----------------------------------------------
-void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
+void SvxFontPrevWindow::InitSettings( bool bForeground, bool bBackground )
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -495,7 +495,7 @@ void SvxFontPrevWindow::Init()
initFont(pImpl->aFont);
initFont(pImpl->aCJKFont);
initFont(pImpl->aCTLFont);
- InitSettings( sal_True, sal_True );
+ InitSettings( true, true );
SetBorderStyle( WINDOW_BORDER_MONO );
}
@@ -544,9 +544,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont()
void SvxFontPrevWindow::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
- InitSettings( sal_True, sal_False );
+ InitSettings( true, false );
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
- InitSettings( sal_False, sal_True );
+ InitSettings( false, true );
Window::StateChanged( nType );
Invalidate();
@@ -557,7 +557,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType )
void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
- InitSettings( sal_True, sal_True );
+ InitSettings( true, true );
else
Window::DataChanged( rDCEvt );
}
@@ -1187,7 +1187,7 @@ void SvxFontPrevWindow::Init( const SfxItemSet& rSet )
initFont(rFont);
initFont(rCJKFont);
initFont(rCTLFont);
- InitSettings( sal_True, sal_True );
+ InitSettings( true, true );
sal_uInt16 nWhich;
nWhich = rSet.GetPool()->GetWhich( SID_CHAR_DLG_PREVIEW_STRING );
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index f05aa25c969c..d62dd25807ec 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -225,7 +225,7 @@ SdrLayerID FmFormModel::GetControlExportLayerId( const SdrObject& rObj ) const
}
-void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _bForce )
+void FmFormModel::implSetOpenInDesignMode( bool _bOpenDesignMode, bool _bForce )
{
if( ( _bOpenDesignMode != m_bOpenInDesignMode ) || _bForce )
{
@@ -239,19 +239,19 @@ void FmFormModel::implSetOpenInDesignMode( sal_Bool _bOpenDesignMode, sal_Bool _
}
-void FmFormModel::SetOpenInDesignMode( sal_Bool bOpenDesignMode )
+void FmFormModel::SetOpenInDesignMode( bool bOpenDesignMode )
{
- implSetOpenInDesignMode( bOpenDesignMode, sal_False );
+ implSetOpenInDesignMode( bOpenDesignMode, false );
}
-sal_Bool FmFormModel::OpenInDesignModeIsDefaulted( )
+bool FmFormModel::OpenInDesignModeIsDefaulted( )
{
return m_pImpl->bOpenInDesignIsDefaulted;
}
-sal_Bool FmFormModel::ControlsUseRefDevice() const
+bool FmFormModel::ControlsUseRefDevice() const
{
if ( !m_pImpl->aControlsUseRefDevice )
{
@@ -264,7 +264,7 @@ sal_Bool FmFormModel::ControlsUseRefDevice() const
}
-void FmFormModel::SetAutoControlFocus( sal_Bool _bAutoControlFocus )
+void FmFormModel::SetAutoControlFocus( bool _bAutoControlFocus )
{
if( _bAutoControlFocus != m_bAutoControlFocus )
{
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index a8fff4d7569c..b336f9c5f9ac 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -151,7 +151,7 @@ using namespace ::svxform;
TYPEINIT1( FmDesignModeChangedHint, SfxHint );
-FmDesignModeChangedHint::FmDesignModeChangedHint( sal_Bool bDesMode )
+FmDesignModeChangedHint::FmDesignModeChangedHint( bool bDesMode )
:m_bDesignMode( bDesMode )
{
}
@@ -247,7 +247,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView)
}
-bool FmFormShell::PrepareClose(sal_Bool bUI)
+bool FmFormShell::PrepareClose(bool bUI)
{
if ( GetImpl()->didPrepareClose() )
// we already did a PrepareClose for the current modifications of the current form
@@ -300,7 +300,7 @@ bool FmFormShell::PrepareClose(sal_Bool bUI)
}
-void FmFormShell::impl_setDesignMode(sal_Bool bDesign)
+void FmFormShell::impl_setDesignMode(bool bDesign)
{
if (m_pFormView)
{
@@ -1226,7 +1226,7 @@ void FmFormShell::SetView( FmFormView* _pView )
}
-void FmFormShell::DetermineForms(sal_Bool bInvalidate)
+void FmFormShell::DetermineForms(bool bInvalidate)
{
// Existieren Formulare auf der aktuellen Page
bool bForms = GetImpl()->hasForms();
@@ -1239,7 +1239,7 @@ void FmFormShell::DetermineForms(sal_Bool bInvalidate)
}
-sal_Bool FmFormShell::GetY2KState(sal_uInt16& nReturn)
+bool FmFormShell::GetY2KState(sal_uInt16& nReturn)
{
return GetImpl()->GetY2KState(nReturn);
}
@@ -1464,7 +1464,7 @@ void FmFormShell::SetDesignMode( bool _bDesignMode )
pModel->GetUndoEnv().Lock();
// dann die eigentliche Umschaltung
- if ( m_bDesignMode || PrepareClose( sal_True ) )
+ if ( m_bDesignMode || PrepareClose( true ) )
impl_setDesignMode(!m_bDesignMode );
// und mein Undo-Environment wieder an
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index a9f4eaf14c92..bbf114779726 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -481,18 +481,18 @@ namespace
// check if the control has one of the interfaces we can use for searching
// *_pCurrentText will be filled with the current text of the control (as used when searching this control)
-sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl,
+bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl,
OUString* _pCurrentText )
{
if ( !_rxControl.is() )
- return sal_False;
+ return false;
Reference< XTextComponent > xAsText( _rxControl, UNO_QUERY );
if ( xAsText.is() )
{
if ( _pCurrentText )
*_pCurrentText = xAsText->getText();
- return sal_True;
+ return true;
}
Reference< XListBox > xListBox( _rxControl, UNO_QUERY );
@@ -500,7 +500,7 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
{
if ( _pCurrentText )
*_pCurrentText = xListBox->getSelectedItem();
- return sal_True;
+ return true;
}
Reference< XCheckBox > xCheckBox( _rxControl, UNO_QUERY );
@@ -515,10 +515,10 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
default: *_pCurrentText = ""; break;
}
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
@@ -2558,7 +2558,7 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::
Reference< XInterface> xTemp;
evt.Element >>= xTemp;
AddElement(xTemp);
- m_pShell->DetermineForms(sal_True);
+ m_pShell->DetermineForms(true);
}
@@ -2583,7 +2583,7 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s
Reference< XInterface> xTemp;
evt.Element >>= xTemp;
RemoveElement(xTemp);
- m_pShell->DetermineForms(sal_True);
+ m_pShell->DetermineForms(true);
}
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index a013b3b47dbb..d17ce0dad407 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -35,14 +35,14 @@ namespace svxform
,nLevOther ( 2 )
,nLevShorter ( 2 )
,nLevLonger ( 2 )
- ,bLevRelaxed ( sal_True )
- ,bAllFields ( sal_False )
- ,bUseFormatter ( sal_True )
- ,bBackwards ( sal_False )
- ,bWildcard ( sal_False )
- ,bRegular ( sal_False )
- ,bApproxSearch ( sal_False )
- ,bSoundsLikeCJK ( sal_False )
+ ,bLevRelaxed ( true )
+ ,bAllFields ( false )
+ ,bUseFormatter ( true )
+ ,bBackwards ( false )
+ ,bWildcard ( false )
+ ,bRegular ( false )
+ ,bApproxSearch ( false )
+ ,bSoundsLikeCJK ( false )
{
nTransliterationFlags =
TransliterationModules_ignoreSpace_ja_JP
@@ -52,17 +52,17 @@ namespace svxform
| TransliterationModules_IGNORE_CASE;
}
- sal_Bool FmSearchParams::isIgnoreWidthCJK( ) const
+ bool FmSearchParams::isIgnoreWidthCJK( ) const
{
return 0 != (nTransliterationFlags & TransliterationModules_IGNORE_WIDTH);
}
- sal_Bool FmSearchParams::isCaseSensitive( ) const
+ bool FmSearchParams::isCaseSensitive( ) const
{
return 0 == (nTransliterationFlags & TransliterationModules_IGNORE_CASE);
}
- void FmSearchParams::setCaseSensitive( sal_Bool _bCase )
+ void FmSearchParams::setCaseSensitive( bool _bCase )
{
if ( _bCase )
nTransliterationFlags &= ~TransliterationModules_IGNORE_CASE;
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 0d15c2b36393..2d524fdebc0b 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -208,9 +208,9 @@ OUString CheckBoxWrapper::getCurrentText() const
// = FmSearchEngine
-sal_Bool FmSearchEngine::MoveCursor()
+bool FmSearchEngine::MoveCursor()
{
- sal_Bool bSuccess = sal_True;
+ bool bSuccess = true;
try
{
if (m_bForward)
@@ -243,7 +243,7 @@ sal_Bool FmSearchEngine::MoveCursor()
#else
(void)e;
#endif
- bSuccess = sal_False;
+ bSuccess = false;
}
catch(Exception const& e)
{
@@ -255,21 +255,21 @@ sal_Bool FmSearchEngine::MoveCursor()
#else
(void)e;
#endif
- bSuccess = sal_False;
+ bSuccess = false;
}
catch(...)
{
OSL_FAIL("FmSearchEngine::MoveCursor : catched an unknown Exception !");
- bSuccess = sal_False;
+ bSuccess = false;
}
return bSuccess;
}
-sal_Bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
+bool FmSearchEngine::MoveField(sal_Int32& nPos, FieldCollection::iterator& iter, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
{
- sal_Bool bSuccess(sal_True);
+ bool bSuccess(true);
if (m_bForward)
{
++iter;
@@ -312,7 +312,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::
FieldInfo fiCurrent;
fiCurrent.xContents = Reference< ::com::sun::star::sdb::XColumn > (xCurrentField, UNO_QUERY);
fiCurrent.nFormatKey = ::comphelper::getINT32(xProperties->getPropertyValue(FM_PROP_FORMATKEY));
- fiCurrent.bDoubleHandling = sal_False;
+ fiCurrent.bDoubleHandling = false;
if (m_xFormatSupplier.is())
{
Reference< ::com::sun::star::util::XNumberFormats > xNumberFormats(m_xFormatSupplier->getNumberFormats());
@@ -395,7 +395,7 @@ OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
}
-FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchForNull, sal_Int32& nFieldPos,
+FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(bool _bSearchForNull, sal_Int32& nFieldPos,
FieldCollection::iterator& iterFieldLoop, const FieldCollection::iterator& iterBegin, const FieldCollection::iterator& iterEnd)
{
// die Startposition merken
@@ -405,8 +405,8 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
FieldCollection::iterator iterInitialField = iterFieldLoop;
- sal_Bool bFound(sal_False);
- sal_Bool bMovedAround(sal_False);
+ bool bFound(false);
+ bool bMovedAround(false);
do
{
if (m_eMode == SM_ALLOWSCHEDULE)
@@ -422,7 +422,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
// der aktuell zu vergleichende Inhalt
iterFieldLoop->xContents->getString(); // needed for wasNull
- bFound = _bSearchForNull == iterFieldLoop->xContents->wasNull();
+ bFound = (_bSearchForNull ? 1 : 0) == iterFieldLoop->xContents->wasNull();
if (bFound)
break;
@@ -673,19 +673,19 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() )
,m_aStringCompare( _rxContext )
,m_nCurrentFieldIndex(-2) // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig'
- ,m_bUsingTextComponents(sal_False)
+ ,m_bUsingTextComponents(false)
,m_eSearchForType(SEARCHFOR_STRING)
,m_srResult(SR_FOUND)
- ,m_bSearchingCurrently(sal_False)
- ,m_bCancelAsynchRequest(sal_False)
+ ,m_bSearchingCurrently(false)
+ ,m_bCancelAsynchRequest(false)
,m_eMode(eMode)
- ,m_bFormatter(sal_False)
- ,m_bForward(sal_False)
- ,m_bWildcard(sal_False)
- ,m_bRegular(sal_False)
- ,m_bLevenshtein(sal_False)
- ,m_bTransliteration(sal_False)
- ,m_bLevRelaxed(sal_False)
+ ,m_bFormatter(false)
+ ,m_bForward(false)
+ ,m_bWildcard(false)
+ ,m_bRegular(false)
+ ,m_bLevenshtein(false)
+ ,m_bTransliteration(false)
+ ,m_bLevRelaxed(false)
,m_nLevOther(0)
,m_nLevShorter(0)
,m_nLevLonger(0)
@@ -709,21 +709,21 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() )
,m_aStringCompare( _rxContext )
,m_nCurrentFieldIndex(-2) // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig'
- ,m_bUsingTextComponents(sal_True)
+ ,m_bUsingTextComponents(true)
,m_xOriginalIterator(xCursor)
- ,m_xClonedIterator(m_xOriginalIterator, sal_True)
+ ,m_xClonedIterator(m_xOriginalIterator, true)
,m_eSearchForType(SEARCHFOR_STRING)
,m_srResult(SR_FOUND)
- ,m_bSearchingCurrently(sal_False)
- ,m_bCancelAsynchRequest(sal_False)
+ ,m_bSearchingCurrently(false)
+ ,m_bCancelAsynchRequest(false)
,m_eMode(eMode)
- ,m_bFormatter(sal_True) // das muss konsistent sein mit m_xSearchCursor, der i.A. == m_xOriginalIterator ist
- ,m_bForward(sal_False)
- ,m_bWildcard(sal_False)
- ,m_bRegular(sal_False)
- ,m_bLevenshtein(sal_False)
- ,m_bTransliteration(sal_False)
- ,m_bLevRelaxed(sal_False)
+ ,m_bFormatter(true) // das muss konsistent sein mit m_xSearchCursor, der i.A. == m_xOriginalIterator ist
+ ,m_bForward(false)
+ ,m_bWildcard(false)
+ ,m_bRegular(false)
+ ,m_bLevenshtein(false)
+ ,m_bTransliteration(false)
+ ,m_bLevRelaxed(false)
,m_nLevOther(0)
,m_nLevShorter(0)
,m_nLevLonger(0)
@@ -743,7 +743,7 @@ FmSearchEngine::~FmSearchEngine()
}
-void FmSearchEngine::SetIgnoreWidthCJK(sal_Bool bSet)
+void FmSearchEngine::SetIgnoreWidthCJK(bool bSet)
{
if (bSet)
m_nTransliterationFlags |= TransliterationModules_IGNORE_WIDTH;
@@ -752,13 +752,13 @@ void FmSearchEngine::SetIgnoreWidthCJK(sal_Bool bSet)
}
-sal_Bool FmSearchEngine::GetIgnoreWidthCJK() const
+bool FmSearchEngine::GetIgnoreWidthCJK() const
{
return 0 != (m_nTransliterationFlags & TransliterationModules_IGNORE_WIDTH);
}
-void FmSearchEngine::SetCaseSensitive(sal_Bool bSet)
+void FmSearchEngine::SetCaseSensitive(bool bSet)
{
if (bSet)
m_nTransliterationFlags &= ~TransliterationModules_IGNORE_CASE;
@@ -767,7 +767,7 @@ void FmSearchEngine::SetCaseSensitive(sal_Bool bSet)
}
-sal_Bool FmSearchEngine::GetCaseSensitive() const
+bool FmSearchEngine::GetCaseSensitive() const
{
return 0 == (m_nTransliterationFlags & TransliterationModules_IGNORE_CASE);
}
@@ -898,7 +898,7 @@ void FmSearchEngine::Init(const OUString& sVisibleFields)
}
-void FmSearchEngine::SetFormatterUsing(sal_Bool bSet)
+void FmSearchEngine::SetFormatterUsing(bool bSet)
{
if (m_bFormatter == bSet)
return;
@@ -930,14 +930,14 @@ void FmSearchEngine::SetFormatterUsing(sal_Bool bSet)
// ich muss die Fields neu binden, da der Textaustausch eventuell ueber diese Fields erfolgt und sich der unterliegende Cursor
// geaendert hat
- RebuildUsedFields(m_nCurrentFieldIndex, sal_True);
+ RebuildUsedFields(m_nCurrentFieldIndex, true);
}
else
InvalidatePreviousLoc();
}
-void FmSearchEngine::PropagateProgress(sal_Bool _bDontPropagateOverflow)
+void FmSearchEngine::PropagateProgress(bool _bDontPropagateOverflow)
{
if (m_aProgressHandler.IsSet())
{
@@ -1034,7 +1034,7 @@ void FmSearchEngine::SearchNextImpl()
nFieldPos = iterFieldCheck - iterBegin;
}
- PropagateProgress(sal_True);
+ PropagateProgress(true);
SEARCH_RESULT srResult;
if (m_eSearchForType != SEARCHFOR_STRING)
srResult = SearchSpecial(m_eSearchForType == SEARCHFOR_NULL, nFieldPos, iterFieldCheck, iterBegin, iterEnd);
@@ -1099,7 +1099,7 @@ IMPL_LINK(FmSearchEngine, OnSearchTerminated, FmSearchThread*, /*pThread*/)
// per definitionem muss der Link Thread-sicher sein (das verlange ich einfach), so dass ich mich um so etwas hier nicht kuemmern muss
m_aProgressHandler.Call(&aProgress);
- m_bSearchingCurrently = sal_False;
+ m_bSearchingCurrently = false;
return 0L;
}
@@ -1118,10 +1118,10 @@ IMPL_LINK(FmSearchEngine, OnNewRecordCount, void*, pCounterAsVoid)
}
-sal_Bool FmSearchEngine::CancelRequested()
+bool FmSearchEngine::CancelRequested()
{
m_aCancelAsynchAccess.acquire();
- sal_Bool bReturn = m_bCancelAsynchRequest;
+ bool bReturn = m_bCancelAsynchRequest;
m_aCancelAsynchAccess.release();
return bReturn;
}
@@ -1130,36 +1130,36 @@ sal_Bool FmSearchEngine::CancelRequested()
void FmSearchEngine::CancelSearch()
{
m_aCancelAsynchAccess.acquire();
- m_bCancelAsynchRequest = sal_True;
+ m_bCancelAsynchRequest = true;
m_aCancelAsynchAccess.release();
}
-sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields,
+bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields,
sal_Int32 nFieldIndex)
{
DBG_ASSERT(!m_bSearchingCurrently, "FmSearchEngine::SwitchToContext : please do not call while I'm searching !");
if (m_bSearchingCurrently)
- return sal_False;
+ return false;
m_xSearchCursor = xCursor;
m_xOriginalIterator = xCursor;
- m_xClonedIterator = CursorWrapper(m_xOriginalIterator, sal_True);
- m_bUsingTextComponents = sal_True;
+ m_xClonedIterator = CursorWrapper(m_xOriginalIterator, true);
+ m_bUsingTextComponents = true;
fillControlTexts(arrFields);
Init(sVisibleFields);
- RebuildUsedFields(nFieldIndex, sal_True);
+ RebuildUsedFields(nFieldIndex, true);
- return sal_True;
+ return true;
}
void FmSearchEngine::ImplStartNextSearch()
{
- m_bCancelAsynchRequest = sal_False;
- m_bSearchingCurrently = sal_True;
+ m_bCancelAsynchRequest = false;
+ m_bSearchingCurrently = true;
if (m_eMode == SM_USETHREAD)
{
@@ -1187,7 +1187,7 @@ void FmSearchEngine::SearchNext(const OUString& strExpression)
}
-void FmSearchEngine::SearchNextSpecial(sal_Bool _bSearchForNull)
+void FmSearchEngine::SearchNextSpecial(bool _bSearchForNull)
{
m_eSearchForType = _bSearchForNull ? SEARCHFOR_NULL : SEARCHFOR_NOTNULL;
ImplStartNextSearch();
@@ -1214,7 +1214,7 @@ void FmSearchEngine::StartOver(const OUString& strExpression)
}
-void FmSearchEngine::StartOverSpecial(sal_Bool _bSearchForNull)
+void FmSearchEngine::StartOverSpecial(bool _bSearchForNull)
{
try
{
@@ -1241,7 +1241,7 @@ void FmSearchEngine::InvalidatePreviousLoc()
}
-void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce)
+void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, bool bForce)
{
if (!bForce && (nFieldIndex == m_nCurrentFieldIndex))
return;
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index a1d4af6b1981..73459db395a7 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -225,19 +225,19 @@ OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& x
// = CursorWrapper
-CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned)
+CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, bool bUseCloned)
{
ImplConstruct(Reference< ::com::sun::star::sdbc::XResultSet>(_rxCursor, UNO_QUERY), bUseCloned);
}
-CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned)
+CursorWrapper::CursorWrapper(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned)
{
ImplConstruct(_rxCursor, bUseCloned);
}
-void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned)
+void CursorWrapper::ImplConstruct(const Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, bool bUseCloned)
{
if (bUseCloned)
{
@@ -430,15 +430,15 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
}
-sal_Bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
+bool isRowSetAlive(const Reference< XInterface >& _rxRowSet)
{
- sal_Bool bIsAlive = sal_False;
+ bool bIsAlive = false;
Reference< ::com::sun::star::sdbcx::XColumnsSupplier> xSupplyCols(_rxRowSet, UNO_QUERY);
Reference< ::com::sun::star::container::XIndexAccess> xCols;
if (xSupplyCols.is())
xCols = Reference< ::com::sun::star::container::XIndexAccess>(xSupplyCols->getColumns(), UNO_QUERY);
if (xCols.is() && (xCols->getCount() > 0))
- bIsAlive = sal_True;
+ bIsAlive = true;
return bIsAlive;
}
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index dcc9a8277282..0a2c7329c2e6 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -227,9 +227,9 @@ void FmFormView::DeleteWindowFromPaintView(OutputDevice* pNewWin)
}
-void FmFormView::ChangeDesignMode(sal_Bool bDesign)
+void FmFormView::ChangeDesignMode(bool bDesign)
{
- if (bDesign == IsDesignMode())
+ if ((bDesign ? 1 : 0) == IsDesignMode())
return;
FmFormModel* pModel = PTR_CAST(FmFormModel, GetModel());
@@ -314,7 +314,7 @@ void FmFormView::ChangeDesignMode(sal_Bool bDesign)
}
-void FmFormView::GrabFirstControlFocus( sal_Bool _bForceSync )
+void FmFormView::GrabFirstControlFocus( bool _bForceSync )
{
if ( !IsDesignMode() )
pImpl->AutoFocus( _bForceSync );
@@ -540,10 +540,10 @@ sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
return bDone;
}
-sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
+bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
{
Reference< ::com::sun::star::awt::XControl> xControl(pImpl->m_xWindow,UNO_QUERY);
- sal_Bool bRet = !xControl.is() || !_xSource.is() || _xSource != xControl->getModel();
+ bool bRet = !xControl.is() || !_xSource.is() || _xSource != xControl->getModel();
if ( bRet )
UnmarkAll();
generated by cgit (git 2.34.1) at 2025-03-12 20:32:04 +0000