[Libreoffice-commits] .: sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 9 15:38:04 PDT 2012
sw/inc/SwStyleNameMapper.hxx | 10 +++---
sw/source/core/doc/SwStyleNameMapper.cxx | 26 ++++++++---------
sw/source/core/docnode/ndnotxt.cxx | 2 -
sw/source/core/docnode/node.cxx | 4 +-
sw/source/core/layout/atrfrm.cxx | 2 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 8 ++---
sw/source/core/txtnode/fmtatr2.cxx | 12 ++++----
sw/source/core/txtnode/ndtxt.cxx | 4 +-
sw/source/core/unocore/SwXTextDefaults.cxx | 2 -
sw/source/core/unocore/unocrsrhelper.cxx | 4 +-
sw/source/core/unocore/unoidx.cxx | 24 ++++++++--------
sw/source/core/unocore/unoobj.cxx | 10 +++---
sw/source/core/unocore/unosett.cxx | 34 +++++++++++-----------
sw/source/core/unocore/unostyle.cxx | 36 ++++++++++++------------
sw/source/core/unocore/unotbl.cxx | 4 +-
sw/source/filter/xml/xmlfmt.cxx | 4 +-
sw/source/filter/xml/xmlfmte.cxx | 2 -
sw/source/filter/xml/xmltexte.cxx | 2 -
sw/source/ui/uno/unotxvw.cxx | 4 +-
19 files changed, 97 insertions(+), 97 deletions(-)
New commits:
commit 7e1d03f0f6b68d4a955a6b5df94be77307e58476
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Oct 10 07:34:19 2012 +0900
sal_Bool to bool
Change-Id: I2549e597bc11d0a4b4bcdc42c77914dda01a1c5f
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 4142ff9..34797ca 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -138,20 +138,20 @@ protected:
const SwTableEntry *pTable,
sal_uInt8 nCount);
- static void fillNameFromId ( sal_uInt16 nId, String &rName, sal_Bool bProgName );
- static const String& getNameFromId ( sal_uInt16 nId, const String &rName, sal_Bool bProgName );
- static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, sal_Bool bProgName );
+ static void fillNameFromId ( sal_uInt16 nId, String &rName, bool bProgName );
+ static const String& getNameFromId ( sal_uInt16 nId, const String &rName, bool bProgName );
+ static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, bool bProgName );
static bool SuffixIsUser ( const String & rString );
static void CheckSuffixAndDelete ( String & rString );
public:
// This gets the UI Name from the programmatic name
static const String& GetUIName ( const String& rName, SwGetPoolIdFromName );
- static void FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
+ static void FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName, bool bDisambiguate = false );
// Get the programmatic Name from the UI name
static const String& GetProgName ( const String& rName, SwGetPoolIdFromName );
- static void FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
+ static void FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName, bool bDisambiguate = false );
// This gets the UI Name from the Pool ID
SW_DLLPUBLIC static void FillUIName ( sal_uInt16 nId, String& rFillName );
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index a565336..c4b4234 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -346,7 +346,7 @@ void SwStyleNameMapper::CheckSuffixAndDelete ( String & rString )
rString.Erase ( nLen - 7, 7 );
}
}
-const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, sal_Bool bProgName )
+const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlags, bool bProgName )
{
NameToIdHash *pHash = 0;
const boost::ptr_vector<String> *pStrings;
@@ -634,7 +634,7 @@ const String& SwStyleNameMapper::GetProgName( const String& rName, SwGetPoolIdFr
}
// Get the programmatic name from the UI name in rName and put it into rFillName
-void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, sal_Bool bDisambiguate )
+void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, bool bDisambiguate )
{
sal_uInt16 nId = GetPoolIdFromUIName ( rName, eFlags );
if ( bDisambiguate && nId == USHRT_MAX )
@@ -659,11 +659,11 @@ void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName, S
else
{
// If we aren't trying to disambiguate, then just do a normal fill
- fillNameFromId ( nId, rFillName, sal_True);
+ fillNameFromId ( nId, rFillName, true);
}
}
// Get the UI name from the programmatic name in rName and put it into rFillName
-void SwStyleNameMapper::FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, sal_Bool bDisambiguate )
+void SwStyleNameMapper::FillUIName ( const String& rName, String& rFillName, SwGetPoolIdFromName eFlags, bool bDisambiguate )
{
sal_uInt16 nId = GetPoolIdFromProgName ( rName, eFlags );
if ( bDisambiguate && nId == USHRT_MAX )
@@ -675,11 +675,11 @@ void SwStyleNameMapper::FillUIName ( const String& rName, String& rFillName, SwG
else
{
// If we aren't trying to disambiguate, then just do a normal fill
- fillNameFromId ( nId, rFillName, sal_False);
+ fillNameFromId ( nId, rFillName, false);
}
}
-const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rFillName, sal_Bool bProgName )
+const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rFillName, bool bProgName )
{
sal_uInt16 nStt = 0;
const boost::ptr_vector<String>* pStrArr = 0;
@@ -764,7 +764,7 @@ const String& SwStyleNameMapper::getNameFromId( sal_uInt16 nId, const String& rF
}
return pStrArr ? (pStrArr->operator[] ( nId - nStt ) ) : rFillName;
}
-void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, sal_Bool bProgName )
+void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, bool bProgName )
{
sal_uInt16 nStt = 0;
const boost::ptr_vector<String>* pStrArr = 0;
@@ -853,35 +853,35 @@ void SwStyleNameMapper::fillNameFromId( sal_uInt16 nId, String& rFillName, sal_B
// Get the UI Name from the pool ID
void SwStyleNameMapper::FillUIName ( sal_uInt16 nId, String& rFillName )
{
- fillNameFromId ( nId, rFillName, sal_False );
+ fillNameFromId ( nId, rFillName, false );
}
// Get the UI Name from the pool ID
const String& SwStyleNameMapper::GetUIName ( sal_uInt16 nId, const String& rName )
{
- return getNameFromId ( nId, rName, sal_False );
+ return getNameFromId ( nId, rName, false );
}
// Get the programmatic Name from the pool ID
void SwStyleNameMapper::FillProgName ( sal_uInt16 nId, String& rFillName )
{
- fillNameFromId ( nId, rFillName, sal_True );
+ fillNameFromId ( nId, rFillName, true );
}
// Get the programmatic Name from the pool ID
const String& SwStyleNameMapper::GetProgName ( sal_uInt16 nId, const String& rName )
{
- return getNameFromId ( nId, rName, sal_True );
+ return getNameFromId ( nId, rName, true );
}
// This gets the PoolId from the UI Name
sal_uInt16 SwStyleNameMapper::GetPoolIdFromUIName( const String& rName, SwGetPoolIdFromName eFlags )
{
- const NameToIdHash & rHashMap = getHashTable ( eFlags, sal_False );
+ const NameToIdHash & rHashMap = getHashTable ( eFlags, false );
NameToIdHash::const_iterator aIter = rHashMap.find ( &rName );
return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX;
}
// Get the Pool ID from the programmatic name
sal_uInt16 SwStyleNameMapper::GetPoolIdFromProgName( const String& rName, SwGetPoolIdFromName eFlags )
{
- const NameToIdHash & rHashMap = getHashTable ( eFlags, sal_True );
+ const NameToIdHash & rHashMap = getHashTable ( eFlags, true );
NameToIdHash::const_iterator aIter = rHashMap.find ( &rName );
return aIter != rHashMap.end() ? (*aIter).second : USHRT_MAX;
}
diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx
index fd3a069..805fcf1 100644
--- a/sw/source/core/docnode/ndnotxt.cxx
+++ b/sw/source/core/docnode/ndnotxt.cxx
@@ -74,7 +74,7 @@ void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool )
// put names of parent style and conditional style:
const SwFmtColl* pFmtColl = GetFmtColl();
String sVal;
- SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
SfxStringItem aFmtColl( RES_FRMATR_STYLE_NAME, sVal );
aNewAttrSet.Put( aFmtColl );
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index cc45828..7c80a5f 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -123,12 +123,12 @@ void SetParent( boost::shared_ptr<const SfxItemSet>& mrpAttrSet,
if ( pParentFmt )
{
- SwStyleNameMapper::FillProgName( pParentFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pParentFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
const SfxStringItem aAnyFmtColl( RES_FRMATR_STYLE_NAME, sVal );
aNewSet.Put( aAnyFmtColl );
if ( pConditionalFmt != pParentFmt )
- SwStyleNameMapper::FillProgName( pConditionalFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pConditionalFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
const SfxStringItem aFmtColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
aNewSet.Put( aFmtColl );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 416ccf2..6915866 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -747,7 +747,7 @@ bool SwFmtPageDesc::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
if( pDesc )
{
String aString;
- SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
+ SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
rVal <<= OUString( aString );
}
else
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 3d1e6d9..5133878 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -182,7 +182,7 @@ bool lcl_IsHeadlineCell( const SwCellFrm& rCellFrm )
const SwFmt* pTxtFmt = pTxtNode->GetFmtColl();
String sStyleName;
- SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
bRet = sStyleName.EqualsAscii(aTableHeadingName);
}
@@ -1109,9 +1109,9 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
String sParentStyleName;
if ( pTxtFmt)
- SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pTxtFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
if ( pParentTxtFmt)
- SwStyleNameMapper::FillProgName( pParentTxtFmt->GetName(), sParentStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pParentTxtFmt->GetName(), sParentStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
// This is the default. If the paragraph could not be mapped to
// any of the standard pdf tags, we write a user defined tag
@@ -1406,7 +1406,7 @@ void SwTaggedPDFHelper::BeginInlineStructureElements()
const SwCharFmt* pCharFmt = (charAttrs.size())
? (*charAttrs.begin())->GetCharFmt().GetCharFmt() : 0;
if ( pCharFmt )
- SwStyleNameMapper::FillProgName( pCharFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pCharFmt->GetName(), sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
}
// Check for Link:
diff --git a/sw/source/core/txtnode/fmtatr2.cxx b/sw/source/core/txtnode/fmtatr2.cxx
index dc927f6..c8f8f01 100644
--- a/sw/source/core/txtnode/fmtatr2.cxx
+++ b/sw/source/core/txtnode/fmtatr2.cxx
@@ -127,7 +127,7 @@ bool SwFmtCharFmt::QueryValue( uno::Any& rVal, sal_uInt8 ) const
{
String sCharFmtName;
if(GetCharFmt())
- SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillProgName(GetCharFmt()->GetName(), sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
rVal <<= OUString( sCharFmtName );
return true;
}
@@ -321,14 +321,14 @@ bool SwFmtINetFmt::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
if( !sVal.Len() && nVisitedId != 0 )
SwStyleNameMapper::FillUIName( nVisitedId, sVal );
if( sVal.Len() )
- SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
break;
case MID_URL_UNVISITED_FMT:
sVal = aINetFmt;
if( !sVal.Len() && nINetId != 0 )
SwStyleNameMapper::FillUIName( nINetId, sVal );
if( sVal.Len() )
- SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillProgName( sVal, sVal, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
break;
case MID_URL_HYPERLINKEVENTS:
{
@@ -395,7 +395,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case MID_URL_VISITED_FMT:
{
String aString;
- SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
aVisitedFmt = OUString ( aString );
nVisitedId = SwStyleNameMapper::GetPoolIdFromUIName( aVisitedFmt,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
@@ -404,7 +404,7 @@ bool SwFmtINetFmt::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
case MID_URL_UNVISITED_FMT:
{
String aString;
- SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillUIName( sVal, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
aINetFmt = OUString ( aString );
nINetId = SwStyleNameMapper::GetPoolIdFromUIName( aINetFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
}
@@ -484,7 +484,7 @@ bool SwFmtRuby::QueryValue( uno::Any& rVal,
case MID_RUBY_CHARSTYLE:
{
String aString;
- SwStyleNameMapper::FillProgName(sCharFmtName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillProgName(sCharFmtName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
rVal <<= OUString ( aString );
}
break;
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 22ddb66..32aae4d 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -826,10 +826,10 @@ void SwTxtNode::NewAttrSet( SwAttrPool& rPool )
const SwFmtColl* pAnyFmtColl = &GetAnyFmtColl();
const SwFmtColl* pFmtColl = GetFmtColl();
String sVal;
- SwStyleNameMapper::FillProgName( pAnyFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pAnyFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
SfxStringItem aAnyFmtColl( RES_FRMATR_STYLE_NAME, sVal );
if ( pFmtColl != pAnyFmtColl )
- SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName( pFmtColl->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
SfxStringItem aFmtColl( RES_FRMATR_CONDITIONAL_STYLE_NAME, sVal );
aNewAttrSet.Put( aAnyFmtColl );
aNewAttrSet.Put( aFmtColl );
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index c17e802..d18311d 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -102,7 +102,7 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName,
if(aValue >>= uStyle)
{
String sStyle;
- SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
SwDocStyleSheet* pStyle =
(SwDocStyleSheet*)m_pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR);
SwFmtDrop* pDrop = 0;
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index f66a4fb..130fd2a 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -210,7 +210,7 @@ sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
if( pAny )
{
String sVal;
- SwStyleNameMapper::FillProgName(pFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillProgName(pFmt->GetName(), sVal, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
*pAny <<= OUString(sVal);
}
}
@@ -722,7 +722,7 @@ void GetCurPageStyle(SwPaM& rPaM, String &rString)
{
const SwPageFrm* pPage = rPaM.GetCntntNode()->getLayoutFrm(rPaM.GetDoc()->GetCurrentLayout())->FindPageFrm();
if(pPage)
- SwStyleNameMapper::FillProgName( pPage->GetPageDesc()->GetName(), rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
+ SwStyleNameMapper::FillProgName( pPage->GetPageDesc()->GetName(), rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
}
/* --------------------------------------------------
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 5f22640..7a43ea1 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -763,7 +763,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
{
String aString;
SwStyleNameMapper::FillUIName(lcl_AnyToString(rValue),
- aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True);
+ aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
rTOXBase.SetMainEntryCharStyle( aString );
}
break;
@@ -799,7 +799,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
{
String aString;
SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue),
- aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True);
+ aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
bForm = sal_True;
// Header is on Pos 0
aForm.SetTemplate( 0, aString );
@@ -814,7 +814,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
String aString;
bForm = sal_True;
SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue),
- aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True);
+ aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
aForm.SetTemplate( 1, aString );
}
break;
@@ -838,7 +838,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
const sal_uInt16 nLPos = rTOXBase.GetType() == TOX_INDEX ? 2 : 1;
String aString;
SwStyleNameMapper::FillUIName( lcl_AnyToString(rValue),
- aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True);
+ aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
aForm.SetTemplate(nLPos + pEntry->nWID - WID_PARA_LEV1, aString );
}
break;
@@ -1100,7 +1100,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
pTOXBase->GetMainEntryCharStyle(),
aString,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
- sal_True);
+ true);
aRet <<= OUString( aString );
}
break;
@@ -1140,7 +1140,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
//Header steht an Pos 0
String aString;
SwStyleNameMapper::FillProgName(rForm.GetTemplate( 0 ), aString,
- nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
aRet <<= OUString( aString );
}
break;
@@ -1151,7 +1151,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
rForm.GetTemplate( 1 ),
aString,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
- sal_True);
+ true);
aRet <<= OUString( aString );
}
break;
@@ -1173,7 +1173,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
rForm.GetTemplate(nLPos + pEntry->nWID - WID_PARA_LEV1),
aString,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
- sal_True);
+ true);
aRet <<= OUString( aString );
}
break;
@@ -2626,7 +2626,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
sSetStyles += TOX_STYLE_DELIMITER;
}
SwStyleNameMapper::FillUIName(pStyles[i], aString,
- nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True);
+ nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
sSetStyles += aString;
}
rTOXBase.SetStyleNames(sSetStyles, static_cast<sal_uInt16>(nIndex));
@@ -2664,7 +2664,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
rStyles.GetToken(i, TOX_STYLE_DELIMITER),
aString,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
- sal_True);
+ true);
pStyles[i] = OUString( aString );
}
uno::Any aRet(&aStyles, ::getCppuType((uno::Sequence<OUString>*)0));
@@ -2800,7 +2800,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException,
lcl_AnyToString(pProperties[j].Value),
sCharStyleName,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
- sal_True);
+ true);
aToken.sCharStyleName = sCharStyleName;
aToken.nPoolId = SwStyleNameMapper::GetPoolIdFromUIName (
sCharStyleName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT );
@@ -2974,7 +2974,7 @@ throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException,
aToken.sCharStyleName,
aString,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
- sal_True );
+ true );
const OUString aProgCharStyle( aString );
switch(aToken.eTokenType)
{
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index cb7fe6a..d85983f 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -237,7 +237,7 @@ throw (lang::IllegalArgumentException)
}
String sStyle;
SwStyleNameMapper::FillUIName(uStyle, sStyle,
- nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True);
+ nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
SwDocStyleSheet *const pStyle = static_cast<SwDocStyleSheet*>(
pDocSh->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR));
if (!pStyle)
@@ -288,7 +288,7 @@ throw (lang::IllegalArgumentException)
rAny >>= uStyle;
String sStyle;
SwStyleNameMapper::FillUIName(uStyle, sStyle,
- nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
SwDocStyleSheet *const pStyle = static_cast<SwDocStyleSheet*>(
pDocSh->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_PARA));
if (!pStyle)
@@ -331,7 +331,7 @@ SwUnoCursorHelper::SetPageDesc(
}
String sDescName;
SwStyleNameMapper::FillUIName(uDescName, sDescName,
- nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True);
+ nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true);
if (!pNewDesc->GetPageDesc() ||
(pNewDesc->GetPageDesc()->GetName() != sDescName))
{
@@ -428,7 +428,7 @@ lcl_setDropcapCharStyle(SwPaM & rPam, SfxItemSet & rItemSet,
}
String sStyle;
SwStyleNameMapper::FillUIName(uStyle, sStyle,
- nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True);
+ nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
SwDoc *const pDoc = rPam.GetDoc();
//default character style must not be set as default format
SwDocStyleSheet *const pStyle = static_cast<SwDocStyleSheet*>(
@@ -482,7 +482,7 @@ lcl_setRubyCharstyle(SfxItemSet & rItemSet, uno::Any const& rValue)
}
String sStyle;
SwStyleNameMapper::FillUIName(sTmp, sStyle,
- nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
pRuby->SetCharFmtName(sStyle);
pRuby->SetCharFmtId(0);
if (sStyle.Len() > 0)
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 6cf173a..4a9b7c3 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -216,7 +216,7 @@ SwCharFmt* lcl_getCharFmt(SwDoc* pDoc, const uno::Any& aValue)
OUString uTmp;
aValue >>= uTmp;
String sCharFmt;
- SwStyleNameMapper::FillUIName(uTmp, sCharFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True);
+ SwStyleNameMapper::FillUIName(uTmp, sCharFmt, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true);
if(sStandard != sCharFmt)
{
pRet = pDoc->FindCharFmtByName( sCharFmt );
@@ -235,7 +235,7 @@ SwTxtFmtColl* lcl_GetParaStyle(SwDoc* pDoc, const uno::Any& aValue)
OUString uTmp;
aValue >>= uTmp;
String sParaStyle;
- SwStyleNameMapper::FillUIName(uTmp, sParaStyle, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillUIName(uTmp, sParaStyle, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
SwTxtFmtColl* pRet = pDoc->FindTxtFmtCollByName( sParaStyle );
if( !pRet )
{
@@ -253,7 +253,7 @@ SwPageDesc* lcl_GetPageDesc(SwDoc* pDoc, const uno::Any& aValue)
OUString uTmp;
aValue >>= uTmp;
String sPageDesc;
- SwStyleNameMapper::FillUIName(uTmp, sPageDesc, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
+ SwStyleNameMapper::FillUIName(uTmp, sPageDesc, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
for( sal_uInt16 i = 0; i < nCount; i++)
{
const SwPageDesc& rDesc = pDoc->GetPageDesc( i );
@@ -509,7 +509,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
String aString;
if(pColl)
aString = String ( pColl->GetName() );
- SwStyleNameMapper::FillProgName(aString, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True);
+ SwStyleNameMapper::FillProgName(aString, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
aRet <<= OUString ( aString );
}
break;
@@ -522,7 +522,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
rFtnInfo.GetPageDesc( *pDoc )->GetName(),
aString,
nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC,
- sal_True);
+ true);
}
aRet <<= OUString ( aString );
}
@@ -548,7 +548,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
pCharFmt->GetName(),
aString,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
- sal_True);
+ true);
}
aRet <<= OUString ( aString );
}
@@ -755,7 +755,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
aString,
aString,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
- sal_True);
+ true);
aRet <<= OUString ( aString );
}
@@ -769,7 +769,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
rEndInfo.GetPageDesc( *pDoc )->GetName(),
aString,
nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC,
- sal_True );
+ true );
}
aRet <<= OUString ( aString );
}
@@ -795,7 +795,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
pCharFmt->GetName(),
aString,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
- sal_True );
+ true );
}
aRet <<= OUString ( aString );
}
@@ -1023,7 +1023,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName)
rInfo.GetCharFmt(*pDoc)->GetName(),
aString,
nsSwGetPoolIdFromName::GET_POOLID_CHRFMT,
- sal_True);
+ true);
}
aRet <<= OUString ( aString );
}
@@ -1400,7 +1400,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
CharStyleName = sNewCharStyleNames[(sal_uInt16)nIndex];
String aString;
- SwStyleNameMapper::FillProgName( CharStyleName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillProgName( CharStyleName, aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
aUString = aString;
pData = new PropValData((void*)&aUString, "CharStyleName", ::getCppuType((const OUString*)0));
aPropertyValues.push_back(pData);
@@ -1588,7 +1588,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex(
}
}
String aName;
- SwStyleNameMapper::FillProgName(sValue, aName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True);
+ SwStyleNameMapper::FillProgName(sValue, aName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
aUString = aName;
pData = new PropValData((void*)&aUString, SW_PROP_NAME_STR(UNO_NAME_HEADING_STYLE_NAME), ::getCppuType((const OUString*)0));
@@ -1756,7 +1756,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
OUString uTmp;
pData->aVal >>= uTmp;
String sCharFmtName;
- SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillUIName( uTmp, sCharFmtName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
if(sCharFmtName.EqualsAscii(SW_PROP_NAME_STR(UNO_NAME_CHARACTER_FORMAT_NONE)))
{
sNewCharStyleNames[(sal_uInt16)nIndex] = rtl::OUString(aInvalidStyle);
@@ -1923,7 +1923,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
OUString uTmp;
pData->aVal >>= uTmp;
String sStyleName;
- SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
const SwTxtFmtColls* pColls = pDoc->GetTxtFmtColls();
const sal_uInt16 nCount = pColls->size();
for(sal_uInt16 k = 0; k < nCount; ++k)
@@ -2078,7 +2078,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
OUString uTmp;
pData->aVal >>= uTmp;
String sStyleName;
- SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ SwStyleNameMapper::FillUIName(uTmp, sStyleName, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
const SwTxtFmtColls* pColls = pDocShell->GetDoc()->GetTxtFmtColls();
const sal_uInt16 nCount = pColls->size();
for(sal_uInt16 k = 0; k < nCount; ++k)
@@ -2304,14 +2304,14 @@ OUString SwXNumberingRules::getName() throw( RuntimeException )
String aString;
if(pNumRule)
{
- SwStyleNameMapper::FillProgName(pNumRule->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, sal_True );
+ SwStyleNameMapper::FillProgName(pNumRule->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true );
return OUString ( aString );
}
// consider chapter numbering <SwXNumberingRules>
else if ( pDocShell )
{
SwStyleNameMapper::FillProgName( pDocShell->GetDoc()->GetOutlineNumRule()->GetName(),
- aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, sal_True );
+ aString, nsSwGetPoolIdFromName::GET_POOLID_NUMRULE, true );
return OUString ( aString );
}
else
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 5f965ba..623c1a2 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -761,7 +761,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName)
SolarMutexGuard aGuard;
uno::Any aRet;
String sStyleName;
- SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+ SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
if(pBasePool)
{
pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
@@ -801,7 +801,7 @@ uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::Runt
String aString;
for(sal_uInt16 i = 0; i < nCount; i++)
{
- SwStyleNameMapper::FillProgName((*pIterator)[i]->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+ SwStyleNameMapper::FillProgName((*pIterator)[i]->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
pArray[i] = OUString ( aString );
}
delete pIterator;
@@ -818,7 +818,7 @@ sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeExc
if(pBasePool)
{
String sStyleName;
- SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+ SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName);
bRet = 0 != pBase;
@@ -849,7 +849,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen
if(pBasePool)
{
String sStyleName;
- SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True);
+ SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true);
pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
SfxStyleSheetBase* pBase = pBasePool->Find(sStyleName);
SfxStyleSheetBase* pUINameBase = pBasePool->Find( sStyleName );
@@ -952,7 +952,7 @@ void SwXStyleFamily::removeByName(const OUString& rName) throw( container::NoSuc
{
pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL );
String aString;
- SwStyleNameMapper::FillUIName(rName, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+ SwStyleNameMapper::FillUIName(rName, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
SfxStyleSheetBase* pBase = pBasePool->Find( aString );
if(pBase)
@@ -1384,7 +1384,7 @@ OUString SwXStyle::getName(void) throw( uno::RuntimeException )
OSL_ENSURE(pBase, "where is the style?" );
if(!pBase)
throw uno::RuntimeException();
- SwStyleNameMapper::FillProgName(pBase->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True);
+ SwStyleNameMapper::FillProgName(pBase->GetName(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true);
}
else
aString = sStyleName;
@@ -1462,7 +1462,7 @@ OUString SwXStyle::getParentStyle(void) throw( uno::RuntimeException )
aString = sParentStyleName;
else
throw uno::RuntimeException();
- SwStyleNameMapper::FillProgName(aString, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+ SwStyleNameMapper::FillProgName(aString, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
return OUString ( aString );
}
@@ -1471,7 +1471,7 @@ void SwXStyle::setParentStyle(const OUString& rParentStyle)
{
SolarMutexGuard aGuard;
String sParentStyle;
- SwStyleNameMapper::FillUIName(rParentStyle, sParentStyle, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+ SwStyleNameMapper::FillUIName(rParentStyle, sParentStyle, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
if(pBasePool)
{
pBasePool->SetSearchMask(eFamily);
@@ -1822,7 +1822,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
OUString sTmp;
rValue >>= sTmp;
String aString;
- SwStyleNameMapper::FillUIName(sTmp, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ) ;
+ SwStyleNameMapper::FillUIName(sTmp, aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true ) ;
rBase.mxNewBase->SetFollow( aString );
}
break;
@@ -1846,7 +1846,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
OUString uDescName;
rValue >>= uDescName;
String sDescName;
- SwStyleNameMapper::FillUIName(uDescName, sDescName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
+ SwStyleNameMapper::FillUIName(uDescName, sDescName, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
if(!pNewDesc->GetPageDesc() || pNewDesc->GetPageDesc()->GetName() != sDescName)
{
sal_Bool bPut = sal_False;
@@ -1903,7 +1903,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
{
// get UI style name from programmatic style name
String aStyleName;
- SwStyleNameMapper::FillUIName( aTmp, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True );
+ SwStyleNameMapper::FillUIName( aTmp, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true );
//
// check for correct context and style name
@@ -1977,7 +1977,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
aReg.SetWhich(SID_SWREGISTER_MODE);
rBase.GetItemSet().Put(aReg);
String aString;
- SwStyleNameMapper::FillUIName(sName, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True);
+ SwStyleNameMapper::FillUIName(sName, aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true);
rBase.GetItemSet().Put(SfxStringItem(SID_SWREGISTER_COLLECTION, aString ) );
}
@@ -1996,7 +1996,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
if(!pRuby)
pRuby = new SwFmtRuby(aEmptyStr);
String sStyle;
- SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillUIName(sTmp, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
pRuby->SetCharFmtName( sTmp );
pRuby->SetCharFmtId( 0 );
if(!sTmp.isEmpty())
@@ -2028,7 +2028,7 @@ void lcl_SetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
OUString uStyle;
rValue >>= uStyle;
String sStyle;
- SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillUIName(uStyle, sStyle, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
SwDocStyleSheet* pStyle =
(SwDocStyleSheet*)pDoc->GetDocShell()->GetStyleSheetPool()->Find(sStyle, SFX_STYLE_FAMILY_CHAR);
if(pStyle)
@@ -2226,7 +2226,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
case FN_UNO_FOLLOW_STYLE:
{
String aString;
- SwStyleNameMapper::FillProgName(rBase.mxNewBase->GetFollow(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True);
+ SwStyleNameMapper::FillProgName(rBase.mxNewBase->GetFollow(), aString, lcl_GetSwEnumFromSfxEnum ( eFamily ), true);
aRet <<= OUString( aString );
}
break;
@@ -2242,7 +2242,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
if(pDesc)
{
String aString;
- SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
+ SwStyleNameMapper::FillProgName(pDesc->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
aRet <<= OUString( aString );
}
}
@@ -2285,7 +2285,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
{
// get programmatic style name from UI style name
aStyleName = pCond->GetTxtFmtColl()->GetName();
- SwStyleNameMapper::FillProgName(aStyleName, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True);
+ SwStyleNameMapper::FillProgName(aStyleName, aStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), true);
}
pSeq[n].Name = GetCommandContextByIndex(n);
@@ -2331,7 +2331,7 @@ uno::Any lcl_GetStyleProperty(const SfxItemPropertySimpleEntry& rEntry,
pCol = pPageDesc->GetRegisterFmtColl();
if( pCol )
SwStyleNameMapper::FillProgName(
- pCol->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, sal_True );
+ pCol->GetName(), aString, nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL, true );
aRet <<= OUString ( aString );
}
break;
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index a9a4c3e..e66ff3d 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -198,7 +198,7 @@ void lcl_SetSpecialProperty(SwFrmFmt* pFmt, const SfxItemPropertySimpleEntry* pE
const SwPageDesc* pDesc = 0;
if(sPageStyle.Len())
{
- SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
+ SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
pDesc = ::GetPageDescByName_Impl(*pFmt->GetDoc(), sPageStyle);
}
SwFmtPageDesc aDesc( pDesc );
@@ -1980,7 +1980,7 @@ void SwTableProperties_Impl::ApplyTblAttr(const SwTable& rTbl, SwDoc& rDoc)
String sPageStyle = uTmp;
if(sPageStyle.Len())
{
- SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, sal_True );
+ SwStyleNameMapper::FillUIName(sPageStyle, sPageStyle, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true );
const SwPageDesc* pDesc = ::GetPageDescByName_Impl(rDoc, sPageStyle);
if(pDesc)
{
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 30a44eb..cdbc634 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -422,7 +422,7 @@ void SwXMLTextStyleContext_Impl::Finish( sal_Bool bOverwrite )
SwStyleNameMapper::FillUIName( aDisplayName,
aString,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
- sal_True);
+ true);
sName = aString;
SwTxtFmtColl* pCondColl = pDoc->FindTxtFmtCollByName( sName );
OSL_ENSURE( pCondColl,
@@ -657,7 +657,7 @@ void SwXMLItemSetStyleContext_Impl::ConnectPageDesc()
SwStyleNameMapper::FillUIName( sName,
sName,
nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC,
- sal_True);
+ true);
SwPageDesc *pPageDesc = pDoc->FindPageDescByName( sName );
if( !pPageDesc )
{
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index 42ec988..8454fe4 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -106,7 +106,7 @@ void SwXMLExport::ExportFmt( const SwFmt& rFmt, enum XMLTokenEnum eFamily )
pPageDesc->GetName(),
sName,
nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC,
- sal_True);
+ true);
AddAttribute( XML_NAMESPACE_STYLE, XML_MASTER_PAGE_NAME,
EncodeStyleName( sName ) );
}
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 1a4dfe7..8f3e577 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -178,7 +178,7 @@ void SwXMLTextParagraphExport::exportStyleContent(
rCond.GetTxtFmtColl()->GetName(),
aString,
nsSwGetPoolIdFromName::GET_POOLID_TXTCOLL,
- sal_True);
+ true);
aString = GetExport().EncodeStyleName( aString );
GetExport().AddAttribute( XML_NAMESPACE_STYLE,
XML_APPLY_STYLE_NAME, aString );
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 37e54af..0a25804 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -732,7 +732,7 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
pValues[1].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_TEXT));
pValues[1].Value <<= OUString(rAttr.GetText());
pValues[2].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_CHAR_STYLE_NAME));
- SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillProgName(rAttr.GetCharFmtName(), aString, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
pValues[2].Value <<= OUString( aString );
pValues[3].Name = rtl::OUString::createFromAscii(SW_PROP_NAME_STR(UNO_NAME_RUBY_ADJUST));
pValues[3].Value <<= (sal_Int16)rAttr.GetAdjustment();
@@ -787,7 +787,7 @@ void SAL_CALL SwXTextView::setRubyList(
if((pProperties[nProp].Value >>= sTmp))
{
String sName;
- SwStyleNameMapper::FillUIName(sTmp, sName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, sal_True );
+ SwStyleNameMapper::FillUIName(sTmp, sName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT, true );
sal_uInt16 nPoolId = sName.Len() ?
SwStyleNameMapper::GetPoolIdFromUIName( sName, nsSwGetPoolIdFromName::GET_POOLID_CHRFMT ) : 0;
More information about the Libreoffice-commits
mailing list