summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-20 14:38:38 +0200
committerNoel Grandin <noel@peralex.com>2014-03-24 08:12:10 +0200
commit7a679ee19c3a18d89277c28b12bf81911acfef85 (patch)
tree4a98a2beb9997a9c4ba66bc01a4f40b9d15f60b1
parent554e54429c586468778cea4a4571b80de7d28d8d (diff)
svtools: sal_Bool->bool
Change-Id: I35c9c1514c67860e61b6e2457ab4548d04a4d159
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx6
-rw-r--r--include/svtools/headbar.hxx48
-rw-r--r--include/svtools/helpopt.hxx12
-rw-r--r--include/svtools/htmlcfg.hxx30
-rw-r--r--include/svtools/htmlout.hxx8
-rw-r--r--include/svtools/hyperlabel.hxx2
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx2
-rw-r--r--svtools/source/config/helpopt.cxx32
-rw-r--r--svtools/source/config/htmlcfg.cxx44
-rw-r--r--svtools/source/control/headbar.cxx120
-rw-r--r--svtools/source/control/hyperlabel.cxx10
-rw-r--r--svtools/source/svhtml/htmlout.cxx12
-rw-r--r--sw/source/filter/html/css1atr.cxx8
-rw-r--r--sw/source/filter/html/htmlatr.cxx25
-rw-r--r--sw/source/filter/html/htmldraw.cxx2
-rw-r--r--sw/source/filter/html/htmlfldw.cxx2
-rw-r--r--sw/source/filter/html/htmlfly.cxx10
-rw-r--r--sw/source/filter/html/htmlforw.cxx8
-rw-r--r--sw/source/filter/html/htmlftn.cxx10
-rw-r--r--sw/source/filter/html/htmlnum.cxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx4
-rw-r--r--sw/source/filter/html/htmltabw.cxx39
-rw-r--r--sw/source/filter/html/wrthtml.cxx10
23 files changed, 222 insertions, 224 deletions
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 6d4ba067d0d0..cda597a5eb7e 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -642,7 +642,7 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\
// Macros for HTML-Export
#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag )
-#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, sal_False )
+#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, false )
#define OUT_LF() m_pStream->WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() )
#define TAG_ON_LF( tag ) (TAG_ON( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() ))
#define TAG_OFF_LF( tag ) (TAG_OFF( tag ).WriteCharPtr( SAL_NEWLINE_STRING ).WriteCharPtr( GetIndentStr() ))
@@ -967,11 +967,11 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat, sal_Int32 nWidthPixel, sal
try
{
fVal = m_xFormatter->convertStringToNumber(nFormat,rValue);
- HTMLOutFuncs::CreateTableDataOptionsValNum(sal_False, fVal,nFormat, *pFormatter);
+ HTMLOutFuncs::CreateTableDataOptionsValNum(false, fVal,nFormat, *pFormatter);
}
catch(const Exception&)
{
- HTMLOutFuncs::CreateTableDataOptionsValNum(sal_False, fVal,nFormat, *pFormatter);
+ HTMLOutFuncs::CreateTableDataOptionsValNum(false, fVal,nFormat, *pFormatter);
}
}
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index f4560fb08149..94f30889b849 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -246,14 +246,14 @@ private:
long mnStartPos;
long mnDragPos;
long mnMouseOff;
- sal_uInt16 mnCurItemId;
- sal_uInt16 mnItemDragPos;
- sal_Bool mbDragable;
- sal_Bool mbDrag;
- sal_Bool mbItemDrag;
- sal_Bool mbOutDrag;
- sal_Bool mbButtonStyle;
- sal_Bool mbItemMode;
+ sal_uInt16 mnCurItemId;
+ sal_uInt16 mnItemDragPos;
+ bool mbDragable;
+ bool mbDrag;
+ bool mbItemDrag;
+ bool mbOutDrag;
+ bool mbButtonStyle;
+ bool mbItemMode;
Link maStartDragHdl;
Link maDragHdl;
Link maEndDragHdl;
@@ -270,25 +270,25 @@ private:
using Window::ImplInit;
SVT_DLLPRIVATE void ImplInit( WinBits nWinStyle );
- SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground );
+ SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
SVT_DLLPRIVATE long ImplGetItemPos( sal_uInt16 nPos ) const;
SVT_DLLPRIVATE Rectangle ImplGetItemRect( sal_uInt16 nPos ) const;
using Window::ImplHitTest;
SVT_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, long& nMouseOff, sal_uInt16& nPos ) const;
SVT_DLLPRIVATE void ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos );
SVT_DLLPRIVATE void ImplDrawItem( OutputDevice* pDev,
- sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
+ sal_uInt16 nPos, bool bHigh, bool bDrag,
const Rectangle& rItemRect,
const Rectangle* pRect,
sal_uLong nFlags );
- SVT_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh = sal_False,
- sal_Bool bDrag = sal_False,
+ SVT_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, bool bHigh = false,
+ bool bDrag = false,
const Rectangle* pRect = NULL );
SVT_DLLPRIVATE void ImplUpdate( sal_uInt16 nPos,
- sal_Bool bEnd = sal_False, sal_Bool bDirect = sal_False );
- SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, sal_Bool bCommand );
+ bool bEnd = false, bool bDirect = false );
+ SVT_DLLPRIVATE void ImplStartDrag( const Point& rPos, bool bCommand );
SVT_DLLPRIVATE void ImplDrag( const Point& rPos );
- SVT_DLLPRIVATE void ImplEndDrag( sal_Bool bCancel );
+ SVT_DLLPRIVATE void ImplEndDrag( bool bCancel );
public:
HeaderBar( Window* pParent, WinBits nWinBits = WB_STDHEADERBAR );
@@ -324,16 +324,16 @@ public:
inline void SetDragSize( long nNewSize = 0 ) { mnDragSize = nNewSize; }
long GetDragSize() const { return mnDragSize; }
- sal_uInt16 GetItemCount() const;
- sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
- sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
- sal_uInt16 GetItemId( const Point& rPos ) const;
+ sal_uInt16 GetItemCount() const;
+ sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const;
+ sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
+ sal_uInt16 GetItemId( const Point& rPos ) const;
Rectangle GetItemRect( sal_uInt16 nItemId ) const;
- sal_uInt16 GetCurItemId() const { return mnCurItemId; }
+ sal_uInt16 GetCurItemId() const { return mnCurItemId; }
long GetDragPos() const { return mnDragPos; }
- sal_uInt16 GetItemDragPos() const { return mnItemDragPos; }
- sal_Bool IsItemMode() const { return mbItemMode; }
- sal_Bool IsItemDrag() const { return mbItemDrag; }
+ sal_uInt16 GetItemDragPos() const { return mnItemDragPos; }
+ bool IsItemMode() const { return mbItemMode; }
+ bool IsItemDrag() const { return mbItemDrag; }
void SetItemSize( sal_uInt16 nItemId, long nNewSize );
long GetItemSize( sal_uInt16 nItemId ) const;
@@ -366,7 +366,7 @@ public:
inline void SetCreateAccessibleHdl( const Link& rLink ) { maCreateAccessibleHdl = rLink; }
inline const Link& GetCreateAccessibleHdl() const { return maCreateAccessibleHdl; }
- inline sal_Bool IsDragable() const { return mbDragable; }
+ inline bool IsDragable() const { return mbDragable; }
/** Creates and returns the accessible object of the header bar. */
virtual ::com::sun::star::uno::Reference<
diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx
index 75ea3b89faa2..c9f44c7aedd3 100644
--- a/include/svtools/helpopt.hxx
+++ b/include/svtools/helpopt.hxx
@@ -35,16 +35,16 @@ public:
SvtHelpOptions();
virtual ~SvtHelpOptions();
- void SetExtendedHelp( sal_Bool b );
- bool IsExtendedHelp() const;
- void SetHelpTips( sal_Bool b );
- bool IsHelpTips() const;
+ void SetExtendedHelp( bool b );
+ bool IsExtendedHelp() const;
+ void SetHelpTips( bool b );
+ bool IsHelpTips() const;
const OUString& GetHelpStyleSheet()const;
void SetHelpStyleSheet(const OUString& rStyleSheet);
- void SetWelcomeScreen( sal_Bool b );
- sal_Bool IsWelcomeScreen() const;
+ void SetWelcomeScreen( bool b );
+ bool IsWelcomeScreen() const;
OUString GetSystem() const;
};
diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx
index 678c417b54df..e06c7e93b77e 100644
--- a/include/svtools/htmlcfg.hxx
+++ b/include/svtools/htmlcfg.hxx
@@ -52,34 +52,34 @@ public:
sal_uInt16 GetFontSize(sal_uInt16 nPos) const;
void SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize);
- sal_Bool IsImportUnknown() const;
- void SetImportUnknown(sal_Bool bSet);
+ bool IsImportUnknown() const;
+ void SetImportUnknown(bool bSet);
sal_uInt16 GetExportMode() const;
void SetExportMode(sal_uInt16 nSet);
- sal_Bool IsStarBasic() const;
- void SetStarBasic(sal_Bool bSet);
+ bool IsStarBasic() const;
+ void SetStarBasic(bool bSet);
- sal_Bool IsStarBasicWarning() const;
- void SetStarBasicWarning(sal_Bool bSet);
+ bool IsStarBasicWarning() const;
+ void SetStarBasicWarning(bool bSet);
- sal_Bool IsSaveGraphicsLocal() const;
- void SetSaveGraphicsLocal(sal_Bool bSet);
+ bool IsSaveGraphicsLocal() const;
+ void SetSaveGraphicsLocal(bool bSet);
- sal_Bool IsPrintLayoutExtension() const;
- void SetPrintLayoutExtension(sal_Bool bSet);
+ bool IsPrintLayoutExtension() const;
+ void SetPrintLayoutExtension(bool bSet);
- sal_Bool IsIgnoreFontFamily() const;
- void SetIgnoreFontFamily(sal_Bool bSet);
+ bool IsIgnoreFontFamily() const;
+ void SetIgnoreFontFamily(bool bSet);
- sal_Bool IsDefaultTextEncoding() const;
+ bool IsDefaultTextEncoding() const;
rtl_TextEncoding GetTextEncoding() const;
void SetTextEncoding( rtl_TextEncoding );
static SvxHtmlOptions& Get();
- sal_Bool IsNumbersEnglishUS() const;
- void SetNumbersEnglishUS(sal_Bool bSet);
+ bool IsNumbersEnglishUS() const;
+ void SetNumbersEnglishUS(bool bSet);
};
#endif
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index c13d6b92713f..9ae7f1918209 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -56,7 +56,7 @@ struct HTMLOutFuncs
OUString *pNonConvertableChars = 0 );
SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr,
- sal_Bool bOn = sal_True,
+ bool bOn = true,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252);
SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
HTMLOutContext& rContext,
@@ -70,7 +70,7 @@ struct HTMLOutFuncs
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 );
SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&,
const HTMLOutEvent *pEventTable,
- sal_Bool bOutStarBasic,
+ bool bOutStarBasic,
const sal_Char *pDelim = 0,
const sal_Char *pIndentArea = 0,
const sal_Char *pIndentMap = 0,
@@ -92,13 +92,13 @@ struct HTMLOutFuncs
// der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem
// nur aus 0 bestehen Eintrag terminiert ist.
SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&,
- const HTMLOutEvent*, sal_Bool bOutStarBasic,
+ const HTMLOutEvent*, bool bOutStarBasic,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0 );
// <TD SDVAL="..." SDNUM="...">
SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum(
- sal_Bool bValue, double fVal, sal_uLong nFormat,
+ bool bValue, double fVal, sal_uLong nFormat,
SvNumberFormatter& rFormatter,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
OUString *pNonConvertableChars = 0);
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx
index 502a1bb7a2c6..954cd4d6a96b 100644
--- a/include/svtools/hyperlabel.hxx
+++ b/include/svtools/hyperlabel.hxx
@@ -66,7 +66,7 @@ namespace svt
void SetLabel( const OUString& _rText );
void ToggleBackgroundColor( const Color& _rGBColor );
- void SetInteractive( sal_Bool _bInteractive );
+ void SetInteractive( bool _bInteractive );
void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
const Link& GetClickHdl() const { return maClickHdl; }
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index df6971203043..fd51807079ca 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -107,7 +107,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
if( !rTitle.isEmpty() )
HTMLOutFuncs::Out_String( rStrm, rTitle, eDestEnc, pNonConvertableChars );
}
- HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title, false );
// Target-Frame
if( i_xDocProps.is() )
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 7284b524b9e6..ea0168bd5646 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -48,9 +48,9 @@ static sal_Int32 nRefCount = 0;
class SvtHelpOptions_Impl : public utl::ConfigItem
{
- sal_Bool bExtendedHelp;
- sal_Bool bHelpTips;
- sal_Bool bWelcomeScreen;
+ bool bExtendedHelp;
+ bool bHelpTips;
+ bool bWelcomeScreen;
OUString aLocale;
OUString aSystem;
OUString sHelpStyleSheet;
@@ -68,13 +68,13 @@ public:
void Load( const ::com::sun::star::uno::Sequence< OUString>& aPropertyNames);
virtual void Commit();
- void SetExtendedHelp( sal_Bool b ) { bExtendedHelp= b; SetModified(); }
- bool IsExtendedHelp() const { return bExtendedHelp; }
- void SetHelpTips( sal_Bool b ) { bHelpTips = b; SetModified(); }
- bool IsHelpTips() const { return bHelpTips; }
+ void SetExtendedHelp( bool b ) { bExtendedHelp= b; SetModified(); }
+ bool IsExtendedHelp() const { return bExtendedHelp; }
+ void SetHelpTips( bool b ) { bHelpTips = b; SetModified(); }
+ bool IsHelpTips() const { return bHelpTips; }
- void SetWelcomeScreen( sal_Bool b ) { bWelcomeScreen = b; SetModified(); }
- sal_Bool IsWelcomeScreen() const { return bWelcomeScreen; }
+ void SetWelcomeScreen( bool b ) { bWelcomeScreen = b; SetModified(); }
+ bool IsWelcomeScreen() const { return bWelcomeScreen; }
OUString GetLocale() const { return aLocale; }
OUString GetSystem() const { return aSystem; }
@@ -125,9 +125,9 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames()
SvtHelpOptions_Impl::SvtHelpOptions_Impl()
: ConfigItem( OUString( "Office.Common/Help" ) )
- , bExtendedHelp( sal_False )
- , bHelpTips( sal_True )
- , bWelcomeScreen( sal_False )
+ , bExtendedHelp( false )
+ , bHelpTips( true )
+ , bWelcomeScreen( false )
{
Sequence< OUString > aNames = GetPropertyNames();
Load( aNames );
@@ -286,7 +286,7 @@ SvtHelpOptions::~SvtHelpOptions()
}
}
-void SvtHelpOptions::SetExtendedHelp( sal_Bool b )
+void SvtHelpOptions::SetExtendedHelp( bool b )
{
pImp->SetExtendedHelp( b );
}
@@ -296,7 +296,7 @@ bool SvtHelpOptions::IsExtendedHelp() const
return pImp->IsExtendedHelp();
}
-void SvtHelpOptions::SetHelpTips( sal_Bool b )
+void SvtHelpOptions::SetHelpTips( bool b )
{
pImp->SetHelpTips( b );
}
@@ -308,12 +308,12 @@ bool SvtHelpOptions::IsHelpTips() const
-void SvtHelpOptions::SetWelcomeScreen( sal_Bool b )
+void SvtHelpOptions::SetWelcomeScreen( bool b )
{
pImp->SetWelcomeScreen( b );
}
-sal_Bool SvtHelpOptions::IsWelcomeScreen() const
+bool SvtHelpOptions::IsWelcomeScreen() const
{
return pImp->IsWelcomeScreen();
}
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index caef175e6d6f..b42eeaa6e982 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -50,13 +50,13 @@ struct HtmlOptions_Impl
sal_Int32 nExportMode;
sal_Int32 aFontSizeArr[HTML_FONT_COUNT];
sal_Int32 eEncoding;
- sal_Bool bIsEncodingDefault;
+ bool bIsEncodingDefault;
HtmlOptions_Impl() :
nFlags(HTMLCFG_LOCAL_GRF|HTMLCFG_IS_BASIC_WARNING),
nExportMode(HTML_CFG_NS40),
eEncoding( osl_getThreadTextEncoding() ),
- bIsEncodingDefault(sal_True)
+ bIsEncodingDefault(true)
{
aFontSizeArr[0] = HTMLFONTSZ1_DFLT;
aFontSizeArr[1] = HTMLFONTSZ2_DFLT;
@@ -176,7 +176,7 @@ void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
break;//"Export/Warning"
case 14: pValues[nProp] >>= pImp->eEncoding;
- pImp->bIsEncodingDefault = sal_False;
+ pImp->bIsEncodingDefault = false;
break;//"Export/Encoding"
case 15:
@@ -199,7 +199,7 @@ void SvxHtmlOptions::Commit()
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{
- sal_Bool bSet = sal_False;
+ bool bSet = false;
switch(nProp)
{
case 0: bSet = 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS);break;//"Import/UnknownTag",
@@ -277,7 +277,7 @@ void SvxHtmlOptions::SetFontSize(sal_uInt16 nPos, sal_uInt16 nSize)
-sal_Bool SvxHtmlOptions::IsImportUnknown() const
+bool SvxHtmlOptions::IsImportUnknown() const
{
return 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS) ;
}
@@ -285,7 +285,7 @@ sal_Bool SvxHtmlOptions::IsImportUnknown() const
-void SvxHtmlOptions::SetImportUnknown(sal_Bool bSet)
+void SvxHtmlOptions::SetImportUnknown(bool bSet)
{
if(bSet)
pImp->nFlags |= HTMLCFG_UNKNOWN_TAGS;
@@ -318,7 +318,7 @@ void SvxHtmlOptions::SetExportMode(sal_uInt16 nSet)
-sal_Bool SvxHtmlOptions::IsStarBasic() const
+bool SvxHtmlOptions::IsStarBasic() const
{
return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ;
}
@@ -326,7 +326,7 @@ sal_Bool SvxHtmlOptions::IsStarBasic() const
-void SvxHtmlOptions::SetStarBasic(sal_Bool bSet)
+void SvxHtmlOptions::SetStarBasic(bool bSet)
{
if(bSet)
pImp->nFlags |= HTMLCFG_STAR_BASIC;
@@ -335,12 +335,12 @@ void SvxHtmlOptions::SetStarBasic(sal_Bool bSet)
SetModified();
}
-sal_Bool SvxHtmlOptions::IsSaveGraphicsLocal() const
+bool SvxHtmlOptions::IsSaveGraphicsLocal() const
{
return 0 != (pImp->nFlags & HTMLCFG_LOCAL_GRF) ;
}
-void SvxHtmlOptions::SetSaveGraphicsLocal(sal_Bool bSet)
+void SvxHtmlOptions::SetSaveGraphicsLocal(bool bSet)
{
if(bSet)
pImp->nFlags |= HTMLCFG_LOCAL_GRF;
@@ -349,9 +349,9 @@ void SvxHtmlOptions::SetSaveGraphicsLocal(sal_Bool bSet)
SetModified();
}
-sal_Bool SvxHtmlOptions::IsPrintLayoutExtension() const
+bool SvxHtmlOptions::IsPrintLayoutExtension() const
{
- sal_Bool bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
+ bool bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
switch( pImp->nExportMode )
{
case HTML_CFG_MSIE:
@@ -359,12 +359,12 @@ sal_Bool SvxHtmlOptions::IsPrintLayoutExtension() const
case HTML_CFG_WRITER :
break;
default:
- bRet = sal_False;
+ bRet = false;
}
return bRet;
}
-void SvxHtmlOptions::SetPrintLayoutExtension(sal_Bool bSet)
+void SvxHtmlOptions::SetPrintLayoutExtension(bool bSet)
{
if(bSet)
pImp->nFlags |= HTMLCFG_PRINT_LAYOUT_EXTENSION;
@@ -373,12 +373,12 @@ void SvxHtmlOptions::SetPrintLayoutExtension(sal_Bool bSet)
SetModified();
}
-sal_Bool SvxHtmlOptions::IsIgnoreFontFamily() const
+bool SvxHtmlOptions::IsIgnoreFontFamily() const
{
return 0 != (pImp->nFlags & HTMLCFG_IGNORE_FONT_FAMILY) ;
}
-void SvxHtmlOptions::SetIgnoreFontFamily(sal_Bool bSet)
+void SvxHtmlOptions::SetIgnoreFontFamily(bool bSet)
{
if(bSet)
pImp->nFlags |= HTMLCFG_IGNORE_FONT_FAMILY;
@@ -387,12 +387,12 @@ void SvxHtmlOptions::SetIgnoreFontFamily(sal_Bool bSet)
SetModified();
}
-sal_Bool SvxHtmlOptions::IsStarBasicWarning() const
+bool SvxHtmlOptions::IsStarBasicWarning() const
{
return 0 != (pImp->nFlags & HTMLCFG_IS_BASIC_WARNING) ;
}
-void SvxHtmlOptions::SetStarBasicWarning(sal_Bool bSet)
+void SvxHtmlOptions::SetStarBasicWarning(bool bSet)
{
if(bSet)
pImp->nFlags |= HTMLCFG_IS_BASIC_WARNING;
@@ -414,11 +414,11 @@ rtl_TextEncoding SvxHtmlOptions::GetTextEncoding() const
void SvxHtmlOptions::SetTextEncoding( rtl_TextEncoding eEnc )
{
pImp->eEncoding = eEnc;
- pImp->bIsEncodingDefault = sal_False;
+ pImp->bIsEncodingDefault = false;
SetModified();
}
-sal_Bool SvxHtmlOptions::IsDefaultTextEncoding() const
+bool SvxHtmlOptions::IsDefaultTextEncoding() const
{
return pImp->bIsEncodingDefault;
}
@@ -433,12 +433,12 @@ SvxHtmlOptions& SvxHtmlOptions::Get()
return theSvxHtmlOptions::get();
}
-sal_Bool SvxHtmlOptions::IsNumbersEnglishUS() const
+bool SvxHtmlOptions::IsNumbersEnglishUS() const
{
return 0 != (pImp->nFlags & HTMLCFG_NUMBERS_ENGLISH_US) ;
}
-void SvxHtmlOptions::SetNumbersEnglishUS(sal_Bool bSet)
+void SvxHtmlOptions::SetNumbersEnglishUS(bool bSet)
{
if(bSet)
pImp->nFlags |= HTMLCFG_NUMBERS_ENGLISH_US;
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index b317ed496ed1..c569a16b8813 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.cxx
@@ -72,21 +72,21 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
mnMouseOff = 0;
mnCurItemId = 0;
mnItemDragPos = HEADERBAR_ITEM_NOTFOUND;
- mbDrag = sal_False;
- mbItemDrag = sal_False;
- mbOutDrag = sal_False;
- mbItemMode = sal_False;
+ mbDrag = false;
+ mbItemDrag = false;
+ mbOutDrag = false;
+ mbItemMode = false;
m_pVCLXHeaderBar = NULL;
// StyleBits auswerten
if ( nWinStyle & WB_DRAG )
- mbDragable = sal_True;
+ mbDragable = true;
else
- mbDragable = sal_False;
+ mbDragable = false;
if ( nWinStyle & WB_BUTTONSTYLE )
- mbButtonStyle = sal_True;
+ mbButtonStyle = true;
else
- mbButtonStyle = sal_False;
+ mbButtonStyle = false;
if ( nWinStyle & WB_BORDER )
{
mnBorderOff1 = 1;
@@ -98,7 +98,7 @@ void HeaderBar::ImplInit( WinBits nWinStyle )
mnBorderOff2 = 1;
}
- ImplInitSettings( sal_True, sal_True, sal_True );
+ ImplInitSettings( true, true, true );
}
@@ -124,8 +124,8 @@ HeaderBar::~HeaderBar()
-void HeaderBar::ImplInitSettings( sal_Bool bFont,
- sal_Bool bForeground, sal_Bool bBackground )
+void HeaderBar::ImplInitSettings( bool bFont,
+ bool bForeground, bool bBackground )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
@@ -189,7 +189,7 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos,
{
ImplHeadItem* pItem;
size_t nCount = (sal_uInt16)mpItemList->size();
- sal_Bool bLastFixed = sal_True;
+ bool bLastFixed = true;
long nX = -mnOffset;
for ( size_t i = 0; i < nCount; i++ )
@@ -226,9 +226,9 @@ sal_uInt16 HeaderBar::ImplHitTest( const Point& rPos,
}
if ( pItem->mnBits & HIB_FIXED )
- bLastFixed = sal_True;
+ bLastFixed = true;
else
- bLastFixed = sal_False;
+ bLastFixed = false;
nX += pItem->mnSize;
}
@@ -298,7 +298,7 @@ void HeaderBar::ImplInvertDrag( sal_uInt16 nStartPos, sal_uInt16 nEndPos )
void HeaderBar::ImplDrawItem( OutputDevice* pDev,
- sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
+ sal_uInt16 nPos, bool bHigh, bool bDrag,
const Rectangle& rItemRect,
const Rectangle* pRect,
sal_uLong )
@@ -415,14 +415,14 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
}
// cut text to correct length
- sal_Bool bLeftText = sal_False;
+ bool bLeftText = false;
long nMaxTxtWidth = aRect.GetWidth()-(HEADERBAR_TEXTOFF*2)-nArrowWidth;
if ( nBits & (HIB_LEFTIMAGE | HIB_RIGHTIMAGE) )
nMaxTxtWidth -= aImageSize.Width();
long nTxtWidth = aTxtSize.Width();
if ( nTxtWidth > nMaxTxtWidth )
{
- bLeftText = sal_True;
+ bLeftText = true;
OUStringBuffer aBuf(pItem->maOutText);
aBuf.append("...");
do
@@ -580,11 +580,11 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
}
// is there enough space to draw the item?
- sal_Bool bDraw = sal_True;
+ bool bDraw = true;
if ( nArrowX < aRect.Left()+HEADERBAR_TEXTOFF )
- bDraw = sal_False;
+ bDraw = false;
else if ( nArrowX+HEAD_ARROWSIZE2 > aRect.Right() )
- bDraw = sal_False;
+ bDraw = false;
if ( bDraw )
{
@@ -658,7 +658,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev,
-void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
+void HeaderBar::ImplDrawItem( sal_uInt16 nPos, bool bHigh, bool bDrag,
const Rectangle* pRect )
{
Rectangle aRect = ImplGetItemRect( nPos );
@@ -667,7 +667,7 @@ void HeaderBar::ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag,
-void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect )
+void HeaderBar::ImplUpdate( sal_uInt16 nPos, bool bEnd, bool bDirect )
{
if ( IsVisible() && IsUpdateMode() )
{
@@ -711,31 +711,31 @@ void HeaderBar::ImplUpdate( sal_uInt16 nPos, sal_Bool bEnd, sal_Bool bDirect )
-void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
+void HeaderBar::ImplStartDrag( const Point& rMousePos, bool bCommand )
{
sal_uInt16 nPos;
sal_uInt16 nHitTest = ImplHitTest( rMousePos, mnMouseOff, nPos );
if ( nHitTest )
{
- mbDrag = sal_False;
+ mbDrag = false;
ImplHeadItem* pItem = (*mpItemList)[ nPos ];
if ( nHitTest & HEAD_HITTEST_DIVIDER )
- mbDrag = sal_True;
+ mbDrag = true;
else
{
if ( ((pItem->mnBits & HIB_CLICKABLE) && !(pItem->mnBits & HIB_FLAT)) ||
(mbDragable && !(pItem->mnBits & HIB_FIXEDPOS)) )
{
- mbItemMode = sal_True;
- mbDrag = sal_True;
+ mbItemMode = true;
+ mbDrag = true;
if ( bCommand )
{
if ( mbDragable )
- mbItemDrag = sal_True;
+ mbItemDrag = true;
else
{
- mbItemMode = sal_False;
- mbDrag = sal_False;
+ mbItemMode = false;
+ mbDrag = false;
}
}
}
@@ -752,7 +752,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
if ( mbDrag )
{
- mbOutDrag = sal_False;
+ mbOutDrag = false;
mnCurItemId = pItem->mnId;
mnItemDragPos = nPos;
StartTracking();
@@ -760,7 +760,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
mnDragPos = mnStartPos;
StartDrag();
if ( mbItemMode )
- ImplDrawItem( nPos, sal_True, mbItemDrag );
+ ImplDrawItem( nPos, true, mbItemDrag );
else
{
Rectangle aSizeRect( mnDragPos, 0, mnDragPos, mnDragSize+mnDY );
@@ -776,7 +776,7 @@ void HeaderBar::ImplStartDrag( const Point& rMousePos, sal_Bool bCommand )
void HeaderBar::ImplDrag( const Point& rMousePos )
{
- sal_Bool bNewOutDrag;
+ bool bNewOutDrag;
sal_uInt16 nPos = GetItemPos( mnCurItemId );
mnDragPos = rMousePos.X()-mnMouseOff;
@@ -784,9 +784,9 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
{
Rectangle aItemRect = ImplGetItemRect( nPos );
if ( aItemRect.IsInside( rMousePos ) )
- bNewOutDrag = sal_False;
+ bNewOutDrag = false;
else
- bNewOutDrag = sal_True;
+ bNewOutDrag = true;
// if needed switch on ItemDrag
if ( bNewOutDrag && mbDragable && !mbItemDrag &&
@@ -794,8 +794,8 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
{
if ( (rMousePos.Y() >= aItemRect.Top()) && (rMousePos.Y() <= aItemRect.Bottom()) )
{
- mbItemDrag = sal_True;
- ImplDrawItem( nPos, sal_True, mbItemDrag );
+ mbItemDrag = true;
+ ImplDrawItem( nPos, true, mbItemDrag );
}
}
@@ -803,9 +803,9 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
if ( mbItemDrag )
{
if ( (rMousePos.Y() < -HEADERBAR_DRAGOUTOFF) || (rMousePos.Y() > mnDY+HEADERBAR_DRAGOUTOFF) )
- bNewOutDrag = sal_True;
+ bNewOutDrag = true;
else
- bNewOutDrag = sal_False;
+ bNewOutDrag = false;
if ( bNewOutDrag )
mnItemDragPos = HEADERBAR_ITEM_NOTFOUND;
@@ -855,7 +855,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
(mnItemDragPos != nPos) &&
(mnItemDragPos != HEADERBAR_ITEM_NOTFOUND) )
{
- ImplDrawItem( mnItemDragPos, sal_False, sal_True );
+ ImplDrawItem( mnItemDragPos, false, true );
ImplInvertDrag( nPos, mnItemDragPos );
}
}
@@ -881,7 +881,7 @@ void HeaderBar::ImplDrag( const Point& rMousePos )
-void HeaderBar::ImplEndDrag( sal_Bool bCancel )
+void HeaderBar::ImplEndDrag( bool bCancel )
{
HideTracking();
@@ -926,18 +926,18 @@ void HeaderBar::ImplEndDrag( sal_Bool bCancel )
{
ImplHeadItem* pItem = (*mpItemList)[ nPos ];
pItem->mnSize += nDelta;
- ImplUpdate( nPos, sal_True );
+ ImplUpdate( nPos, true );
}
}
}
- mbDrag = sal_False;
+ mbDrag = false;
EndDrag();
mnCurItemId = 0;
mnItemDragPos = HEADERBAR_ITEM_NOTFOUND;
- mbOutDrag = sal_False;
- mbItemMode = sal_False;
- mbItemDrag = sal_False;
+ mbOutDrag = false;
+ mbItemMode = false;
+ mbItemDrag = false;
}
@@ -955,17 +955,17 @@ void HeaderBar::MouseButtonDown( const MouseEvent& rMEvt )
{
ImplHeadItem* pItem = (*mpItemList)[ nPos ];
if ( nHitTest & HEAD_HITTEST_DIVIDER )
- mbItemMode = sal_False;
+ mbItemMode = false;
else
- mbItemMode = sal_True;
+ mbItemMode = true;
mnCurItemId = pItem->mnId;
DoubleClick();
- mbItemMode = sal_False;
+ mbItemMode = false;
mnCurItemId = 0;
}
}
else
- ImplStartDrag( rMEvt.GetPosPixel(), sal_False );
+ ImplStartDrag( rMEvt.GetPosPixel(), false );
}
}
@@ -1022,7 +1022,7 @@ void HeaderBar::Paint( const Rectangle& rRect )
nCurItemPos = HEADERBAR_ITEM_NOTFOUND;
sal_uInt16 nItemCount = (sal_uInt16)mpItemList->size();
for ( sal_uInt16 i = 0; i < nItemCount; i++ )
- ImplDrawItem( i, (i == nCurItemPos) ? sal_True : sal_False, sal_False, &rRect );
+ ImplDrawItem( i, (i == nCurItemPos), false, &rRect );
}
@@ -1074,7 +1074,7 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
aItemRect.Right() = 16000;
Region aRegion( aRect );
pDev->SetClipRegion( aRegion );
- ImplDrawItem( pDev, i, sal_False, sal_False, aItemRect, &aRect, nFlags );
+ ImplDrawItem( pDev, i, false, false, aItemRect, &aRect, nFlags );
pDev->SetClipRegion();
}
@@ -1098,7 +1098,7 @@ void HeaderBar::Command( const CommandEvent& rCEvt )
{
if ( rCEvt.IsMouseEvent() && (rCEvt.GetCommand() == COMMAND_STARTDRAG) && !mbDrag )
{
- ImplStartDrag( rCEvt.GetMousePosPixel(), sal_True );
+ ImplStartDrag( rCEvt.GetMousePosPixel(), true );
return;
}
@@ -1171,17 +1171,17 @@ void HeaderBar::StateChanged( StateChangedType nType )
else if ( (nType == STATE_CHANGE_ZOOM) ||
(nType == STATE_CHANGE_CONTROLFONT) )
{
- ImplInitSettings( sal_True, sal_False, sal_False );
+ ImplInitSettings( true, false, false );
Invalidate();
}
else if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
{
- ImplInitSettings( sal_False, sal_True, sal_False );
+ ImplInitSettings( false, true, false );
Invalidate();
}
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
{
- ImplInitSettings( sal_False, sal_False, sal_True );
+ ImplInitSettings( false, false, true );
Invalidate();
}
}
@@ -1197,7 +1197,7 @@ void HeaderBar::DataChanged( const DataChangedEvent& rDCEvt )
((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
(rDCEvt.GetFlags() & SETTINGS_STYLE)) )
{
- ImplInitSettings( sal_True, sal_True, sal_True );
+ ImplInitSettings( true, true, true );
Invalidate();
}
}
@@ -1267,7 +1267,7 @@ void HeaderBar::InsertItem( sal_uInt16 nItemId, const OUString& rText,
}
// update display
- ImplUpdate( nPos, sal_True );
+ ImplUpdate( nPos, true );
}
@@ -1318,7 +1318,7 @@ void HeaderBar::Clear()
}
mpItemList->clear();
- ImplUpdate( 0, sal_True );
+ ImplUpdate( 0, true );
}
@@ -1396,7 +1396,7 @@ void HeaderBar::SetItemSize( sal_uInt16 nItemId, long nNewSize )
if ( pItem->mnSize != nNewSize )
{
pItem->mnSize = nNewSize;
- ImplUpdate( nPos, sal_True );
+ ImplUpdate( nPos, true );
}
}
}
diff --git a/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 8230c53e4ae1..6a8abff90512 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.cxx
@@ -56,9 +56,9 @@ namespace svt
public:
sal_Int16 ID;
sal_Int32 Index;
- sal_Bool bInteractive;
+ bool bInteractive;
Size m_aMinSize;
- sal_Bool m_bHyperMode;
+ bool m_bHyperMode;
HyperLabelImpl();
};
@@ -138,7 +138,7 @@ namespace svt
void HyperLabel::ActivateHyperMode(Font aFont, const Color aColor)
{
aFont.SetUnderline(UNDERLINE_SINGLE);
- m_pImpl->m_bHyperMode = sal_True;
+ m_pImpl->m_bHyperMode = true;
SetPointer( POINTER_REFHAND );
SetControlFont( aFont);
SetTextColor( aColor);
@@ -147,7 +147,7 @@ namespace svt
void HyperLabel::DeactivateHyperMode(Font aFont, const Color aColor)
{
- m_pImpl->m_bHyperMode = sal_False;
+ m_pImpl->m_bHyperMode = false;
aFont.SetUnderline(UNDERLINE_NONE);
SetPointer( POINTER_ARROW );
SetControlFont( aFont);
@@ -182,7 +182,7 @@ namespace svt
delete m_pImpl;
}
- void HyperLabel::SetInteractive( sal_Bool _bInteractive )
+ void HyperLabel::SetInteractive( bool _bInteractive )
{
m_pImpl->bInteractive = ( _bInteractive && IsEnabled() );
}
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 4abe983ec3cc..c5e2a508b4e1 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -510,7 +510,7 @@ OString HTMLOutFuncs::ConvertStringToHTML( const OUString& rSrc,
}
SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr,
- sal_Bool bOn, rtl_TextEncoding )
+ bool bOn, rtl_TextEncoding )
{
sal_Char sStt[3] = "</";
if( bOn )
@@ -597,7 +597,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
const ImageMap& rIMap,
const OUString& rName,
const HTMLOutEvent *pEventTable,
- sal_Bool bOutStarBasic,
+ bool bOutStarBasic,
const sal_Char *pDelim,
const sal_Char *pIndentArea,
const sal_Char *pIndentMap,
@@ -770,7 +770,7 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
rStream.WriteCharPtr( pDelim );
if( pIndentMap )
rStream.WriteCharPtr( pIndentMap );
- Out_AsciiTag( rStream, OOO_STRING_SVTOOLS_HTML_map, sal_False );
+ Out_AsciiTag( rStream, OOO_STRING_SVTOOLS_HTML_map, false );
return rStream;
}
@@ -883,7 +883,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
}
}
- HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_script, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_script, false );
return rStrm;
}
@@ -892,7 +892,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
const SvxMacroTableDtor& rMacroTable,
const HTMLOutEvent *pEventTable,
- sal_Bool bOutStarBasic,
+ bool bOutStarBasic,
rtl_TextEncoding eDestEnc,
OUString *pNonConvertableChars )
{
@@ -925,7 +925,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
}
OString HTMLOutFuncs::CreateTableDataOptionsValNum(
- sal_Bool bValue,
+ bool bValue,
double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter,
rtl_TextEncoding eDestEnc, OUString* pNonConvertableChars)
{
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index f5f2f89e3ba4..2596a4422804 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -231,7 +231,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
}
else
{
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
return;
}
break;
@@ -620,7 +620,7 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
DecIndentLevel();
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_style, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_style, false );
}
else
{
@@ -2890,7 +2890,7 @@ static Writer& OutCSS1_SwFmtDrop( Writer& rWrt, const SfxPoolItem& rHt )
}
else
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
}
return rWrt;
@@ -3421,7 +3421,7 @@ Writer& OutCSS1_SvxBox( Writer& rWrt, const SfxPoolItem& rHt )
}
else
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
return rWrt;
}
}
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 65bb022a1dbd..5522b81a2b57 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -129,7 +129,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
{
if( bLFPossible )
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, sal_True );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, true );
IncIndentLevel();
bLFPossible = sal_True;
}
@@ -141,7 +141,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
DecIndentLevel();
if( bLFPossible )
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_deflist, false );
bLFPossible = sal_True;
}
}
@@ -153,7 +153,7 @@ void SwHTMLWriter::ChangeParaToken( sal_uInt16 nNew )
{
if( nNew != nLastParaToken && HTML_PREFORMTXT_ON == nLastParaToken )
{
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_preformtxt, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_preformtxt, false );
bLFPossible = sal_True;
}
nLastParaToken = nNew;
@@ -1010,10 +1010,9 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
// - keine Styles geschrieben werden, und
// - ein untere Abstand existiert
if( rInfo.bParaPossible && rInfo.bOutPara )
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_parabreak, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_parabreak, false );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(),
- sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(), false );
rHWrt.bLFPossible =
rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dt &&
rInfo.aToken != OOO_STRING_SVTOOLS_HTML_dd &&
@@ -1024,7 +1023,7 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
rHWrt.DecIndentLevel();
if( rHWrt.bLFPossible )
rHWrt.OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
rHWrt.bLFPossible = sal_True;
}
@@ -2684,7 +2683,7 @@ static Writer& OutHTML_SvxColor( Writer& rWrt, const SfxPoolItem& rHt )
HTMLOutFuncs::Out_Color( rWrt.Strm(), aColor, rHTMLWrt.eDestEnc ).WriteChar( '>' );
}
else
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, false );
return rWrt;
}
@@ -2728,7 +2727,7 @@ static Writer& OutHTML_SvxFont( Writer& rWrt, const SfxPoolItem& rHt )
.WriteCharPtr( "\">" );
}
else
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font , sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, false );
return rWrt;
}
@@ -2759,7 +2758,7 @@ static Writer& OutHTML_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt )
}
else
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_font, false );
}
return rWrt;
@@ -2785,7 +2784,7 @@ static Writer& OutHTML_SvxLanguage( Writer& rWrt, const SfxPoolItem& rHt )
}
else
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
}
return rWrt;
@@ -2932,7 +2931,7 @@ Writer& OutHTML_INetFmt( Writer& rWrt, const SwFmtINetFmt& rINetFmt, sal_Bool bO
// Tag aus? Dann nur ein </A> ausgeben.
if( !bOn )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
return rWrt;
}
@@ -3152,7 +3151,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
!pFmtInfo->aToken.isEmpty() ? pFmtInfo->aToken.getStr()
: OOO_STRING_SVTOOLS_HTML_span,
- sal_False );
+ false );
}
return rWrt;
diff --git a/sw/source/filter/html/htmldraw.cxx b/sw/source/filter/html/htmldraw.cxx
index 382c6624505e..265acba399d6 100644
--- a/sw/source/filter/html/htmldraw.cxx
+++ b/sw/source/filter/html/htmldraw.cxx
@@ -833,7 +833,7 @@ Writer& OutHTML_DrawFrmFmtAsMarquee( Writer& rWrt,
HTMLOutFuncs::Out_String( rWrt.Strm(), aText,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_marquee, false );
if( !aEndTags.isEmpty() )
rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx
index 19a3314a78ac..4ecffadfdac8 100644
--- a/sw/source/filter/html/htmlfldw.cxx
+++ b/sw/source/filter/html/htmlfldw.cxx
@@ -426,7 +426,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pFld,
// Off-Tag ausgeben
if( pTypeStr )
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_sdfield, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_sdfield, false );
return rWrt;
}
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index d2b7fd6e1d3e..8c7bfb978293 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -510,11 +510,11 @@ void SwHTMLWriter::OutFrmFmt( sal_uInt8 nMode, const SwFrmFmt& rFrmFmt,
DecIndentLevel();
if( bLFPossible )
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
bLFPossible = sal_True;
}
else if( HTML_CNTNR_SPAN == nCntnrMode )
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_span, false );
}
OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt,
@@ -1337,7 +1337,7 @@ static Writer & OutHTML_FrmFmtAsMulticol( Writer& rWrt,
rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_multicol, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_multicol, false );
rHTMLWrt.bLFPossible = sal_True;
return rWrt;
@@ -1424,7 +1424,7 @@ static Writer& OutHTML_FrmFmtAsDivOrSpan( Writer& rWrt,
rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, false );
if( !aEndTags.isEmpty() )
rWrt.Strm().WriteCharPtr( aEndTags.getStr() );
@@ -1570,7 +1570,7 @@ Writer& OutHTML_HeaderFooter( Writer& rWrt, const SwFrmFmt& rFrmFmt,
rHTMLWrt.DecIndentLevel(); // den Inhalt von Multicol einruecken;
rHTMLWrt.OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
rHTMLWrt.nHeaderFooterSpace = 0;
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 1c7da56b52f1..b9bf2abff56b 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -458,7 +458,7 @@ void SwHTMLWriter::OutForm( sal_Bool bOn,
DecIndentLevel(); // Inhalt der Form einruecken
if( bLFPossible )
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_form, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_form, false );
bLFPossible = sal_True;
return;
@@ -1274,12 +1274,12 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
HTMLOutFuncs::Out_String( rWrt.Strm(), pStrings[i],
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
}
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_option, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_option, false );
rHTMLWrt.DecIndentLevel();
rHTMLWrt.OutNewLine();// das </SELECT> bekommt eine eigene Zeile
}
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_select, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_select, false );
}
else if( TAG_TEXTAREA == eTag )
{
@@ -1306,7 +1306,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt,
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
}
}
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_textarea, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_textarea, false );
}
else if( TYPE_CHECKBOX == eType || TYPE_RADIO == eType )
{
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 28994f72af9d..2ba0cef9e00c 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -308,12 +308,12 @@ Writer& OutHTML_SwFmtFtn( Writer& rWrt, const SfxPoolItem& rHt )
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_sdfixed);
sOut.append('>');
rWrt.Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, sal_True );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, true );
HTMLOutFuncs::Out_String( rWrt.Strm(), rFmtFtn.GetViewNumStr(*rWrt.pDoc),
rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, sal_False );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_superscript, false );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
return rWrt;
}
@@ -375,7 +375,7 @@ void SwHTMLWriter::OutFootEndNotes()
DecIndentLevel(); // Inhalt von <DIV> einruecken
if( bLFPossible )
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
bLFPossible = sal_True;
OSL_ENSURE( !pFmtFtn,
@@ -475,7 +475,7 @@ void SwHTMLWriter::OutFootEndNoteSym( const SwFmtFtn& rFmtFtn,
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), rNum, eDestEnc, &aNonConvertableCharacters );
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
}
static sal_uInt16 lcl_html_fillEndNoteInfo( const SwEndNoteInfo& rInfo,
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index cc83d3d5dcf1..2864d740b0c1 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -907,7 +907,7 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
pStr = OOO_STRING_SVTOOLS_HTML_unorderlist;
else
pStr = OOO_STRING_SVTOOLS_HTML_orderlist;
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), pStr, false );
rWrt.bLFPossible = sal_True;
}
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index 0b06d56ceac2..421239b285c1 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -1201,7 +1201,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
rHTMLWrt.DecIndentLevel(); // Inhalt von Applet einruecken
if( aCommands.size() )
rHTMLWrt.OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_applet, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_applet, false );
}
else if( aGlobName == SvGlobalName( SO3_PLUGIN_CLASSID ) )
{
@@ -1235,7 +1235,7 @@ Writer& OutHTML_FrmFmtOLENode( Writer& rWrt, const SwFrmFmt& rFrmFmt,
// ausgeben
rHTMLWrt.Strm().WriteChar( '>' );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_iframe, false );
}
if( !aEndTags.isEmpty() )
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 021a431126db..84833c9e71f0 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -497,7 +497,7 @@ void SwHTMLWrtTable::OutTableCell( SwHTMLWriter& rWrt,
rWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), bHead ? OOO_STRING_SVTOOLS_HTML_tableheader
: OOO_STRING_SVTOOLS_HTML_tabledata,
- sal_False );
+ false );
rWrt.bLFPossible = sal_True;
}
@@ -558,7 +558,7 @@ void SwHTMLWrtTable::OutTableCells( SwHTMLWriter& rWrt,
rWrt.DecIndentLevel(); // Inhalt von <TR>...</TR> einruecken
rWrt.OutNewLine(); // </TR> in neuer Zeile
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow, false );
}
void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
@@ -731,9 +731,9 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom)
.append("\"");
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr(), sal_True );
- HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOutStr.getStr(), true );
+ HTMLOutFuncs::Out_String( rWrt.Strm(), *pCaption, rWrt.eDestEnc, &rWrt.aNonConvertableCharacters );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_caption, false );
}
sal_uInt16 nCols = aCols.size();
@@ -746,7 +746,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
if( bColGroups )
{
rWrt.OutNewLine(); // <COLGRP> in neue Zeile
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, sal_True );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup, true );
rWrt.IncIndentLevel(); // Inhalt von <COLGRP> einruecken
}
@@ -787,10 +787,10 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.DecIndentLevel(); // Inhalt von <COLGRP> einruecken
rWrt.OutNewLine(); // </COLGRP> in neue Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup,
- sal_False );
+ false );
rWrt.OutNewLine(); // <COLGRP> in neue Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup,
- sal_True );
+ true );
rWrt.IncIndentLevel(); // Inhalt von <COLGRP> einruecken
}
}
@@ -800,7 +800,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.OutNewLine(); // </COLGRP> in neue Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_colgroup,
- sal_False );
+ false );
}
}
@@ -824,7 +824,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
{
rWrt.OutNewLine(); // <THEAD>/<TDATA> in neue Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
- bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_True );
+ bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, true );
rWrt.IncIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr.
}
@@ -842,9 +842,9 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
{
rWrt.OutNewLine();
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow,
- sal_True );
+ true );
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_tablerow,
- sal_False );
+ false );
}
}
if( ( (bTHead && nRow==nHeadEndRow) ||
@@ -854,14 +854,14 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.DecIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr.
rWrt.OutNewLine(); // </THEAD>/</TDATA> in neue Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
- bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_False );
+ bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, false );
rWrt.OutNewLine(); // <THEAD>/<TDATA> in neue Zeile
if( bTHead && nRow==nHeadEndRow )
bTHead = sal_False;
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
- bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_True );
+ bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, true );
rWrt.IncIndentLevel(); // Inhalt von <THEAD>/<TDATA> einr.
}
}
@@ -872,13 +872,13 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
rWrt.OutNewLine(); // </THEAD>/</TDATA> in neue Zeile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
- bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, sal_False );
+ bTHead ? OOO_STRING_SVTOOLS_HTML_thead : OOO_STRING_SVTOOLS_HTML_tbody, false );
}
rWrt.DecIndentLevel(); // Inhalt von <TABLE> einr.
rWrt.OutNewLine(); // </TABLE> in neue Zeile
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_table, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_table, false );
rWrt.nDirection = nOldDirection;
}
@@ -1091,14 +1091,13 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine(); // <CENTER> in neuer Zeile
if( text::HoriOrientation::CENTER==eDivHoriOri )
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, true );
else
{
OStringBuffer sOut(OOO_STRING_SVTOOLS_HTML_division);
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(OOO_STRING_SVTOOLS_HTML_AL_right).append("\"");
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(),
- sal_True );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(), true );
}
rHTMLWrt.IncIndentLevel(); // Inhalt von <CENTER> einruecken
rHTMLWrt.bLFPossible = sal_True;
@@ -1145,7 +1144,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
rHTMLWrt.OutNewLine(); // </CENTER> in neue Teile
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
text::HoriOrientation::CENTER==eDivHoriOri ? OOO_STRING_SVTOOLS_HTML_center
- : OOO_STRING_SVTOOLS_HTML_division, sal_False );
+ : OOO_STRING_SVTOOLS_HTML_division, false );
rHTMLWrt.bLFPossible = sal_True;
}
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index cee87489050c..e231243e79fd 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -373,9 +373,9 @@ sal_uLong SwHTMLWriter::WriteStream()
if( bLFPossible )
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_body, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_body, false );
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_html, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_html, false );
// loesche die Tabelle mit den freifliegenden Rahmen
sal_uInt16 i;
@@ -612,7 +612,7 @@ static void lcl_html_OutSectionEndTag( SwHTMLWriter& rHTMLWrt )
rHTMLWrt.DecIndentLevel();
if( rHTMLWrt.bLFPossible )
rHTMLWrt.OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( rHTMLWrt.Strm(), OOO_STRING_SVTOOLS_HTML_division, false );
rHTMLWrt.bLFPossible = sal_True;
}
@@ -964,7 +964,7 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs )
DecIndentLevel(); // Inhalt von <HEAD> einruecken
OutNewLine();
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_head, false );
// der Body wird nicht eingerueckt, weil sonst alles eingerueckt waere!
OutNewLine();
@@ -1014,7 +1014,7 @@ void SwHTMLWriter::OutAnchor( const OUString& rName )
.append(OOO_STRING_SVTOOLS_HTML_O_name).append("=\"");
Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
HTMLOutFuncs::Out_String( Strm(), rName, eDestEnc, &aNonConvertableCharacters ).WriteCharPtr( "\">" );
- HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, sal_False );
+ HTMLOutFuncs::Out_AsciiTag( Strm(), OOO_STRING_SVTOOLS_HTML_anchor, false );
}
void SwHTMLWriter::OutBookmarks()