summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-28 14:13:18 +0200
committerNoel Grandin <noel@peralex.com>2014-03-31 12:39:01 +0200
commitf907d740351886194bf2c9bcffceed22c4698ca5 (patch)
treef331d31592b38c1e8ab987787713fc7c99499042
parentba6cfaaa6b5012875bc68d24519f4e658f7fe0e0 (diff)
xmloff: sal_Bool->bool
Change-Id: Ib8c99a646923257647487cd7f121023876587cd2
-rw-r--r--include/xmloff/txtimp.hxx42
-rw-r--r--include/xmloff/txtparae.hxx170
-rw-r--r--include/xmloff/txtstyli.hxx18
-rw-r--r--include/xmloff/uniref.hxx12
-rw-r--r--sw/source/filter/xml/xmlexp.cxx2
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx2
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx4
-rw-r--r--sw/source/filter/xml/xmlimp.cxx4
-rw-r--r--sw/source/filter/xml/xmltble.cxx2
-rw-r--r--sw/source/filter/xml/xmltbli.cxx6
-rw-r--r--sw/source/filter/xml/xmltext.cxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx2
-rw-r--r--sw/source/filter/xml/xmltexte.hxx2
-rw-r--r--sw/source/filter/xml/xmltexti.cxx16
-rw-r--r--sw/source/filter/xml/xmltexti.hxx17
-rw-r--r--xmloff/inc/txtfldi.hxx6
-rw-r--r--xmloff/inc/txtvfldi.hxx2
-rw-r--r--xmloff/source/text/XMLChangeImportContext.cxx4
-rw-r--r--xmloff/source/text/XMLIndexTOCContext.cxx5
-rw-r--r--xmloff/source/text/XMLSectionImportContext.cxx4
-rw-r--r--xmloff/source/text/XMLTextMasterPageExport.cxx4
-rw-r--r--xmloff/source/text/txtflde.cxx6
-rw-r--r--xmloff/source/text/txtfldi.cxx6
-rw-r--r--xmloff/source/text/txtftne.cxx24
-rw-r--r--xmloff/source/text/txtimp.cxx50
-rw-r--r--xmloff/source/text/txtparae.cxx192
-rw-r--r--xmloff/source/text/txtparai.cxx84
-rw-r--r--xmloff/source/text/txtparai.hxx2
-rw-r--r--xmloff/source/text/txtsecte.cxx6
-rw-r--r--xmloff/source/text/txtstyle.cxx4
-rw-r--r--xmloff/source/text/txtstyli.cxx16
-rw-r--r--xmloff/source/text/txtvfldi.cxx2
32 files changed, 358 insertions, 360 deletions
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index b562dafced7f..ff4ca249683a 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -442,15 +442,15 @@ public:
bool IsProgress() const;
OUString ConvertStarFonts( const OUString& rChars,
- const OUString& rStyleName,
- sal_uInt8& rFlags,
- sal_Bool bPara,
- SvXMLImport& rImport ) const;
+ const OUString& rStyleName,
+ sal_uInt8& rFlags,
+ bool bPara,
+ SvXMLImport& rImport ) const;
// insert a string without special whitespace processing enabled
void InsertString( const OUString& rChars );
// insert a string with special whitespace processing enabled
void InsertString( const OUString& rChars,
- sal_Bool& rIgnoreLeadingSpace );
+ bool& rIgnoreLeadingSpace );
// Delete current paragraph
void DeleteParagraph();
@@ -465,10 +465,10 @@ public:
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextCursor >& rCursor,
const OUString& rStyleName,
- sal_Bool bPara,
- sal_Bool bOutlineLevelAttrFound = sal_False,
+ bool bPara,
+ bool bOutlineLevelAttrFound = false,
sal_Int8 nOutlineLevel = -1,
- sal_Bool bSetListAttrs = sal_True );
+ bool bSetListAttrs = true );
/** Find a suitable name for the given outline level.
* If rStyleName is empty, change it to a previously used or default style
@@ -482,7 +482,7 @@ public:
void AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel,
const OUString& rStyleName );
- void SetOutlineStyles( sal_Bool bSetEmpty );
+ void SetOutlineStyles( bool bSetEmpty );
void SetHyperlink(
SvXMLImport& rImport,
@@ -506,7 +506,7 @@ public:
/// return -1 if style is not found
/// (may return whether data style uses the system language)
sal_Int32 GetDataStyleKey( const OUString& sStyleName,
- sal_Bool* pIsSystemLanguage = NULL );
+ bool* pIsSystemLanguage = NULL );
const SvxXMLListStyleContext *FindAutoListStyle(
const OUString& rName ) const;
@@ -537,7 +537,7 @@ public:
::com::sun::star::container::XIndexReplace > &
GetChapterNumbering() const;
- sal_Bool HasFrameByName( const OUString& rName ) const;
+ bool HasFrameByName( const OUString& rName ) const;
void ConnectFrameChains( const OUString& rFrmName,
const OUString& rNextFrmName,
const ::com::sun::star::uno::Reference <
@@ -570,7 +570,7 @@ public:
i_rpRDFaAttributes);
/// process the start of a range reference
- sal_Bool FindAndRemoveBookmarkStartRange(
+ bool FindAndRemoveBookmarkStartRange(
const OUString & sName,
::com::sun::star::uno::Reference<
::com::sun::star::text::XTextRange> & o_rRange,
@@ -615,8 +615,8 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropSet);
- sal_Bool IsInFrame() const;
- virtual sal_Bool IsInHeaderFooter() const;
+ bool IsInFrame() const;
+ virtual bool IsInHeaderFooter() const;
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet>
@@ -639,7 +639,7 @@ public:
createAndInsertApplet(
const OUString &rName,
const OUString &rCode,
- sal_Bool bMayScript,
+ bool bMayScript,
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight );
@@ -681,7 +681,7 @@ public:
/// date+time
const ::com::sun::star::util::DateTime& rDateTime,
/// merge last paras
- sal_Bool bMergeLastParagraph);
+ bool bMergeLastParagraph);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> RedlineCreateText(
@@ -694,13 +694,13 @@ public:
/// ID used to RedlineAdd() call
const OUString& rId,
/// start or end Cursor
- sal_Bool bStart,
+ bool bStart,
/// range is not within <text:p>
- sal_Bool bIsOutsideOfParagraph);
+ bool bIsOutsideOfParagraph);
- virtual void RedlineAdjustStartNodeCursor( sal_Bool bStart );
- virtual void SetShowChanges( sal_Bool bShowChanges );
- virtual void SetRecordChanges( sal_Bool bRecordChanges );
+ virtual void RedlineAdjustStartNodeCursor( bool bStart );
+ virtual void SetShowChanges( bool bShowChanges );
+ virtual void SetRecordChanges( bool bRecordChanges );
virtual void SetChangesProtectionKey(
const ::com::sun::star::uno::Sequence<sal_Int8> & rProtectionKey );
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index da1ae7df3b0d..ff4037420f12 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -88,14 +88,14 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
XMLRedlineExport *pRedlineExport;
std::vector<OUString> *pHeadingStyles;
- sal_Bool bProgress;
+ bool bProgress;
- sal_Bool bBlock;
+ bool bBlock;
// keep track of open rubies
- OUString sOpenRubyText;
- OUString sOpenRubyCharStyle;
- sal_Bool bOpenRuby;
+ OUString sOpenRubyText;
+ OUString sOpenRubyCharStyle;
+ bool bOpenRuby;
XMLTextListsHelper* mpTextListsHelper;
::std::vector< XMLTextListsHelper* > maTextListsHelperStack;
@@ -110,8 +110,8 @@ public:
const ::com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xPropSet,
::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySetInfo > & xPropSetInfo,
- const sal_Bool bIsUICharStyle,
- const sal_Bool bHasAutoStyle,
+ const bool bIsUICharStyle,
+ const bool bHasAutoStyle,
const OUString& sStyle,
bool& rPrevCharIsSpace,
FieldmarkType& openFieldMark);
@@ -241,11 +241,11 @@ public:
OUString FindTextStyleAndHyperlink(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
- sal_Bool& rbHyperlink,
- sal_Bool& rbHasCharStyle,
- sal_Bool& rbHasAutoStyle,
+ bool& rbHyperlink,
+ bool& rbHasCharStyle,
+ bool& rbHasAutoStyle,
const XMLPropertyState** pAddState = NULL) const;
- sal_Bool addHyperlinkAttributes(
+ bool addHyperlinkAttributes(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
const ::com::sun::star::uno::Reference <
@@ -256,15 +256,15 @@ public:
void exportTextRangeEnumeration(
const ::com::sun::star::uno::Reference <
::com::sun::star::container::XEnumeration > & rRangeEnum,
- sal_Bool bAutoStyles, sal_Bool bProgress,
- sal_Bool bPrvChrIsSpc = sal_True );
+ bool bAutoStyles, bool bProgress,
+ bool bPrvChrIsSpc = true );
protected:
sal_Int32 addTextFrameAttributes(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet,
- sal_Bool bShape,
+ bool bShape,
OUString *pMinHeightValue = 0,
OUString *pMinWidthValue = 0 );
@@ -272,63 +272,63 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::style::XStyle > & rStyle ) SAL_OVERRIDE;
- void exportPageFrames( sal_Bool bAutoStyles, sal_Bool bProgress );
- void exportFrameFrames( sal_Bool bAutoStyles, sal_Bool bProgress,
+ void exportPageFrames( bool bAutoStyles, bool bProgress );
+ void exportFrameFrames( bool bAutoStyles, bool bProgress,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextFrame > *pParentTxtFrame = 0 );
- void exportNumStyles( sal_Bool bUsed );
+ void exportNumStyles( bool bUsed );
void exportText(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
- sal_Bool bAutoStyles, sal_Bool bProgress, sal_Bool bExportParagraph );
+ bool bAutoStyles, bool bProgress, bool bExportParagraph );
void exportText(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rBaseSection,
- sal_Bool bAutoStyles, sal_Bool bProgress, sal_Bool bExportParagraph );
+ bool bAutoStyles, bool bProgress, bool bExportParagraph );
- sal_Bool exportTextContentEnumeration(
+ bool exportTextContentEnumeration(
const ::com::sun::star::uno::Reference <
::com::sun::star::container::XEnumeration > & rContentEnum,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rBaseSection,
- sal_Bool bProgress,
- sal_Bool bExportParagraph = sal_True,
+ bool bProgress,
+ bool bExportParagraph = true,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0,
- sal_Bool bExportLevels = sal_True );
+ bool bExportLevels = true );
void exportParagraph(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress,
- sal_Bool bExportParagraph,
+ bool bAutoStyles, bool bProgress,
+ bool bExportParagraph,
MultiPropertySetHelper& rPropSetHelper);
virtual void exportTable(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress );
+ bool bAutoStyles, bool bProgress );
void exportTextField(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextRange > & rTextRange,
- sal_Bool bAutoStyles, sal_Bool bProgress );
+ bool bAutoStyles, bool bProgress );
void exportTextField(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextField> & xTextField,
- const sal_Bool bAutoStyles, const sal_Bool bProgress,
- const sal_Bool bRecursive );
+ const bool bAutoStyles, const bool bProgress,
+ const bool bRecursive );
void exportAnyTextFrame(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
FrameType eTxpe,
- sal_Bool bAutoStyles, sal_Bool bProgress, sal_Bool bExportContent,
+ bool bAutoStyles, bool bProgress, bool bExportContent,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
void _exportTextFrame(
@@ -336,17 +336,17 @@ protected:
::com::sun::star::beans::XPropertySet > & rPropSet,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySetInfo > & rPropSetInfo,
- sal_Bool bProgress );
+ bool bProgress );
inline void exportTextFrame(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress, sal_Bool bExportContent,
+ bool bAutoStyles, bool bProgress, bool bExportContent,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
inline void exportShape(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
@@ -363,7 +363,7 @@ protected:
inline void exportTextGraphic(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
@@ -378,7 +378,7 @@ protected:
inline void exportTextEmbedded(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet = 0 );
virtual void setTextEmbeddedGraphicURL(
@@ -391,7 +391,7 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet,
const OUString& sString,
- sal_Bool bAutoStyles, sal_Bool bProgress );
+ bool bAutoStyles, bool bProgress );
/// helper for exportTextFootnote
void exportTextFootnoteHelper(
@@ -400,8 +400,8 @@ protected:
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XText> & rText,
const OUString& sString,
- sal_Bool bAutoStyles,
- sal_Bool bIsEndnote, sal_Bool bProgress );
+ bool bAutoStyles,
+ bool bIsEndnote, bool bProgress );
/// export footnote and endnote configuration elements
void exportTextFootnoteConfiguration();
@@ -409,29 +409,29 @@ protected:
void exportTextFootnoteConfigurationHelper(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rFootnoteSupplier,
- sal_Bool bIsEndnote);
+ bool bIsEndnote);
void exportTextMark(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropSet,
const OUString& rProperty,
const enum ::xmloff::token::XMLTokenEnum pElements[],
- sal_Bool bAutoStyles);
+ bool bAutoStyles);
void exportIndexMark(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet,
- sal_Bool bAutoStyles);
+ bool bAutoStyles);
void exportSoftPageBreak(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPropSet,
- sal_Bool bAutoStyles);
+ bool bAutoStyles);
void exportTextRange(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextRange > & rTextRange,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
bool& rPrevCharWasSpace,
FieldmarkType& openFieldmarkType );
@@ -447,7 +447,7 @@ protected:
::com::sun::star::text::XTextSection > & rNewSection,
const XMLTextNumRuleInfo& rOldList,
const XMLTextNumRuleInfo& rNewList,
- sal_Bool bAutoStyles );
+ bool bAutoStyles );
/// overload for exportListAndSectionChange;
/// takes new content rather than new section.
@@ -458,7 +458,7 @@ protected:
::com::sun::star::text::XTextContent > & rNewContent,
const XMLTextNumRuleInfo& rOldList,
const XMLTextNumRuleInfo& rNewList,
- sal_Bool bAutoStyles );
+ bool bAutoStyles );
void exportListAndSectionChange(
::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rOldSection,
@@ -468,25 +468,25 @@ protected:
::com::sun::star::text::XTextContent > & rNewContent,
const XMLTextNumRuleInfo& rOldList,
const XMLTextNumRuleInfo& rNewList,
- sal_Bool bAutoStyles );
+ bool bAutoStyles );
/// export a redline text portion
void exportChange(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
- sal_Bool bAutoStyle);
+ bool bAutoStyle);
/// export a ruby
void exportRuby(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & rPortionPropSet,
- sal_Bool bAutoStyles );
+ bool bAutoStyles );
/// export a text:meta
void exportMeta(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & i_xPortion,
- sal_Bool i_bAutoStyles, sal_Bool i_isProgress );
+ bool i_bAutoStyles, bool i_isProgress );
public:
@@ -527,8 +527,8 @@ public:
SvXMLExport& rExport);
// This methods exports all (or all used) styles
- void exportTextStyles( sal_Bool bUsed
- , sal_Bool bProg = sal_False
+ void exportTextStyles( bool bUsed
+ , bool bProg = false
);
/// This method exports (text field) declarations etc.
@@ -541,22 +541,22 @@ public:
/// true: export only those declarations that are used;
/// false: export all declarations
- void exportUsedDeclarations( sal_Bool bOnlyUsed );
+ void exportUsedDeclarations( bool bOnlyUsed );
/// Export the list of change information (enclosed by <tracked-changes>)
/// (or the necessary automatic styles)
- void exportTrackedChanges(sal_Bool bAutoStyle);
+ void exportTrackedChanges(bool bAutoStyle);
/// Export the list of change information (enclosed by <tracked-changes>)
/// (or the necessary automatic styles)
void exportTrackedChanges(const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
- sal_Bool bAutoStyle );
+ bool bAutoStyle );
/// Record tracked changes for this particular XText
/// (empty reference stop recording)
/// This should be used if tracked changes for e.g. footers are to
- /// be exported separately via the exportTrackedChanges(sal_Bool,
+ /// be exported separately via the exportTrackedChanges(bool,
/// Reference<XText>) method.
void recordTrackedChangesForXText(
const ::com::sun::star::uno::Reference <
@@ -578,10 +578,10 @@ public:
void collectTextAutoStyles(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
- sal_Bool bIsProgress = sal_False,
- sal_Bool bExportParagraph = sal_True )
+ bool bIsProgress = false,
+ bool bExportParagraph = true )
{
- exportText( rText, sal_True, bIsProgress, bExportParagraph );
+ exportText( rText, true, bIsProgress, bExportParagraph );
}
void collectTextAutoStyles(
@@ -589,16 +589,16 @@ public:
::com::sun::star::text::XText > & rText,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rBaseSection,
- sal_Bool bIsProgress = sal_False,
- sal_Bool bExportParagraph = sal_True )
+ bool bIsProgress = false,
+ bool bExportParagraph = true )
{
- exportText( rText, rBaseSection, sal_True, bIsProgress, bExportParagraph );
+ exportText( rText, rBaseSection, true, bIsProgress, bExportParagraph );
}
// It the model implements the xAutoStylesSupplier interface, the automatic
// styles can exported without iterating over the text portions
bool collectTextAutoStylesOptimized(
- sal_Bool bIsProgress = sal_False );
+ bool bIsProgress = false );
// This method exports all automatic styles that have been collected.
virtual void exportTextAutoStyles();
@@ -613,10 +613,10 @@ public:
void exportText(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XText > & rText,
- sal_Bool bIsProgress = sal_False,
- sal_Bool bExportParagraph = sal_True)
+ bool bIsProgress = false,
+ bool bExportParagraph = true)
{
- exportText( rText, sal_False, bIsProgress, bExportParagraph );
+ exportText( rText, false, bIsProgress, bExportParagraph );
}
void exportText(
@@ -624,27 +624,27 @@ public:
::com::sun::star::text::XText > & rText,
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextSection > & rBaseSection,
- sal_Bool bIsProgress = sal_False,
- sal_Bool bExportParagraph = sal_True)
+ bool bIsProgress = false,
+ bool bExportParagraph = true)
{
- exportText( rText, rBaseSection, sal_False, bIsProgress, bExportParagraph );
+ exportText( rText, rBaseSection, false, bIsProgress, bExportParagraph );
}
- void exportFramesBoundToPage( sal_Bool bIsProgress = sal_False )
+ void exportFramesBoundToPage( bool bIsProgress = false )
{
- exportPageFrames( sal_False, bIsProgress );
+ exportPageFrames( false, bIsProgress );
}
void exportFramesBoundToFrame(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextFrame >& rParentTxtFrame,
- sal_Bool bIsProgress = sal_False )
+ bool bIsProgress = false )
{
- exportFrameFrames( sal_False, bIsProgress, &rParentTxtFrame );
+ exportFrameFrames( false, bIsProgress, &rParentTxtFrame );
}
inline const XMLTextListAutoStylePool& GetListAutoStylePool() const;
- void SetBlockMode( sal_Bool bSet ) { bBlock = bSet; }
- sal_Bool IsBlockMode() const { return bBlock; }
+ void SetBlockMode( bool bSet ) { bBlock = bSet; }
+ bool IsBlockMode() const { return bBlock; }
UniReference < SvXMLExportPropertyMapper > GetParagraphPropertyMapper() const
@@ -688,7 +688,7 @@ inline const XMLTextListAutoStylePool&
inline void XMLTextParagraphExport::exportTextFrame(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bIsProgress, sal_Bool bExportContent,
+ bool bAutoStyles, bool bIsProgress, bool bExportContent,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet)
{
@@ -699,34 +699,34 @@ inline void XMLTextParagraphExport::exportTextFrame(
inline void XMLTextParagraphExport::exportTextGraphic(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet )
{
- exportAnyTextFrame( rTextContent, FT_GRAPHIC, bAutoStyles, sal_False,
- sal_True, pRangePropSet );
+ exportAnyTextFrame( rTextContent, FT_GRAPHIC, bAutoStyles, false,
+ true, pRangePropSet );
}
inline void XMLTextParagraphExport::exportTextEmbedded(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet )
{
- exportAnyTextFrame( rTextContent, FT_EMBEDDED, bAutoStyles, sal_False,
- sal_True, pRangePropSet );
+ exportAnyTextFrame( rTextContent, FT_EMBEDDED, bAutoStyles, false,
+ true, pRangePropSet );
}
inline void XMLTextParagraphExport::exportShape(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > *pRangePropSet )
{
- exportAnyTextFrame( rTextContent, FT_SHAPE, bAutoStyles, sal_False,
- sal_True, pRangePropSet );
+ exportAnyTextFrame( rTextContent, FT_SHAPE, bAutoStyles, false,
+ true, pRangePropSet );
}
#endif
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index feee55b2cc03..d38a09064f4d 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -45,13 +45,13 @@ private:
sal_Int8 nOutlineLevel;
- sal_Bool bAutoUpdate : 1;
- sal_Bool bHasMasterPageName : 1;
+ bool bAutoUpdate : 1;
+ bool bHasMasterPageName : 1;
- sal_Bool bHasCombinedCharactersLetter : 1;
+ bool bHasCombinedCharactersLetter : 1;
// Introduce import of empty list style (#i69523#)
- sal_Bool mbListStyleSet : 1;
+ bool mbListStyleSet : 1;
XMLEventsImportContext* pEventContext;
@@ -70,7 +70,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
- sal_Bool bDefaultStyle = sal_False );
+ bool bDefaultStyle = false );
virtual ~XMLTextStyleContext();
virtual SvXMLImportContext *CreateChildContext(
@@ -78,17 +78,17 @@ public:
const OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ) SAL_OVERRIDE;
- sal_Bool IsAutoUpdate() const { return bAutoUpdate; }
+ bool IsAutoUpdate() const { return bAutoUpdate; }
const OUString& GetListStyle() const { return sListStyleName; }
// XML import: reconstrution of assignment of paragraph style to outline levels (#i69629#)
- sal_Bool IsListStyleSet() const
+ bool IsListStyleSet() const
{
return mbListStyleSet;
}
const OUString& GetMasterPageName() const { return sMasterPageName; }
- sal_Bool HasMasterPageName() const { return bHasMasterPageName; }
+ bool HasMasterPageName() const { return bHasMasterPageName; }
const OUString& GetDropCapStyleName() const { return sDropCapTextStyleName; }
const OUString& GetDataStyleName() const { return sDataStyleName; }
@@ -101,7 +101,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet ) SAL_OVERRIDE;
- inline sal_Bool HasCombinedCharactersLetter()
+ inline bool HasCombinedCharactersLetter()
{ return bHasCombinedCharactersLetter; }
const ::std::vector< XMLPropertyState > & _GetProperties() { return GetProperties(); }
diff --git a/include/xmloff/uniref.hxx b/include/xmloff/uniref.hxx
index 578e45acace8..242db9e4cb43 100644
--- a/include/xmloff/uniref.hxx
+++ b/include/xmloff/uniref.hxx
@@ -72,17 +72,17 @@ public:
/**
* Returns true if the pointer to the element is valid.
*/
- inline sal_Bool is() const;
+ inline bool is() const;
/**
* Return true if both elements refer to the same object.
*/
- inline sal_Bool operator == ( const UniReference & rRef ) const;
+ inline bool operator == ( const UniReference & rRef ) const;
/**
* Return true if both elements does not refer to the same object.
*/
- inline sal_Bool operator != ( const UniReference & rRef ) const;
+ inline bool operator != ( const UniReference & rRef ) const;
/** Gets implementation pointer.
This call does <b>not</b> acquire the implementation.
@@ -192,7 +192,7 @@ inline T* UniReference< T >::get () const
* Returns true if the pointer to the interface is valid.
*/
template< class T >
-inline sal_Bool UniReference< T >::is() const
+inline bool UniReference< T >::is() const
{
return (mpElement != 0);
}
@@ -203,7 +203,7 @@ inline sal_Bool UniReference< T >::is() const
* @param rRef another interface reference
*/
template< class T >
-inline sal_Bool UniReference< T >::operator == ( const UniReference & rRef ) const
+inline bool UniReference< T >::operator == ( const UniReference & rRef ) const
{
return ( mpElement == rRef.mpElement );
}
@@ -214,7 +214,7 @@ inline sal_Bool UniReference< T >::operator == ( const UniReference & rRef ) con
* @param rRef another interface reference
*/
template< class T >
-inline sal_Bool UniReference< T >::operator != ( const UniReference & rRef ) const
+inline bool UniReference< T >::operator != ( const UniReference & rRef ) const
{
return ( ! operator == ( rRef ) );
}
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index a07a142671a5..aa61ab751095 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -494,7 +494,7 @@ void SwXMLExport::_ExportContent()
}
}
- GetTextParagraphExport()->exportTrackedChanges( sal_False );
+ GetTextParagraphExport()->exportTrackedChanges( false );
GetTextParagraphExport()->exportTextDeclarations();
Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
Reference < XText > xText = xTextDoc->getText();
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index cb7f02fcf3df..c1ff10f3fab2 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -809,7 +809,7 @@ SvXMLStyleContext *SwXMLStylesContext_Impl::CreateDefaultStyleStyleChildContext(
case XML_STYLE_FAMILY_TABLE_ROW:
pStyle = new XMLTextStyleContext( GetImport(), nPrefix, rLocalName,
xAttrList, *this, nFamily,
- sal_True );
+ true );
break;
case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
// There are no writer specific defaults for graphic styles!
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 537ed00dfd69..c442fb3a31eb 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -198,12 +198,12 @@ void SwXMLExport::_ExportAutoStyles()
// in single-stream case), then we can save ourselves a bit of
// work and memory by not collecting field masters
if( (getExportFlags() & EXPORT_STYLES ) == 0 )
- GetTextParagraphExport()->exportUsedDeclarations( sal_False );
+ GetTextParagraphExport()->exportUsedDeclarations( false );
// exported in _ExportContent
if( (getExportFlags() & EXPORT_CONTENT) != 0 )
{
- GetTextParagraphExport()->exportTrackedChanges( sal_True );
+ GetTextParagraphExport()->exportTrackedChanges( true );
Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY );
Reference < XText > xText = xTextDoc->getText();
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 60d7be7aea03..0215106ed8fb 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -294,7 +294,7 @@ SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext(
{
if ( rTokenMap.Get( nPrefix, rLocalName ) == XML_TOK_DOC_BODY )
{
- GetImport().GetTextImport()->SetOutlineStyles( sal_True );
+ GetImport().GetTextImport()->SetOutlineStyles( true );
}
}
@@ -849,7 +849,7 @@ void SwXMLImport::endDocument( void )
/* Was called too early. Moved from SwXMLBodyContext_Impl::EndElement */
- GetTextImport()->RedlineAdjustStartNodeCursor( sal_False );
+ GetTextImport()->RedlineAdjustStartNodeCursor( false );
if( (getImportFlags() & IMPORT_CONTENT) != 0 ||
((getImportFlags() & IMPORT_MASTERSTYLES) != 0 && IsStylesOnlyMode()) )
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index cb110c5fe04d..57cb3c046d4d 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -1142,7 +1142,7 @@ void SwXMLExport::ExportTable( const SwTableNode& rTblNd )
void SwXMLTextParagraphExport::exportTable(
const Reference < XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool _bProgress )
+ bool bAutoStyles, bool _bProgress )
{
sal_Bool bOldShowProgress = ((SwXMLExport&)GetExport()).IsShowProgress();
((SwXMLExport&)GetExport()).SetShowProgress( _bProgress );
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 122cf5059879..259135e6550c 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -1412,7 +1412,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
GetImport().GetTextImport()->SetCursor( xText->createTextCursor() );
// take care of open redlines for tables
- GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(sal_True);
+ GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(true);
}
if( pXTable )
{
@@ -1466,7 +1466,7 @@ SwXMLTableContext::~SwXMLTableContext()
delete pRows;
// close redlines on table end nodes
- GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(sal_False);
+ GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false);
}
SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
@@ -2875,7 +2875,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
bFirstSection = false;
OUString sStyleName("Standard");
GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(),
- GetImport().GetTextImport()->GetCursor(), sStyleName, sal_True );
+ GetImport().GetTextImport()->GetCursor(), sStyleName, true );
}
else
{
diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx
index 4c2785be5045..f9721fafbd24 100644
--- a/sw/source/filter/xml/xmltext.cxx
+++ b/sw/source/filter/xml/xmltext.cxx
@@ -72,7 +72,7 @@ SvXMLImportContext *SwXMLBodyContentContext_Impl::CreateChildContext(
void SwXMLBodyContentContext_Impl::EndElement()
{
/* Code moved to SwXMLOmport::endDocument */
- GetImport().GetTextImport()->SetOutlineStyles( sal_False );
+ GetImport().GetTextImport()->SetOutlineStyles( false );
}
SvXMLImportContext *SwXMLImport::CreateBodyContentContext(
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index f3a41311a1f5..baee89959802 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -455,7 +455,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
if( !sAutoStyle.isEmpty() )
rXMLExport.AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME, sAutoStyle );
- addTextFrameAttributes( rPropSet, sal_False );
+ addTextFrameAttributes( rPropSet, false );
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_DRAW,
XML_FRAME, sal_False, sal_True );
diff --git a/sw/source/filter/xml/xmltexte.hxx b/sw/source/filter/xml/xmltexte.hxx
index 99ff8608e618..e70204f7bf08 100644
--- a/sw/source/filter/xml/xmltexte.hxx
+++ b/sw/source/filter/xml/xmltexte.hxx
@@ -62,7 +62,7 @@ protected:
virtual void exportTable(
const ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bProgress ) SAL_OVERRIDE;
+ bool bAutoStyles, bool bProgress ) SAL_OVERRIDE;
public:
SwXMLTextParagraphExport(
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index c3bc76b7a796..61c91fc16526 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -182,7 +182,7 @@ SvXMLImportContext *SwXMLTextImportHelper::CreateTableChildContext(
(SwXMLImport&)rImport, nPrefix, rLocalName, xAttrList );
}
-sal_Bool SwXMLTextImportHelper::IsInHeaderFooter() const
+bool SwXMLTextImportHelper::IsInHeaderFooter() const
{
uno::Reference<XUnoTunnel> xCrsrTunnel(
((SwXMLTextImportHelper *)this)->GetCursor(), UNO_QUERY );
@@ -615,7 +615,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink(
uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet(
const OUString &rName,
const OUString &rCode,
- sal_Bool bMayScript,
+ bool bMayScript,
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight )
{
@@ -959,7 +959,7 @@ void SwXMLTextImportHelper::RedlineAdd(
const OUString& rAuthor,
const OUString& rComment,
const util::DateTime& rDateTime,
- sal_Bool bMergeLastPara)
+ bool bMergeLastPara)
{
// create redline helper on demand
OSL_ENSURE(NULL != pRedlineHelper, "helper should have been created in constructor");
@@ -984,8 +984,8 @@ uno::Reference<XTextCursor> SwXMLTextImportHelper::RedlineCreateText(
void SwXMLTextImportHelper::RedlineSetCursor(
const OUString& rId,
- sal_Bool bStart,
- sal_Bool bIsOutsideOfParagraph)
+ bool bStart,
+ bool bIsOutsideOfParagraph)
{
if (NULL != pRedlineHelper) {
uno::Reference<XTextRange> xTextRange( GetCursor()->getStart() );
@@ -996,7 +996,7 @@ void SwXMLTextImportHelper::RedlineSetCursor(
}
void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
- sal_Bool bStart)
+ bool bStart)
{
OUString rId = GetOpenRedlineId();
if ((NULL != pRedlineHelper) && !rId.isEmpty())
@@ -1008,13 +1008,13 @@ void SwXMLTextImportHelper::RedlineAdjustStartNodeCursor(
// else: ignore redline (wasn't added before, or no open redline ID
}
-void SwXMLTextImportHelper::SetShowChanges( sal_Bool bShowChanges )
+void SwXMLTextImportHelper::SetShowChanges( bool bShowChanges )
{
if ( NULL != pRedlineHelper )
pRedlineHelper->SetShowChanges( bShowChanges );
}
-void SwXMLTextImportHelper::SetRecordChanges( sal_Bool bRecordChanges )
+void SwXMLTextImportHelper::SetRecordChanges( bool bRecordChanges )
{
if ( NULL != pRedlineHelper )
pRedlineHelper->SetRecordChanges( bRecordChanges );
diff --git a/sw/source/filter/xml/xmltexti.hxx b/sw/source/filter/xml/xmltexti.hxx
index 1cd0357ce7d4..0d8adef943e9 100644
--- a/sw/source/filter/xml/xmltexti.hxx
+++ b/sw/source/filter/xml/xmltexti.hxx
@@ -66,7 +66,7 @@ public:
createAndInsertApplet(
const OUString &rName,
const OUString &rCode,
- sal_Bool bMayScript,
+ bool bMayScript,
const OUString& rHRef,
sal_Int32 nWidth, sal_Int32 nHeight ) SAL_OVERRIDE;
@@ -89,7 +89,7 @@ public:
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &rPropSet,
::std::map < const OUString, OUString > &rParamMap) SAL_OVERRIDE;
- virtual sal_Bool IsInHeaderFooter() const SAL_OVERRIDE;
+ virtual bool IsInHeaderFooter() const SAL_OVERRIDE;
// redlining helper methods
// (here is the real implementation)
@@ -99,7 +99,7 @@ public:
const OUString& rAuthor, /// name of the author
const OUString& rComment, /// redline comment
const ::com::sun::star::util::DateTime& rDateTime, /// date+time
- sal_Bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph
+ bool bMergeLastPara) SAL_OVERRIDE; /// merge last paragraph
virtual ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextCursor> RedlineCreateText(
::com::sun::star::uno::Reference< /// needed to get the document
@@ -107,12 +107,11 @@ public:
const OUString& rId) SAL_OVERRIDE; /// ID used to RedlineAdd() call
virtual void RedlineSetCursor(
const OUString& rId, /// ID used to RedlineAdd() call
- sal_Bool bStart, /// start or end Cursor
- sal_Bool bIsOutsideOfParagraph) SAL_OVERRIDE;
- virtual void RedlineAdjustStartNodeCursor(
- sal_Bool bStart) SAL_OVERRIDE;
- virtual void SetShowChanges( sal_Bool bShowChanges ) SAL_OVERRIDE;
- virtual void SetRecordChanges( sal_Bool bRecordChanges ) SAL_OVERRIDE;
+ bool bStart, /// start or end Cursor
+ bool bIsOutsideOfParagraph) SAL_OVERRIDE;
+ virtual void RedlineAdjustStartNodeCursor( bool bStart) SAL_OVERRIDE;
+ virtual void SetShowChanges( bool bShowChanges ) SAL_OVERRIDE;
+ virtual void SetRecordChanges( bool bRecordChanges ) SAL_OVERRIDE;
virtual void SetChangesProtectionKey(
const ::com::sun::star::uno::Sequence<sal_Int8> & rKey ) SAL_OVERRIDE;
};
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index f8282b9d9543..2ef1eef7188e 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -309,7 +309,7 @@ protected:
sal_Bool bFixed;
sal_Bool bIsDate; // is this a date?
// (for XMLDateFieldImportContext, really)
- sal_Bool bIsDefaultLanguage;
+ bool bIsDefaultLanguage;
public:
TYPEINFO_OVERRIDE();
@@ -618,7 +618,7 @@ class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext
sal_Bool bFormatOK;
sal_Bool bIsDate;
sal_Bool bHasDateTime;
- sal_Bool bIsDefaultLanguage;
+ bool bIsDefaultLanguage;
public:
TYPEINFO_OVERRIDE();
@@ -670,7 +670,7 @@ class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext
const OUString sPropertyIsFixedLanguage;
sal_Int32 nFormat;
sal_Bool bFormatOK;
- sal_Bool bIsDefaultLanguage;
+ bool bIsDefaultLanguage;
public:
TYPEINFO_OVERRIDE();
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index e6469403cad5..4806349a7fd1 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -60,7 +60,7 @@ class XMLValueImportHelper
sal_Int32 nFormatKey; /// format key (only valid of bFormatOK)
OUString sFormula; /// formula string
OUString sDefault; /// default (see bStringDefault/bFormulaDef.)
- sal_Bool bIsDefaultLanguage;/// format (of nFormatKey) has system language?
+ bool bIsDefaultLanguage;/// format (of nFormatKey) has system language?
sal_Bool bStringType; /// is this a string (or a float) type?
sal_Bool bFormatOK; /// have we read a style:data-style-name attr.?
diff --git a/xmloff/source/text/XMLChangeImportContext.cxx b/xmloff/source/text/XMLChangeImportContext.cxx
index 698f56e29233..f65697e832d5 100644
--- a/xmloff/source/text/XMLChangeImportContext.cxx
+++ b/xmloff/source/text/XMLChangeImportContext.cxx
@@ -74,9 +74,9 @@ void XMLChangeImportContext::StartElement(
// call for bStart and bEnd (may both be true)
if (bIsStart)
- rHelper->RedlineSetCursor(sID,sal_True,bIsOutsideOfParagraph);
+ rHelper->RedlineSetCursor(sID, true, bIsOutsideOfParagraph);
if (bIsEnd)
- rHelper->RedlineSetCursor(sID,sal_False,bIsOutsideOfParagraph);
+ rHelper->RedlineSetCursor(sID, false, bIsOutsideOfParagraph);
// outside of paragraph and still open? set open redline ID
if (bIsOutsideOfParagraph)
diff --git a/xmloff/source/text/XMLIndexTOCContext.cxx b/xmloff/source/text/XMLIndexTOCContext.cxx
index 9d6c969e48d2..65e9fd321059 100644
--- a/xmloff/source/text/XMLIndexTOCContext.cxx
+++ b/xmloff/source/text/XMLIndexTOCContext.cxx
@@ -236,8 +236,7 @@ void XMLIndexTOCContext::StartElement(
// finally, check for redlines that should start at
// the section start node
if( bValid )
- GetImport().GetTextImport()->
- RedlineAdjustStartNodeCursor(sal_True);
+ GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(true);
if (pStyle != NULL)
{
@@ -282,7 +281,7 @@ void XMLIndexTOCContext::EndElement()
sEmpty, sal_True);
// check for Redlines on our end node
- GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(sal_False);
+ GetImport().GetTextImport()->RedlineAdjustStartNodeCursor(false);
}
}
diff --git a/xmloff/source/text/XMLSectionImportContext.cxx b/xmloff/source/text/XMLSectionImportContext.cxx
index 2128cf154bd6..7aee65c44669 100644
--- a/xmloff/source/text/XMLSectionImportContext.cxx
+++ b/xmloff/source/text/XMLSectionImportContext.cxx
@@ -238,7 +238,7 @@ void XMLSectionImportContext::StartElement(
// finally, check for redlines that should start at
// the section start node
- rHelper->RedlineAdjustStartNodeCursor(sal_True); // start ???
+ rHelper->RedlineAdjustStartNodeCursor(true); // start ???
// xml:id for RDF metadata
GetImport().SetXmlId(xIfc, sXmlId);
@@ -348,7 +348,7 @@ void XMLSectionImportContext::EndElement()
sEmpty, sal_True);
// check for redlines to our endnode
- rHelper->RedlineAdjustStartNodeCursor(sal_False);
+ rHelper->RedlineAdjustStartNodeCursor(false);
}
SvXMLImportContext* XMLSectionImportContext::CreateChildContext(
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx b/xmloff/source/text/XMLTextMasterPageExport.cxx
index 8f452940b86d..116cc6bd326b 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -66,11 +66,11 @@ void XMLTextMasterPageExport::exportHeaderFooterContent(
bAutoStyles);
if( bAutoStyles )
GetExport().GetTextParagraphExport()
- ->collectTextAutoStyles( rText, sal_True, bExportParagraph );
+ ->collectTextAutoStyles( rText, true, bExportParagraph );
else
{
GetExport().GetTextParagraphExport()->exportTextDeclarations( rText );
- GetExport().GetTextParagraphExport()->exportText( rText, sal_True, bExportParagraph );
+ GetExport().GetTextParagraphExport()->exportText( rText, true, bExportParagraph );
}
// tracked changes (end of XText)
diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx
index 3aa1691bf4d0..a18f0e2e14ce 100644
--- a/xmloff/source/text/txtflde.cxx
+++ b/xmloff/source/text/txtflde.cxx
@@ -991,9 +991,9 @@ void XMLTextFieldExport::ExportField(
: 0;
// find out whether we need to set the style or hyperlink
- sal_Bool bHasHyperlink;
- sal_Bool bIsUICharStyle;
- sal_Bool bHasAutoStyle;
+ bool bHasHyperlink;
+ bool bIsUICharStyle;
+ bool bHasAutoStyle;
OUString sStyle = GetExport().GetTextParagraphExport()->
FindTextStyleAndHyperlink( xRangePropSet, bHasHyperlink, bIsUICharStyle,
bHasAutoStyle, pStates );
diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx
index ec52fbb33b56..e188f826755e 100644
--- a/xmloff/source/text/txtfldi.cxx
+++ b/xmloff/source/text/txtfldi.cxx
@@ -1084,7 +1084,7 @@ XMLTimeFieldImportContext::XMLTimeFieldImportContext(
, bFormatOK(sal_False)
, bFixed(sal_False)
, bIsDate(sal_False)
-, bIsDefaultLanguage( sal_True )
+, bIsDefaultLanguage( true )
{
bValid = sal_True; // always valid!
}
@@ -1823,7 +1823,7 @@ XMLDateTimeDocInfoImportContext::XMLDateTimeDocInfoImportContext(
, bFormatOK(sal_False)
, bIsDate(false)
, bHasDateTime(false)
- , bIsDefaultLanguage(sal_True)
+ , bIsDefaultLanguage(true)
{
// we allow processing of EDIT_DURATION here, because import of actual
// is not supported anyway. If it was, we'd need an extra import class
@@ -1932,7 +1932,7 @@ XMLUserDocInfoImportContext::XMLUserDocInfoImportContext(
, sPropertyIsFixedLanguage(sAPI_is_fixed_language)
, nFormat(0)
, bFormatOK(sal_False)
- , bIsDefaultLanguage( sal_True )
+ , bIsDefaultLanguage( true )
{
bValid = sal_False;
}
diff --git a/xmloff/source/text/txtftne.cxx b/xmloff/source/text/txtftne.cxx
index 31bfde9feed6..888efd782052 100644
--- a/xmloff/source/text/txtftne.cxx
+++ b/xmloff/source/text/txtftne.cxx
@@ -66,7 +66,7 @@ using namespace ::xmloff::token;
void XMLTextParagraphExport::exportTextFootnote(
const Reference<XPropertySet> & rPropSet,
const OUString& rText,
- sal_Bool bAutoStyles, sal_Bool bIsProgress )
+ bool bAutoStyles, bool bIsProgress )
{
// get footnote and associated text
Any aAny;
@@ -92,9 +92,9 @@ void XMLTextParagraphExport::exportTextFootnote(
{
// create span (for citation mark) if necessary; footnote content
// wil be handled via exportTextFootnoteHelper, exportText
- sal_Bool bHasHyperlink;
- sal_Bool bIsUICharStyle = sal_False;
- sal_Bool bHasAutoStyle = sal_False;
+ bool bHasHyperlink;
+ bool bIsUICharStyle = false;
+ bool bHasAutoStyle = false;
OUString sStyle = FindTextStyleAndHyperlink( rPropSet, bHasHyperlink,
bIsUICharStyle, bHasAutoStyle );
@@ -154,13 +154,13 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
const Reference<XFootnote> & rFootnote,
const Reference<XText> & rText,
const OUString& rTextString,
- sal_Bool bAutoStyles,
- sal_Bool bIsEndnote,
- sal_Bool bIsProgress )
+ bool bAutoStyles,
+ bool bIsEndnote,
+ bool bIsProgress )
{
if (bAutoStyles)
{
- exportText(rText, bAutoStyles, bIsProgress, sal_True );
+ exportText(rText, bAutoStyles, bIsProgress, true );
}
else
{
@@ -198,7 +198,7 @@ void XMLTextParagraphExport::exportTextFootnoteHelper(
{
SvXMLElementExport aBody(GetExport(), XML_NAMESPACE_TEXT,
XML_NOTE_BODY, sal_False, sal_False);
- exportText(rText, bAutoStyles, bIsProgress, sal_True );
+ exportText(rText, bAutoStyles, bIsProgress, true );
}
}
}
@@ -211,14 +211,14 @@ void XMLTextParagraphExport::exportTextFootnoteConfiguration()
UNO_QUERY);
Reference<XPropertySet> aFootnoteConfiguration(
aFootnotesSupplier->getFootnoteSettings());
- exportTextFootnoteConfigurationHelper(aFootnoteConfiguration, sal_False);
+ exportTextFootnoteConfigurationHelper(aFootnoteConfiguration, false);
// endnote settings
Reference<XEndnotesSupplier> aEndnotesSupplier(GetExport().GetModel(),
UNO_QUERY);
Reference<XPropertySet> aEndnoteConfiguration(
aEndnotesSupplier->getEndnoteSettings());
- exportTextFootnoteConfigurationHelper(aEndnoteConfiguration, sal_True);
+ exportTextFootnoteConfigurationHelper(aEndnoteConfiguration, true);
}
@@ -246,7 +246,7 @@ static void lcl_exportString(
void XMLTextParagraphExport::exportTextFootnoteConfigurationHelper(
const Reference<XPropertySet> & rFootnoteConfig,
- sal_Bool bIsEndnote)
+ bool bIsEndnote)
{
GetExport().AddAttribute(XML_NAMESPACE_TEXT, XML_NOTE_CLASS,
GetXMLToken( bIsEndnote ? XML_ENDNOTE
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index bb3e867f1e7b..5293dbb8154e 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1081,7 +1081,7 @@ void XMLTextImportHelper::ResetCursor()
}
-sal_Bool XMLTextImportHelper::HasFrameByName( const OUString& rName ) const
+bool XMLTextImportHelper::HasFrameByName( const OUString& rName ) const
{
return (m_pImpl->m_xTextFrames.is() &&
m_pImpl->m_xTextFrames->hasByName(rName))
@@ -1103,7 +1103,7 @@ void XMLTextImportHelper::InsertString( const OUString& rChars )
}
void XMLTextImportHelper::InsertString( const OUString& rChars,
- sal_Bool& rIgnoreLeadingSpace )
+ bool& rIgnoreLeadingSpace )
{
DBG_ASSERT(m_pImpl->m_xText.is(), "no text");
DBG_ASSERT(m_pImpl->m_xCursorAsRange.is(), "no range");
@@ -1123,10 +1123,10 @@ void XMLTextImportHelper::InsertString( const OUString& rChars,
case 0x0d:
if( !rIgnoreLeadingSpace )
sChars.append( (sal_Unicode)0x20 );
- rIgnoreLeadingSpace = sal_True;
+ rIgnoreLeadingSpace = true;
break;
default:
- rIgnoreLeadingSpace = sal_False;
+ rIgnoreLeadingSpace = false;
sChars.append( c );
break;
}
@@ -1201,7 +1201,7 @@ void XMLTextImportHelper::DeleteParagraph()
OUString XMLTextImportHelper::ConvertStarFonts( const OUString& rChars,
const OUString& rStyleName,
sal_uInt8& rFlags,
- sal_Bool bPara,
+ bool bPara,
SvXMLImport& rImport ) const
{
OUStringBuffer sChars( rChars );
@@ -1402,11 +1402,11 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
SvXMLImport& rImport,
const Reference < XTextCursor >& rCursor,
const OUString& rStyleName,
- sal_Bool bPara,
- sal_Bool bOutlineLevelAttrFound,
+ bool bPara,
+ bool bOutlineLevelAttrFound,
sal_Int8 nOutlineLevel,
// Numberings/Bullets in table not visible after save/reload (#i80724#)
- sal_Bool bSetListAttrs )
+ bool bSetListAttrs )
{
static OUString s_ParaStyleName( "ParaStyleName");
static OUString s_CharStyleName( "CharStyleName");
@@ -1911,7 +1911,7 @@ void XMLTextImportHelper::AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel
}
}
-void XMLTextImportHelper::SetOutlineStyles( sal_Bool bSetEmptyLevels )
+void XMLTextImportHelper::SetOutlineStyles( bool bSetEmptyLevels )
{
static OUString s_NumberingStyleName( "NumberingStyleName");
static OUString s_HeadingStyleName( "HeadingStyleName");
@@ -2346,7 +2346,7 @@ SvXMLImportContext *XMLTextImportHelper::CreateTableChildContext(
/// get data style key for use with NumberFormat property
sal_Int32 XMLTextImportHelper::GetDataStyleKey(const OUString& sStyleName,
- sal_Bool* pIsSystemLanguage )
+ bool* pIsSystemLanguage )
{
const SvXMLStyleContext* pStyle =
((SvXMLStylesContext *)&m_pImpl->m_xAutoStyles)->
@@ -2505,7 +2505,7 @@ void XMLTextImportHelper::InsertBookmarkStartRange(
m_pImpl->m_BookmarkVector.push_back(sName);
}
-sal_Bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
+bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
const OUString & sName,
Reference<XTextRange> & o_rRange,
OUString & o_rXmlId,
@@ -2528,11 +2528,11 @@ sal_Bool XMLTextImportHelper::FindAndRemoveBookmarkStartRange(
{
m_pImpl->m_BookmarkVector.erase(it);
}
- return sal_True;
+ return true;
}
else
{
- return sal_False;
+ return false;
}
}
@@ -2653,11 +2653,11 @@ void XMLTextImportHelper::ConnectFrameChains(
}
}
-sal_Bool XMLTextImportHelper::IsInFrame() const
+bool XMLTextImportHelper::IsInFrame() const
{
static OUString s_TextFrame( "TextFrame");
- sal_Bool bIsInFrame = sal_False;
+ bool bIsInFrame = false;
// are we currently in a text frame? yes, if the cursor has a
// TextFrame property and it's non-NULL
@@ -2671,7 +2671,7 @@ sal_Bool XMLTextImportHelper::IsInFrame() const
if (xFrame.is())
{
- bIsInFrame = sal_True;
+ bIsInFrame = true;
}
}
}
@@ -2679,9 +2679,9 @@ sal_Bool XMLTextImportHelper::IsInFrame() const
return bIsInFrame;
}
-sal_Bool XMLTextImportHelper::IsInHeaderFooter() const
+bool XMLTextImportHelper::IsInHeaderFooter() const
{
- return sal_False;
+ return false;
}
Reference< XPropertySet> XMLTextImportHelper::createAndInsertOLEObject(
@@ -2709,7 +2709,7 @@ Reference< XPropertySet> XMLTextImportHelper::createAndInsertOOoLink(
Reference< XPropertySet> XMLTextImportHelper::createAndInsertApplet(
const OUString& /*rCode*/,
const OUString& /*rName*/,
- sal_Bool /*bMayScript*/,
+ bool /*bMayScript*/,
const OUString& /*rHRef*/,
sal_Int32 /*nWidth*/, sal_Int32 /*nHeight*/ )
{
@@ -2745,7 +2745,7 @@ void XMLTextImportHelper::RedlineAdd( const OUString& /*rType*/,
const OUString& /*rAuthor*/,
const OUString& /*rComment*/,
const util::DateTime& /*rDateTime*/,
- sal_Bool /*bMergeLastPara*/)
+ bool /*bMergeLastPara*/)
{
// dummy implementation: do nothing
}
@@ -2761,23 +2761,23 @@ Reference<XTextCursor> XMLTextImportHelper::RedlineCreateText(
void XMLTextImportHelper::RedlineSetCursor(
const OUString& /*rId*/,
- sal_Bool /*bStart*/,
- sal_Bool /*bIsOutsideOfParagraph*/)
+ bool /*bStart*/,
+ bool /*bIsOutsideOfParagraph*/)
{
// dummy implementation: do nothing
}
-void XMLTextImportHelper::RedlineAdjustStartNodeCursor(sal_Bool)
+void XMLTextImportHelper::RedlineAdjustStartNodeCursor(bool)
{
// dummy implementation: do nothing
}
-void XMLTextImportHelper::SetShowChanges( sal_Bool )
+void XMLTextImportHelper::SetShowChanges( bool )
{
// dummy implementation: do nothing
}
-void XMLTextImportHelper::SetRecordChanges( sal_Bool )
+void XMLTextImportHelper::SetRecordChanges( bool )
{
// dummy implementation: do nothing
}
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index e965708f1238..09c6b260cc09 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -725,9 +725,9 @@ OUString XMLTextParagraphExport::Find(
OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
const Reference < XPropertySet > & rPropSet,
- sal_Bool& rbHyperlink,
- sal_Bool& rbHasCharStyle,
- sal_Bool& rbHasAutoStyle,
+ bool& rbHyperlink,
+ bool& rbHasCharStyle,
+ bool& rbHasAutoStyle,
const XMLPropertyState** ppAddStates ) const
{
UniReference < SvXMLExportPropertyMapper > xPropMapper(GetTextPropMapper());
@@ -735,7 +735,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
// Get parent and remove hyperlinks (they aren't of interest)
OUString sName;
- rbHyperlink = rbHasCharStyle = rbHasAutoStyle = sal_False;
+ rbHyperlink = rbHasCharStyle = rbHasAutoStyle = false;
sal_uInt16 nIgnoreProps = 0;
UniReference< XMLPropertySetMapper > xPM(xPropMapper->getPropertySetMapper());
::std::vector< XMLPropertyState >::iterator aFirstDel = xPropStates.end();
@@ -762,7 +762,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
nIgnoreProps++;
break;
case CTF_HYPERLINK_URL:
- rbHyperlink = sal_True;
+ rbHyperlink = true;
i->mnIndex = -1;
if( nIgnoreProps )
aSecondDel = i;
@@ -795,7 +795,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
OUString sParent; // AutoStyles should not have parents!
sName = GetAutoStylePool().Find( XML_STYLE_FAMILY_TEXT_TEXT, sParent, xPropStates );
// assert(!sName.isEmpty()); // AutoStyle could not be found
- rbHasAutoStyle = sal_True;
+ rbHasAutoStyle = true;
}
return sName;
@@ -1179,9 +1179,9 @@ XMLTextParagraphExport::XMLTextParagraphExport(
pIndexMarkExport( NULL ),
pRedlineExport( NULL ),
pHeadingStyles( NULL ),
- bProgress( sal_False ),
- bBlock( sal_False ),
- bOpenRuby( sal_False ),
+ bProgress( false ),
+ bBlock( false ),
+ bOpenRuby( false ),
mpTextListsHelper( 0 ),
maTextListsHelperStack(),
sActualSize("ActualSize"),
@@ -1384,8 +1384,8 @@ SvXMLExportPropertyMapper *XMLTextParagraphExport::CreateParaDefaultExtPropMappe
return new XMLTextExportPropertySetMapper( pPropMapper, rExport );
}
-void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
- sal_Bool bIsProgress )
+void XMLTextParagraphExport::exportPageFrames( bool bAutoStyles,
+ bool bIsProgress )
{
const TextContentSet* const pTexts = pBoundFrameSets->GetTexts()->GetPageBoundContents();
const TextContentSet* const pGraphics = pBoundFrameSets->GetGraphics()->GetPageBoundContents();
@@ -1394,7 +1394,7 @@ void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
for(TextContentSet::const_iterator_t it = pTexts->getBegin();
it != pTexts->getEnd();
++it)
- exportTextFrame(*it, bAutoStyles, bIsProgress, sal_True);
+ exportTextFrame(*it, bAutoStyles, bIsProgress, true);
for(TextContentSet::const_iterator_t it = pGraphics->getBegin();
it != pGraphics->getEnd();
++it)
@@ -1410,8 +1410,8 @@ void XMLTextParagraphExport::exportPageFrames( sal_Bool bAutoStyles,
}
void XMLTextParagraphExport::exportFrameFrames(
- sal_Bool bAutoStyles,
- sal_Bool bIsProgress,
+ bool bAutoStyles,
+ bool bIsProgress,
const Reference < XTextFrame > *pParentTxtFrame )
{
const TextContentSet* const pTexts = pBoundFrameSets->GetTexts()->GetFrameBoundContents(*pParentTxtFrame);
@@ -1419,7 +1419,7 @@ void XMLTextParagraphExport::exportFrameFrames(
for(TextContentSet::const_iterator_t it = pTexts->getBegin();
it != pTexts->getEnd();
++it)
- exportTextFrame(*it, bAutoStyles, bIsProgress, sal_True);
+ exportTextFrame(*it, bAutoStyles, bIsProgress, true);
const TextContentSet* const pGraphics = pBoundFrameSets->GetGraphics()->GetFrameBoundContents(*pParentTxtFrame);
if(pGraphics)
for(TextContentSet::const_iterator_t it = pGraphics->getBegin();
@@ -1450,12 +1450,12 @@ static const enum XMLTokenEnum lcl_XmlBookmarkElements[] = {
// This function replaces the text portion iteration during auto style
// collection.
-bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgress )
+bool XMLTextParagraphExport::collectTextAutoStylesOptimized( bool bIsProgress )
{
GetExport().GetShapeExport(); // make sure the graphics styles family is added
- const sal_Bool bAutoStyles = sal_True;
- const sal_Bool bExportContent = sal_False;
+ const bool bAutoStyles = true;
+ const bool bExportContent = false;
// Export AutoStyles:
Reference< XAutoStylesSupplier > xAutoStylesSupp( GetExport().GetModel(), UNO_QUERY );
@@ -1518,7 +1518,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
a >>= xText;
if ( xText.is() )
{
- exportText( xText, sal_True, bIsProgress, bExportContent );
+ exportText( xText, true, bIsProgress, bExportContent );
GetExport().GetTextParagraphExport()
->collectTextAutoStyles( xText );
}
@@ -1604,7 +1604,7 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
{
Any aAny = xTables->getByIndex( i );
Reference< XTextTable > xTable = *(Reference<XTextTable>*)aAny.getValue();
- exportTable( xTable, sal_True, sal_True );
+ exportTable( xTable, true, true );
}
}
}
@@ -1660,9 +1660,9 @@ bool XMLTextParagraphExport::collectTextAutoStylesOptimized( sal_Bool bIsProgres
void XMLTextParagraphExport::exportText(
const Reference < XText > & rText,
- sal_Bool bAutoStyles,
- sal_Bool bIsProgress,
- sal_Bool bExportParagraph )
+ bool bAutoStyles,
+ bool bIsProgress,
+ bool bExportParagraph )
{
if( bAutoStyles )
GetExport().GetShapeExport(); // make sure the graphics styles family
@@ -1678,7 +1678,7 @@ void XMLTextParagraphExport::exportText(
if( ! xParaEnum.is() )
return;
- sal_Bool bExportLevels = sal_True;
+ bool bExportLevels = true;
if (xPropertySet.is())
{
@@ -1721,9 +1721,9 @@ void XMLTextParagraphExport::exportText(
void XMLTextParagraphExport::exportText(
const Reference < XText > & rText,
const Reference < XTextSection > & rBaseSection,
- sal_Bool bAutoStyles,
- sal_Bool bIsProgress,
- sal_Bool bExportParagraph )
+ bool bAutoStyles,
+ bool bIsProgress,
+ bool bExportParagraph )
{
if( bAutoStyles )
GetExport().GetShapeExport(); // make sure the graphics styles family
@@ -1749,37 +1749,37 @@ void XMLTextParagraphExport::exportText(
pRedlineExport->ExportStartOrEndRedline( xPropertySet, sal_False );
}
-sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
+bool XMLTextParagraphExport::exportTextContentEnumeration(
const Reference < XEnumeration > & rContEnum,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
const Reference < XTextSection > & rBaseSection,
- sal_Bool bIsProgress,
- sal_Bool bExportParagraph,
+ bool bIsProgress,
+ bool bExportParagraph,
const Reference < XPropertySet > *pRangePropSet,
- sal_Bool bExportLevels )
+ bool bExportLevels )
{
DBG_ASSERT( rContEnum.is(), "No enumeration to export!" );
- sal_Bool bHasMoreElements = rContEnum->hasMoreElements();
+ bool bHasMoreElements = rContEnum->hasMoreElements();
if( !bHasMoreElements )
- return sal_False;
+ return false;
XMLTextNumRuleInfo aPrevNumInfo;
XMLTextNumRuleInfo aNextNumInfo;
- sal_Bool bHasContent = sal_False;
+ bool bHasContent = false;
Reference<XTextSection> xCurrentTextSection(rBaseSection);
MultiPropertySetHelper aPropSetHelper(
bAutoStyles ? aParagraphPropertyNamesAuto :
aParagraphPropertyNames );
- sal_Bool bHoldElement = sal_False;
+ bool bHoldElement = false;
Reference < XTextContent > xTxtCntnt;
while( bHoldElement || bHasMoreElements )
{
if (bHoldElement)
{
- bHoldElement = sal_False;
+ bHoldElement = false;
}
else
{
@@ -1841,7 +1841,7 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
else
exportParagraph( xTxtCntnt, bAutoStyles, bIsProgress,
bExportParagraph, aPropSetHelper );
- bHasContent = sal_True;
+ bHasContent = true;
}
else if( xServiceInfo->supportsService( sTableService ) )
{
@@ -1871,11 +1871,11 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
pSectionExport->ExportMasterDocHeadingDummies();
}
- bHasContent = sal_True;
+ bHasContent = true;
}
else if( xServiceInfo->supportsService( sTextFrameService ) )
{
- exportTextFrame( xTxtCntnt, bAutoStyles, bIsProgress, sal_True, pRangePropSet );
+ exportTextFrame( xTxtCntnt, bAutoStyles, bIsProgress, true, pRangePropSet );
}
else if( xServiceInfo->supportsService( sTextGraphicService ) )
{
@@ -1912,12 +1912,12 @@ sal_Bool XMLTextParagraphExport::exportTextContentEnumeration(
bAutoStyles );
}
- return sal_True;
+ return true;
}
void XMLTextParagraphExport::exportParagraph(
const Reference < XTextContent > & rTextContent,
- sal_Bool bAutoStyles, sal_Bool bIsProgress, sal_Bool bExportParagraph,
+ bool bAutoStyles, bool bIsProgress, bool bExportParagraph,
MultiPropertySetHelper& rPropSetHelper)
{
sal_Int16 nOutlineLevel = -1;
@@ -2121,13 +2121,13 @@ void XMLTextParagraphExport::exportParagraph(
Reference < XEnumerationAccess > xEA( rTextContent, UNO_QUERY );
Reference < XEnumeration > xTextEnum;
xTextEnum = xEA->createEnumeration();
- const sal_Bool bHasPortions = xTextEnum.is();
+ const bool bHasPortions = xTextEnum.is();
Reference < XEnumeration> xContentEnum;
Reference < XContentEnumerationAccess > xCEA( rTextContent, UNO_QUERY );
if( xCEA.is() )
xContentEnum.set(xCEA->createContentEnumeration( sTextContentService ));
- const sal_Bool bHasContentEnum = xContentEnum.is() &&
+ const bool bHasContentEnum = xContentEnum.is() &&
xContentEnum->hasMoreElements();
Reference < XTextSection > xSection;
@@ -2158,13 +2158,13 @@ void XMLTextParagraphExport::exportParagraph(
if( bHasContentEnum )
exportTextContentEnumeration(
xContentEnum, bAutoStyles, xSection,
- bIsProgress, sal_True, 0, sal_True );
+ bIsProgress, true, 0, true );
if ( bHasPortions )
exportTextRangeEnumeration( xTextEnum, bAutoStyles, bIsProgress );
}
else
{
- sal_Bool bPrevCharIsSpace = sal_True;
+ bool bPrevCharIsSpace = true;
enum XMLTokenEnum eElem =
0 < nOutlineLevel ? XML_H : XML_P;
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT, eElem,
@@ -2180,8 +2180,8 @@ void XMLTextParagraphExport::exportParagraph(
void XMLTextParagraphExport::exportTextRangeEnumeration(
const Reference < XEnumeration > & rTextEnum,
- sal_Bool bAutoStyles, sal_Bool bIsProgress,
- sal_Bool bPrvChrIsSpc )
+ bool bAutoStyles, bool bIsProgress,
+ bool bPrvChrIsSpc )
{
static const OUString sMeta("InContentMetadata");
static const OUString sFieldMarkName("__FieldMark_");
@@ -2243,7 +2243,7 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
if( xContentEnum.is() )
exportTextContentEnumeration( xContentEnum,
bAutoStyles,
- xSection, bIsProgress, sal_True,
+ xSection, bIsProgress, true,
&xPropSet );
bPrevCharIsSpace = false;
@@ -2448,13 +2448,13 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
void XMLTextParagraphExport::exportTable(
const Reference < XTextContent > &,
- sal_Bool /*bAutoStyles*/, sal_Bool /*bIsProgress*/ )
+ bool /*bAutoStyles*/, bool /*bIsProgress*/ )
{
}
void XMLTextParagraphExport::exportTextField(
const Reference < XTextRange > & rTextRange,
- sal_Bool bAutoStyles, sal_Bool bIsProgress )
+ bool bAutoStyles, bool bIsProgress )
{
Reference < XPropertySet > xPropSet( rTextRange, UNO_QUERY );
// non-Writer apps need not support Property TextField, so test first
@@ -2464,7 +2464,7 @@ void XMLTextParagraphExport::exportTextField(
DBG_ASSERT( xTxtFld.is(), "text field missing" );
if( xTxtFld.is() )
{
- exportTextField(xTxtFld, bAutoStyles, bIsProgress, sal_True);
+ exportTextField(xTxtFld, bAutoStyles, bIsProgress, true);
}
else
{
@@ -2476,8 +2476,8 @@ void XMLTextParagraphExport::exportTextField(
void XMLTextParagraphExport::exportTextField(
const Reference < XTextField > & xTextField,
- const sal_Bool bAutoStyles, const sal_Bool bIsProgress,
- const sal_Bool bRecursive )
+ const bool bAutoStyles, const bool bIsProgress,
+ const bool bRecursive )
{
if ( bAutoStyles )
{
@@ -2492,7 +2492,7 @@ void XMLTextParagraphExport::exportTextField(
void XMLTextParagraphExport::exportSoftPageBreak(
const Reference<XPropertySet> & ,
- sal_Bool )
+ bool )
{
SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_TEXT,
XML_SOFT_PAGE_BREAK, sal_False,
@@ -2503,7 +2503,7 @@ void XMLTextParagraphExport::exportTextMark(
const Reference<XPropertySet> & rPropSet,
const OUString& rProperty,
const enum XMLTokenEnum pElements[],
- sal_Bool bAutoStyles)
+ bool bAutoStyles)
{
// mib said: "Hau wech!"
@@ -2550,11 +2550,11 @@ void XMLTextParagraphExport::exportTextMark(
// else: no styles. (see above)
}
-static sal_Bool lcl_txtpara_isBoundAsChar(
+static bool lcl_txtpara_isBoundAsChar(
const Reference < XPropertySet > & rPropSet,
const Reference < XPropertySetInfo > & rPropSetInfo )
{
- sal_Bool bIsBoundAsChar = sal_False;
+ bool bIsBoundAsChar = false;
OUString sAnchorType( "AnchorType" );
if( rPropSetInfo->hasPropertyByName( sAnchorType ) )
{
@@ -2568,7 +2568,7 @@ static sal_Bool lcl_txtpara_isBoundAsChar(
sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
const Reference < XPropertySet >& rPropSet,
- sal_Bool bShape,
+ bool bShape,
OUString *pMinHeightValue,
OUString *pMinWidthValue)
{
@@ -2781,9 +2781,9 @@ sal_Int32 XMLTextParagraphExport::addTextFrameAttributes(
void XMLTextParagraphExport::exportAnyTextFrame(
const Reference < XTextContent > & rTxtCntnt,
FrameType eType,
- sal_Bool bAutoStyles,
- sal_Bool bIsProgress,
- sal_Bool bExportContent,
+ bool bAutoStyles,
+ bool bIsProgress,
+ bool bExportContent,
const Reference < XPropertySet > *pRangePropSet)
{
Reference < XPropertySet > xPropSet( rTxtCntnt, UNO_QUERY );
@@ -2809,8 +2809,8 @@ void XMLTextParagraphExport::exportAnyTextFrame(
{
Reference < XTextFrame > xTxtFrame( rTxtCntnt, UNO_QUERY );
Reference < XText > xTxt(xTxtFrame->getText());
- exportFrameFrames( sal_True, bIsProgress, &xTxtFrame );
- exportText( xTxt, bAutoStyles, bIsProgress, sal_True );
+ exportFrameFrames( true, bIsProgress, &xTxtFrame );
+ exportText( xTxt, bAutoStyles, bIsProgress, true );
}
}
break;
@@ -2832,16 +2832,16 @@ void XMLTextParagraphExport::exportAnyTextFrame(
sal_Bool bAddCharStyles = pRangePropSet &&
lcl_txtpara_isBoundAsChar( xPropSet, xPropSetInfo );
- sal_Bool bIsUICharStyle;
- sal_Bool bHasAutoStyle = sal_False;
- sal_Bool bDummy;
+ bool bIsUICharStyle;
+ bool bHasAutoStyle = false;
+ bool bDummy;
OUString sStyle;
if( bAddCharStyles )
sStyle = FindTextStyleAndHyperlink( *pRangePropSet, bDummy, bIsUICharStyle, bHasAutoStyle );
else
- bIsUICharStyle = sal_False;
+ bIsUICharStyle = false;
XMLTextCharStyleNamesElementExport aCharStylesExport(
GetExport(), bIsUICharStyle &&
@@ -2876,7 +2876,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
{
Reference < XShape > xShape( rTxtCntnt, UNO_QUERY );
sal_Int32 nFeatures =
- addTextFrameAttributes( xPropSet, sal_True );
+ addTextFrameAttributes( xPropSet, true );
GetExport().GetShapeExport()
->exportShape( xShape, nFeatures );
}
@@ -2891,7 +2891,7 @@ void XMLTextParagraphExport::exportAnyTextFrame(
void XMLTextParagraphExport::_exportTextFrame(
const Reference < XPropertySet > & rPropSet,
const Reference < XPropertySetInfo > & rPropSetInfo,
- sal_Bool bIsProgress )
+ bool bIsProgress )
{
Reference < XTextFrame > xTxtFrame( rPropSet, UNO_QUERY );
Reference < XText > xTxt(xTxtFrame->getText());
@@ -2941,7 +2941,7 @@ void XMLTextParagraphExport::_exportTextFrame(
// frame bound frames
exportFramesBoundToFrame( xTxtFrame, bIsProgress );
- exportText( xTxt, sal_False, bIsProgress, sal_True );
+ exportText( xTxt, false, bIsProgress, true );
}
// script:events
@@ -3069,7 +3069,7 @@ void XMLTextParagraphExport::_exportTextGraphic(
if( !sAutoStyle.isEmpty() )
GetExport().AddAttribute( XML_NAMESPACE_DRAW, XML_STYLE_NAME,
GetExport().EncodeStyleName( sAutoStyle ) );
- addTextFrameAttributes( rPropSet, sal_False );
+ addTextFrameAttributes( rPropSet, false );
// svg:transform
sal_Int16 nVal = 0;
@@ -3224,7 +3224,7 @@ void XMLTextParagraphExport::setTextEmbeddedGraphicURL(
{
}
-sal_Bool XMLTextParagraphExport::addHyperlinkAttributes(
+bool XMLTextParagraphExport::addHyperlinkAttributes(
const Reference< XPropertySet > & rPropSet,
const Reference< XPropertyState > & rPropState,
const Reference< XPropertySetInfo > & rPropSetInfo )
@@ -3247,7 +3247,7 @@ sal_Bool XMLTextParagraphExport::addHyperlinkAttributes(
{
// hyperlink without an URL does not make sense
OSL_ENSURE( false, "hyperlink without an URL --> no export to ODF" );
- return sal_False;
+ return false;
}
if ( rPropSetInfo->hasPropertyByName( sHyperLinkName )
@@ -3331,8 +3331,8 @@ void XMLTextParagraphExport::exportTextRangeSpan(
const com::sun::star::uno::Reference< com::sun::star::text::XTextRange > & rTextRange,
Reference< XPropertySet > & xPropSet,
Reference < XPropertySetInfo > & xPropSetInfo,
- const sal_Bool bIsUICharStyle,
- const sal_Bool bHasAutoStyle,
+ const bool bIsUICharStyle,
+ const bool bHasAutoStyle,
const OUString& sStyle,
bool& rPrevCharIsSpace,
FieldmarkType& openFieldMark )
@@ -3361,7 +3361,7 @@ void XMLTextParagraphExport::exportTextRangeSpan(
void XMLTextParagraphExport::exportTextRange(
const Reference< XTextRange > & rTextRange,
- sal_Bool bAutoStyles,
+ bool bAutoStyles,
bool& rPrevCharIsSpace,
FieldmarkType& openFieldMark )
{
@@ -3372,14 +3372,14 @@ void XMLTextParagraphExport::exportTextRange(
}
else
{
- sal_Bool bHyperlink = sal_False;
- sal_Bool bIsUICharStyle = sal_False;
- sal_Bool bHasAutoStyle = sal_False;
+ bool bHyperlink = false;
+ bool bIsUICharStyle = false;
+ bool bHasAutoStyle = false;
const OUString sStyle(
FindTextStyleAndHyperlink( xPropSet, bHyperlink, bIsUICharStyle, bHasAutoStyle ) );
Reference < XPropertySetInfo > xPropSetInfo;
- sal_Bool bHyperlinkAttrsAdded = sal_False;
+ bool bHyperlinkAttrsAdded = false;
if ( bHyperlink )
{
Reference< XPropertyState > xPropState( xPropSet, UNO_QUERY );
@@ -3418,16 +3418,16 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
for( sal_Int32 nPos = 0; nPos < nEndPos; nPos++ )
{
sal_Unicode cChar = rText[nPos];
- sal_Bool bExpCharAsText = sal_True;
- sal_Bool bExpCharAsElement = sal_False;
- sal_Bool bCurrCharIsSpace = sal_False;
+ bool bExpCharAsText = true;
+ bool bExpCharAsElement = false;
+ bool bCurrCharIsSpace = false;
switch( cChar )
{
case 0x0009: // Tab
case 0x000A: // LF
// These characters are exported as text.
- bExpCharAsElement = sal_True;
- bExpCharAsText = sal_False;
+ bExpCharAsElement = true;
+ bExpCharAsText = false;
break;
case 0x000D:
break; // legal character
@@ -3436,9 +3436,9 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
{
// If the previous character is a space character,
// too, export a special space element.
- bExpCharAsText = sal_False;
+ bExpCharAsText = false;
}
- bCurrCharIsSpace = sal_True;
+ bCurrCharIsSpace = true;
break;
default:
if( cChar < 0x0020 )
@@ -3449,7 +3449,7 @@ void XMLTextParagraphExport::exportText( const OUString& rText,
"illegal character in text content" );
txtparae_bContainsIllegalCharacters = sal_True;
#endif
- bExpCharAsText = sal_False;
+ bExpCharAsText = false;
}
break;
}
@@ -3582,12 +3582,12 @@ void XMLTextParagraphExport::exportTextDeclarations(
pFieldExport->ExportFieldDeclarations(rText);
}
-void XMLTextParagraphExport::exportUsedDeclarations( sal_Bool bOnlyUsed )
+void XMLTextParagraphExport::exportUsedDeclarations( bool bOnlyUsed )
{
pFieldExport->SetExportOnlyUsedFieldDeclarations( bOnlyUsed );
}
-void XMLTextParagraphExport::exportTrackedChanges(sal_Bool bAutoStyles)
+void XMLTextParagraphExport::exportTrackedChanges(bool bAutoStyles)
{
if (NULL != pRedlineExport)
pRedlineExport->ExportChangesList( bAutoStyles );
@@ -3595,7 +3595,7 @@ void XMLTextParagraphExport::exportTrackedChanges(sal_Bool bAutoStyles)
void XMLTextParagraphExport::exportTrackedChanges(
const Reference<XText> & rText,
- sal_Bool bAutoStyle)
+ bool bAutoStyle)
{
if (NULL != pRedlineExport)
pRedlineExport->ExportChangesList(rText, bAutoStyle);
@@ -3646,7 +3646,7 @@ void XMLTextParagraphExport::exportTextAutoStyles()
void XMLTextParagraphExport::exportRuby(
const Reference<XPropertySet> & rPropSet,
- sal_Bool bAutoStyles )
+ bool bAutoStyles )
{
// early out: a collapsed ruby makes no sense
if (*(sal_Bool*)rPropSet->getPropertyValue(sIsCollapsed).getValue())
@@ -3690,7 +3690,7 @@ void XMLTextParagraphExport::exportRuby(
GetExport().ClearAttrList();
GetExport().StartElement( XML_NAMESPACE_TEXT, XML_RUBY_BASE,
sal_False );
- bOpenRuby = sal_True;
+ bOpenRuby = true;
}
else
{
@@ -3721,14 +3721,14 @@ void XMLTextParagraphExport::exportRuby(
// and finally, close the ruby
GetExport().EndElement(XML_NAMESPACE_TEXT, XML_RUBY, sal_False);
- bOpenRuby = sal_False;
+ bOpenRuby = false;
}
}
}
void XMLTextParagraphExport::exportMeta(
const Reference<XPropertySet> & i_xPortion,
- sal_Bool i_bAutoStyles, sal_Bool i_isProgress)
+ bool i_bAutoStyles, bool i_isProgress)
{
static OUString sMeta("InContentMetadata");
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index bfa03d8b4b53..8bb11885ace8 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -275,12 +275,12 @@ class XMLImpSpanContext_Impl : public SvXMLImportContext
{
const OUString sTextFrame;
- XMLHints_Impl& rHints;
+ XMLHints_Impl& rHints;
XMLStyleHint_Impl *pHint;
- sal_Bool& rIgnoreLeadingSpace;
+ bool& rIgnoreLeadingSpace;
- sal_uInt8 nStarFontsConvFlags;
+ sal_uInt8 nStarFontsConvFlags;
public:
@@ -292,8 +292,8 @@ public:
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace
- ,sal_uInt8 nSFConvFlags
+ bool& rIgnLeadSpace,
+ sal_uInt8 nSFConvFlags
);
virtual ~XMLImpSpanContext_Impl();
@@ -303,8 +303,8 @@ public:
sal_uInt16 nPrefix, const OUString& rLocalName,
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken, XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace
- ,sal_uInt8 nStarFontsConvFlags = 0
+ bool& rIgnLeadSpace,
+ sal_uInt8 nStarFontsConvFlags = 0
);
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix, const OUString& rLocalName,
@@ -318,7 +318,7 @@ class XMLImpHyperlinkContext_Impl : public SvXMLImportContext
XMLHints_Impl& mrHints;
XMLHyperlinkHint_Impl *mpHint;
- sal_Bool& mrbIgnoreLeadingSpace;
+ bool& mrbIgnoreLeadingSpace;
public:
@@ -330,7 +330,7 @@ public:
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace );
+ bool& rIgnLeadSpace );
virtual ~XMLImpHyperlinkContext_Impl();
@@ -349,7 +349,7 @@ XMLImpHyperlinkContext_Impl::XMLImpHyperlinkContext_Impl(
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace )
+ bool& rIgnLeadSpace )
: SvXMLImportContext( rImport, nPrfx, rLName )
, mrHints( rHnts )
, mpHint( new XMLHyperlinkHint_Impl( GetImport().GetTextImport()->GetCursorAsRange()->getStart() ) )
@@ -451,7 +451,7 @@ class XMLImpRubyBaseContext_Impl : public SvXMLImportContext
{
XMLHints_Impl& rHints;
- sal_Bool& rIgnoreLeadingSpace;
+ bool& rIgnoreLeadingSpace;
public:
@@ -463,7 +463,7 @@ public:
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace );
+ bool& rIgnLeadSpace );
virtual ~XMLImpRubyBaseContext_Impl();
@@ -482,7 +482,7 @@ XMLImpRubyBaseContext_Impl::XMLImpRubyBaseContext_Impl(
const OUString& rLName,
const Reference< xml::sax::XAttributeList > &,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace ) :
+ bool& rIgnLeadSpace ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
rHints( rHnts ),
rIgnoreLeadingSpace( rIgnLeadSpace )
@@ -515,7 +515,7 @@ class XMLImpRubyContext_Impl : public SvXMLImportContext
{
XMLHints_Impl& rHints;
- sal_Bool& rIgnoreLeadingSpace;
+ bool& rIgnoreLeadingSpace;
Reference < XTextRange > m_xStart;
OUString m_sStyleName;
@@ -532,7 +532,7 @@ public:
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace );
+ bool& rIgnLeadSpace );
virtual ~XMLImpRubyContext_Impl();
@@ -611,7 +611,7 @@ XMLImpRubyContext_Impl::XMLImpRubyContext_Impl(
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace ) :
+ bool& rIgnLeadSpace ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
rHints( rHnts ),
rIgnoreLeadingSpace( rIgnLeadSpace )
@@ -683,7 +683,7 @@ class XMLMetaImportContextBase : public SvXMLImportContext
{
XMLHints_Impl& m_rHints;
- sal_Bool& m_rIgnoreLeadingSpace;
+ bool& m_rIgnoreLeadingSpace;
/// start position
Reference<XTextRange> m_xStart;
@@ -699,7 +699,7 @@ public:
const sal_uInt16 i_nPrefix,
const OUString& i_rLocalName,
XMLHints_Impl& i_rHints,
- sal_Bool & i_rIgnoreLeadingSpace );
+ bool & i_rIgnoreLeadingSpace );
virtual ~XMLMetaImportContextBase();
@@ -728,7 +728,7 @@ XMLMetaImportContextBase::XMLMetaImportContextBase(
const sal_uInt16 i_nPrefix,
const OUString& i_rLocalName,
XMLHints_Impl& i_rHints,
- sal_Bool & i_rIgnoreLeadingSpace )
+ bool & i_rIgnoreLeadingSpace )
: SvXMLImportContext( i_rImport, i_nPrefix, i_rLocalName )
, m_rHints( i_rHints )
, m_rIgnoreLeadingSpace( i_rIgnoreLeadingSpace )
@@ -818,7 +818,7 @@ public:
const sal_uInt16 i_nPrefix,
const OUString& i_rLocalName,
XMLHints_Impl& i_rHints,
- sal_Bool & i_rIgnoreLeadingSpace );
+ bool & i_rIgnoreLeadingSpace );
virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
OUString const & i_rLocalName, OUString const & i_rValue) SAL_OVERRIDE;
@@ -833,7 +833,7 @@ XMLMetaImportContext::XMLMetaImportContext(
const sal_uInt16 i_nPrefix,
const OUString& i_rLocalName,
XMLHints_Impl& i_rHints,
- sal_Bool & i_rIgnoreLeadingSpace )
+ bool & i_rIgnoreLeadingSpace )
: XMLMetaImportContextBase( i_rImport, i_nPrefix, i_rLocalName,
i_rHints, i_rIgnoreLeadingSpace )
, m_bHaveAbout(false)
@@ -912,7 +912,7 @@ public:
const sal_uInt16 i_nPrefix,
const OUString& i_rLocalName,
XMLHints_Impl& i_rHints,
- sal_Bool & i_rIgnoreLeadingSpace );
+ bool & i_rIgnoreLeadingSpace );
virtual void ProcessAttribute(sal_uInt16 const i_nPrefix,
OUString const & i_rLocalName, OUString const & i_rValue) SAL_OVERRIDE;
@@ -927,7 +927,7 @@ XMLMetaFieldImportContext::XMLMetaFieldImportContext(
const sal_uInt16 i_nPrefix,
const OUString& i_rLocalName,
XMLHints_Impl& i_rHints,
- sal_Bool & i_rIgnoreLeadingSpace )
+ bool & i_rIgnoreLeadingSpace )
: XMLMetaImportContextBase( i_rImport, i_nPrefix, i_rLocalName,
i_rHints, i_rIgnoreLeadingSpace )
{
@@ -966,7 +966,7 @@ void XMLMetaFieldImportContext::InsertMeta(
if (!m_DataStyleName.isEmpty())
{
- sal_Bool isDefaultLanguage(sal_True);
+ bool isDefaultLanguage(true);
const sal_Int32 nKey( GetImport().GetTextImport()->GetDataStyleKey(
m_DataStyleName, & isDefaultLanguage) );
@@ -1518,8 +1518,8 @@ XMLImpSpanContext_Impl::XMLImpSpanContext_Impl(
const OUString& rLName,
const Reference< xml::sax::XAttributeList > & xAttrList,
XMLHints_Impl& rHnts,
- sal_Bool& rIgnLeadSpace
- ,sal_uInt8 nSFConvFlags
+ bool& rIgnLeadSpace,
+ sal_uInt8 nSFConvFlags
)
: SvXMLImportContext( rImport, nPrfx, rLName )
, sTextFrame("TextFrame")
@@ -1565,8 +1565,8 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
const Reference< xml::sax::XAttributeList > & xAttrList,
sal_uInt16 nToken,
XMLHints_Impl& rHints,
- sal_Bool& rIgnoreLeadingSpace
- ,sal_uInt8 nStarFontsConvFlags
+ bool& rIgnoreLeadingSpace,
+ sal_uInt8 nStarFontsConvFlags
)
{
SvXMLImportContext *pContext = 0;
@@ -1586,14 +1586,14 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
pContext = new XMLCharContext( rImport, nPrefix,
rLocalName, xAttrList,
0x0009, false );
- rIgnoreLeadingSpace = sal_False;
+ rIgnoreLeadingSpace = false;
break;
case XML_TOK_TEXT_LINE_BREAK:
pContext = new XMLCharContext( rImport, nPrefix,
rLocalName, xAttrList,
ControlCharacter::LINE_BREAK );
- rIgnoreLeadingSpace = sal_False;
+ rIgnoreLeadingSpace = false;
break;
case XML_TOK_TEXT_S:
@@ -1625,7 +1625,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
{
pContext = new XMLUrlFieldImportContext( rImport, *rImport.GetTextImport().get(), nPrefix, rLocalName );
//whitespace handling like other fields
- rIgnoreLeadingSpace = sal_False;
+ rIgnoreLeadingSpace = false;
}
break;
@@ -1651,7 +1651,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
*rImport.GetTextImport().get(),
nPrefix, rLocalName );
}
- rIgnoreLeadingSpace = sal_False;
+ rIgnoreLeadingSpace = false;
break;
case XML_TOK_TEXT_REFERENCE:
@@ -1700,7 +1700,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
pTextFrameContext, xAnchorPos ) );
}
pContext = pTextFrameContext;
- rIgnoreLeadingSpace = sal_False;
+ rIgnoreLeadingSpace = false;
}
break;
case XML_TOK_DRAW_A:
@@ -1794,7 +1794,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
new SvXMLImportContext( rImport, nPrefix, rLocalName );
}
// Behind fields, shapes and any unknown content blanks aren't ignored
- rIgnoreLeadingSpace = sal_False;
+ rIgnoreLeadingSpace = false;
}
return pContext;
@@ -1822,7 +1822,7 @@ void XMLImpSpanContext_Impl::Characters( const OUString& rChars )
OUString sChars =
GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName,
nStarFontsConvFlags,
- sal_False, GetImport() );
+ false, GetImport() );
GetImport().GetTextImport()->InsertString( sChars, rIgnoreLeadingSpace );
}
@@ -1841,7 +1841,7 @@ XMLParaContext::XMLParaContext(
pHints( 0 ),
// Lost outline numbering in master document (#i73509#)
mbOutlineLevelAttrFound( sal_False ),
- bIgnoreLeadingSpace( sal_True ),
+ bIgnoreLeadingSpace( true ),
bHeading( bHead ),
bIsListHeader( false ),
bIsRestart (false),
@@ -2018,9 +2018,9 @@ XMLParaContext::~XMLParaContext()
*/
xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
sCellParaStyleName,
- sal_True,
- sal_False, -1, // suppress outline handling
- sal_False ); // suppress list attributes handling
+ true,
+ false, -1, // suppress outline handling
+ false ); // suppress list attributes handling
}
// #103445# for headings without style name, find the proper style
@@ -2031,7 +2031,7 @@ XMLParaContext::~XMLParaContext()
// Add paramter <mbOutlineLevelAttrFound> (#i73509#)
sStyleName = xTxtImport->SetStyleAndAttrs( GetImport(), xAttrCursor,
sStyleName,
- sal_True,
+ true,
mbOutlineLevelAttrFound,
bHeading ? nOutlineLevel : -1 );
@@ -2093,7 +2093,7 @@ XMLParaContext::~XMLParaContext()
if( !rStyleName.isEmpty() )
xTxtImport->SetStyleAndAttrs( GetImport(),
xAttrCursor, rStyleName,
- sal_False );
+ false );
}
break;
case XML_HINT_REFERENCE:
@@ -2246,7 +2246,7 @@ void XMLParaContext::Characters( const OUString& rChars )
OUString sChars =
GetImport().GetTextImport()->ConvertStarFonts( rChars, sStyleName,
nStarFontsConvFlags,
- sal_True, GetImport() );
+ true, GetImport() );
GetImport().GetTextImport()->InsertString( sChars, bIgnoreLeadingSpace );
}
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 40cb943e3744..a04d20a6bbcd 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -48,7 +48,7 @@ class XMLParaContext : public SvXMLImportContext
XMLHints_Impl *pHints;
// Lost outline numbering in master document (#i73509#)
sal_Bool mbOutlineLevelAttrFound;
- sal_Bool bIgnoreLeadingSpace;
+ bool bIgnoreLeadingSpace;
bool bHeading;
sal_Bool bIsListHeader;
sal_Bool bIsRestart;
diff --git a/xmloff/source/text/txtsecte.cxx b/xmloff/source/text/txtsecte.cxx
index 91d386552bb0..1dc5a1f6ce00 100644
--- a/xmloff/source/text/txtsecte.cxx
+++ b/xmloff/source/text/txtsecte.cxx
@@ -66,7 +66,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
const Reference<XTextContent> & rNextSectionContent,
const XMLTextNumRuleInfo& rPrevRule,
const XMLTextNumRuleInfo& rNextRule,
- sal_Bool bAutoStyles)
+ bool bAutoStyles)
{
Reference<XTextSection> xNextSection;
@@ -92,7 +92,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
const Reference<XTextContent> & rNextSectionContent,
const XMLTextNumRuleInfo& rPrevRule,
const XMLTextNumRuleInfo& rNextRule,
- sal_Bool bAutoStyles)
+ bool bAutoStyles)
{
Reference<XTextSection> xNextSection;
@@ -119,7 +119,7 @@ void XMLTextParagraphExport::exportListAndSectionChange(
const Reference<XTextSection> & rNextSection,
const XMLTextNumRuleInfo& rPrevRule,
const XMLTextNumRuleInfo& rNextRule,
- sal_Bool bAutoStyles)
+ bool bAutoStyles)
{
// old != new? -> maybe we have to start or end a new section
if (rPrevSection != rNextSection)
diff --git a/xmloff/source/text/txtstyle.cxx b/xmloff/source/text/txtstyle.cxx
index eba122b9d2ee..34c842c314a7 100644
--- a/xmloff/source/text/txtstyle.cxx
+++ b/xmloff/source/text/txtstyle.cxx
@@ -102,13 +102,13 @@ void XMLTextParagraphExport::exportStyleAttributes(
}
}
-void XMLTextParagraphExport::exportNumStyles( sal_Bool bUsed )
+void XMLTextParagraphExport::exportNumStyles( bool bUsed )
{
SvxXMLNumRuleExport aNumRuleExport( GetExport() );
aNumRuleExport.exportStyles( bUsed, pListAutoPool, !IsBlockMode() );
}
-void XMLTextParagraphExport::exportTextStyles( sal_Bool bUsed, sal_Bool bProg )
+void XMLTextParagraphExport::exportTextStyles( bool bUsed, bool bProg )
{
sal_Bool bOldProg = bProgress;
bProgress = bProg;
diff --git a/xmloff/source/text/txtstyli.cxx b/xmloff/source/text/txtstyli.cxx
index 34ad344c355b..13afc4c210e8 100644
--- a/xmloff/source/text/txtstyli.cxx
+++ b/xmloff/source/text/txtstyli.cxx
@@ -82,18 +82,18 @@ void XMLTextStyleContext::SetAttribute( sal_uInt16 nPrefixKey,
if( IsXMLToken( rLocalName, XML_AUTO_UPDATE ) )
{
if( IsXMLToken( rValue, XML_TRUE ) )
- bAutoUpdate = sal_True;
+ bAutoUpdate = true;
}
else if( IsXMLToken( rLocalName, XML_LIST_STYLE_NAME ) )
{
sListStyleName = rValue;
// Inherited paragraph style lost information about unset numbering (#i69523#)
- mbListStyleSet = sal_True;
+ mbListStyleSet = true;
}
else if( IsXMLToken( rLocalName, XML_MASTER_PAGE_NAME ) )
{
sMasterPageName = rValue;
- bHasMasterPageName = sal_True;
+ bHasMasterPageName = true;
}
else if( IsXMLToken( rLocalName, XML_DATA_STYLE_NAME ) )
{
@@ -127,7 +127,7 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
sal_uInt16 nPrfx, const OUString& rLName,
const Reference< XAttributeList > & xAttrList,
SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
- sal_Bool bDefaultStyle )
+ bool bDefaultStyle )
: XMLPropStyleContext( rImport, nPrfx, rLName, xAttrList, rStyles, nFamily, bDefaultStyle )
, sIsAutoUpdate( "IsAutoUpdate" )
, sCategory( "Category" )
@@ -136,11 +136,11 @@ XMLTextStyleContext::XMLTextStyleContext( SvXMLImport& rImport,
, sDropCapCharStyleName( "DropCapCharStyleName" )
, sPageDescName( "PageDescName" )
, nOutlineLevel( -1 )
-, bAutoUpdate( sal_False )
-, bHasMasterPageName( sal_False )
-, bHasCombinedCharactersLetter( sal_False )
+, bAutoUpdate( false )
+, bHasMasterPageName( false )
+, bHasCombinedCharactersLetter( false )
// Inherited paragraph style lost information about unset numbering (#i69523#)
-, mbListStyleSet( sal_False )
+, mbListStyleSet( false )
, pEventContext( NULL )
{
}
diff --git a/xmloff/source/text/txtvfldi.cxx b/xmloff/source/text/txtvfldi.cxx
index c1832e65d009..96ae34819339 100644
--- a/xmloff/source/text/txtvfldi.cxx
+++ b/xmloff/source/text/txtvfldi.cxx
@@ -1260,7 +1260,7 @@ XMLValueImportHelper::XMLValueImportHelper(
fValue(0.0),
nFormatKey(0),
- bIsDefaultLanguage(sal_True),
+ bIsDefaultLanguage(true),
bStringType(sal_False),
bFormatOK(sal_False),