[Libreoffice-commits] .: 8 commits - chart2/source drawinglayer/source svl/inc svl/source xmloff/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Oct 2 05:59:49 PDT 2012
chart2/source/controller/dialogs/res_DataLabel.cxx | 4
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 10 +-
svl/inc/svl/ctloptions.hxx | 20 ++--
svl/inc/svl/imageitm.hxx | 4
svl/inc/svl/zformat.hxx | 10 +-
svl/source/config/ctloptions.cxx | 74 ++++++++--------
svl/source/fsstor/oinputstreamcontainer.cxx | 6 -
svl/source/fsstor/oinputstreamcontainer.hxx | 5 -
svl/source/fsstor/ostreamcontainer.cxx | 16 +--
svl/source/fsstor/ostreamcontainer.hxx | 6 -
svl/source/inc/passwordcontainer.hxx | 58 ++++++------
svl/source/items/imageitm.cxx | 8 -
svl/source/numbers/zforfind.cxx | 2
svl/source/numbers/zformat.cxx | 66 +++++++-------
svl/source/passwordcontainer/passwordcontainer.cxx | 24 ++---
xmloff/source/style/xmlnumfe.cxx | 28 +++---
16 files changed, 170 insertions(+), 171 deletions(-)
New commits:
commit 5d8c2eddead8c9144e337d64a559e1621d36da43
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 1 12:54:52 2012 +0200
String->OUString in svl::ImpSvNumberformatInfo
Change-Id: Iff00b06a1e4e7c485e70ef0537fdea07ce3d42e5
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 0418fca..1a35282 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -65,7 +65,7 @@ enum NfHackConversion
struct ImpSvNumberformatInfo // Struct for FormatInfo
{
- String* sStrArray; // Array of symbols
+ OUString* sStrArray; // Array of symbols
short* nTypeArray; // Array of infos
sal_uInt16 nThousand; // Count of group separator sequences
sal_uInt16 nCntPre; // Count of digits before decimal point
@@ -281,7 +281,7 @@ public:
// Substring of a subformat code nNumFor (0..3)
// nPos == 0xFFFF => last substring
// bString==true: first/last SYMBOLTYPE_STRING or SYMBOLTYPE_CURRENCY
- const String* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
+ const OUString* GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
bool bString = false ) const;
// Subtype of a subformat code nNumFor (0..3)
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index fb5bbe3..69d6761 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2466,7 +2466,7 @@ bool ImpSvNumberInputScan::ScanStringNumFor(
if ( !pFormat )
return false;
const ::utl::TransliterationWrapper* pTransliteration = pFormatter->GetTransliteration();
- const String* pStr;
+ const OUString* pStr;
rtl::OUString aString( rString );
bool bFound = false;
bool bFirst = true;
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 5cf224b..5c4c31c 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -353,7 +353,7 @@ void ImpSvNumFor::Enlarge(sal_uInt16 nAnz)
if ( nAnz )
{
aI.nTypeArray = new short[nAnz];
- aI.sStrArray = new String[nAnz];
+ aI.sStrArray = new OUString[nAnz];
}
else
{
@@ -2051,13 +2051,13 @@ bool SvNumberformat::GetOutputString(String& sString,
if( bStarFlag )
{
OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i].GetChar(1);
+ OutString += rInfo.sStrArray[i][1];
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i].GetChar(1) );
+ rInfo.sStrArray[i][1] );
break;
case NF_KEY_GENERAL : // #77026# "General" is the same as "@"
case NF_SYMBOLTYPE_DEL :
@@ -2319,13 +2319,13 @@ bool SvNumberformat::GetOutputString(double fNumber,
if( bStarFlag )
{
OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i].GetChar(1);
+ OutString += rInfo.sStrArray[i][1];
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i].GetChar(1) );
+ rInfo.sStrArray[i][1] );
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
@@ -2586,7 +2586,7 @@ bool SvNumberformat::GetOutputString(double fNumber,
if (rInfo.nCntPre > 0 && nFrac == 0)
sDiv.Insert(' ',0);
else
- sDiv.Insert( rInfo.sStrArray[j].GetChar(0), 0 );
+ sDiv.Insert( rInfo.sStrArray[j][0], 0 );
if ( j )
j--;
else
@@ -2845,13 +2845,13 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
if( bStarFlag )
{
OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i].GetChar(1);
+ OutString += rInfo.sStrArray[i][1];
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i].GetChar(1) );
+ rInfo.sStrArray[i][1] );
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
@@ -2865,7 +2865,7 @@ bool SvNumberformat::ImpGetTimeOutput(double fNumber,
xub_StrLen nLen = ( bInputLine && i > 0 &&
(rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
- nCntPost : rInfo.sStrArray[i].Len() );
+ nCntPost : rInfo.sStrArray[i].getLength() );
for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
{
OutString += sSecStr.GetChar(nSecPos);
@@ -2966,11 +2966,11 @@ sal_Int32 SvNumberformat::ImpUseMonthCase( int & io_nState, const ImpSvNumFor& r
xub_StrLen nLen;
if ((i < nCount-1 &&
rInfo.nTypeArray[i+1] == NF_SYMBOLTYPE_STRING &&
- rInfo.sStrArray[i+1].GetChar(0) != ' ') ||
+ rInfo.sStrArray[i+1][0] != ' ') ||
(i > 0 &&
rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING &&
- ((nLen = rInfo.sStrArray[i-1].Len()) > 0) &&
- rInfo.sStrArray[i-1].GetChar(nLen-1) != ' '))
+ ((nLen = rInfo.sStrArray[i-1].getLength()) > 0) &&
+ rInfo.sStrArray[i-1][nLen-1] != ' '))
io_nState = 1;
else if (bDaySeen)
io_nState = 3;
@@ -3285,13 +3285,13 @@ bool SvNumberformat::ImpGetDateOutput(double fNumber,
if( bStarFlag )
{
OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i].GetChar(1);
+ OutString += rInfo.sStrArray[i][1];
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i].GetChar(1) );
+ rInfo.sStrArray[i][1] );
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
@@ -3572,13 +3572,13 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
if( bStarFlag )
{
OutString += (sal_Unicode) 0x1B;
- OutString += rInfo.sStrArray[i].GetChar(1);
+ OutString += rInfo.sStrArray[i][1];
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
InsertBlanks( OutString, OutString.Len(),
- rInfo.sStrArray[i].GetChar(1) );
+ rInfo.sStrArray[i][1] );
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
@@ -3592,7 +3592,7 @@ bool SvNumberformat::ImpGetDateTimeOutput(double fNumber,
xub_StrLen nLen = ( bInputLine && i > 0 &&
(rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_STRING ||
rInfo.nTypeArray[i-1] == NF_SYMBOLTYPE_TIME100SECSEP) ?
- nCntPost : rInfo.sStrArray[i].Len() );
+ nCntPost : rInfo.sStrArray[i].getLength() );
for (xub_StrLen j = 0; j < nLen && nSecPos < nCntPost; j++)
{
OutString += sSecStr.GetChar(nSecPos);
@@ -3885,13 +3885,13 @@ bool SvNumberformat::ImpGetNumberOutput(double fNumber,
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
- sStr.Insert(rInfo.sStrArray[j].GetChar(1),k);
+ sStr.Insert(rInfo.sStrArray[j][1], k);
sStr.Insert( (sal_Unicode) 0x1B, k );
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
- /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) );
+ /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_CURRENCY:
@@ -4000,18 +4000,18 @@ bool SvNumberformat::ImpNumberFillWithThousands(
sStr.Insert(rInfo.sStrArray[j],k);
if ( k == 0 )
nLeadingStringChars =
- nLeadingStringChars + rInfo.sStrArray[j].Len();
+ nLeadingStringChars + rInfo.sStrArray[j].getLength();
break;
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
- sStr.Insert(rInfo.sStrArray[j].GetChar(1),k);
+ sStr.Insert(rInfo.sStrArray[j][1], k);
sStr.Insert( (sal_Unicode) 0x1B, k );
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
- /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) );
+ /*k = */ InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
break;
case NF_SYMBOLTYPE_THSEP:
{
@@ -4169,13 +4169,13 @@ bool SvNumberformat::ImpNumberFill( String& sStr, // number string
case NF_SYMBOLTYPE_STAR:
if( bStarFlag )
{
- sStr.Insert(rInfo.sStrArray[j].GetChar(1),k);
+ sStr.Insert(rInfo.sStrArray[j][1], k);
sStr.Insert( sal_Unicode(0x1B), k );
bRes = true;
}
break;
case NF_SYMBOLTYPE_BLANK:
- k = InsertBlanks( sStr,k,rInfo.sStrArray[j].GetChar(1) );
+ k = InsertBlanks( sStr,k,rInfo.sStrArray[j][1] );
break;
case NF_SYMBOLTYPE_THSEP:
{
@@ -4287,7 +4287,7 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
short nType = rInfo.nTypeArray[i];
if ( nType == NF_SYMBOLTYPE_DIGIT)
{
- register const sal_Unicode* p = rInfo.sStrArray[i].GetBuffer();
+ const sal_Unicode* p = rInfo.sStrArray[i].getStr();
while ( *p == '#' )
p++;
while ( *p++ == '0' )
@@ -4300,7 +4300,7 @@ void SvNumberformat::GetNumForInfo( sal_uInt16 nNumFor, short& rScannedType,
}
}
-const String* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
+const OUString* SvNumberformat::GetNumForString( sal_uInt16 nNumFor, sal_uInt16 nPos,
bool bString /* = false */ ) const
{
if ( nNumFor > 3 )
@@ -4387,7 +4387,7 @@ bool SvNumberformat::IsNegativeWithoutSign() const
{
if ( IsNegativeRealNegative() )
{
- const String* pStr = GetNumForString( 1, 0, true );
+ const OUString* pStr = GetNumForString( 1, 0, true );
if ( pStr )
return !HasStringNegativeSign( *pStr );
}
@@ -4400,7 +4400,7 @@ bool SvNumberformat::IsNegativeInBracket() const
if (!nAnz)
return false;
- String *tmpStr = NumFor[1].Info().sStrArray;
+ OUString *tmpStr = NumFor[1].Info().sStrArray;
using comphelper::string::equals;
return (equals(tmpStr[0], '(') && equals(tmpStr[nAnz-1], ')'));
}
@@ -4408,8 +4408,8 @@ bool SvNumberformat::IsNegativeInBracket() const
bool SvNumberformat::HasPositiveBracketPlaceholder() const
{
sal_uInt16 nAnz = NumFor[0].GetCount();
- String *tmpStr = NumFor[0].Info().sStrArray;
- return (tmpStr[nAnz-1].EqualsAscii( "_)" ));
+ OUString *tmpStr = NumFor[0].Info().sStrArray;
+ return (tmpStr[nAnz-1].equalsAscii( "_)" ));
}
DateFormat SvNumberformat::GetDateOrder() const
@@ -4639,7 +4639,7 @@ String SvNumberformat::GetMappedFormatstring(
if ( nAnz )
{
const short* pType = NumFor[n].Info().nTypeArray;
- const String* pStr = NumFor[n].Info().sStrArray;
+ const OUString* pStr = NumFor[n].Info().sStrArray;
for ( sal_uInt16 j=0; j<nAnz; j++ )
{
if ( 0 <= pType[j] && pType[j] < NF_KEYWORD_ENTRIES_COUNT )
@@ -4670,7 +4670,7 @@ String SvNumberformat::GetMappedFormatstring(
case NF_SYMBOLTYPE_STRING :
if( bDontQuote )
aStr += pStr[j];
- else if ( pStr[j].Len() == 1 )
+ else if ( pStr[j].getLength() == 1 )
{
aStr += '\\';
aStr += pStr[j];
@@ -4683,7 +4683,7 @@ String SvNumberformat::GetMappedFormatstring(
}
break;
case NF_SYMBOLTYPE_CALDEL :
- if ( pStr[j+1].EqualsAscii("buddhist") )
+ if ( pStr[j+1].equalsAscii("buddhist") )
{
aStr.InsertAscii( "[$-", 0 );
if ( rNum.IsSet() && rNum.GetNatNum() == 1 &&
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index d11e5ee..63f8f8e 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -1169,7 +1169,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
while (!bEnd)
{
short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False );
- const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
+ const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
switch ( nElemType )
{
@@ -1178,17 +1178,17 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
break;
case NF_SYMBOLTYPE_DIGIT:
if ( bExpFound && pElemStr )
- nExpDigits += pElemStr->Len();
- else if ( !bDecDashes && pElemStr && pElemStr->GetChar(0) == '-' )
+ nExpDigits += pElemStr->getLength();
+ else if ( !bDecDashes && pElemStr && (*pElemStr)[0] == '-' )
bDecDashes = sal_True;
- else if ( !bVarDecimals && !bInInteger && pElemStr && pElemStr->GetChar(0) == '#' )
+ else if ( !bVarDecimals && !bInInteger && pElemStr && (*pElemStr)[0] == '#' )
{
// If the decimal digits string starts with a '#', variable
// decimals is assumed (for 0.###, but not 0.0##).
bVarDecimals = sal_True;
}
if ( bInInteger && pElemStr )
- nIntegerSymbols += pElemStr->Len();
+ nIntegerSymbols += pElemStr->getLength();
nTrailingThousands = 0;
break;
case NF_SYMBOLTYPE_DECSEP:
@@ -1196,7 +1196,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
break;
case NF_SYMBOLTYPE_THSEP:
if (pElemStr)
- nTrailingThousands += pElemStr->Len(); // is reset to 0 if digits follow
+ nTrailingThousands += pElemStr->getLength(); // is reset to 0 if digits follow
break;
case NF_SYMBOLTYPE_EXP:
bExpFound = sal_True; // following digits are exponent digits
@@ -1236,7 +1236,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
while (!bEnd)
{
short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False );
- const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
+ const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
switch ( nElemType )
{
@@ -1245,7 +1245,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
break;
case NF_SYMBOLTYPE_DIGIT:
if ( pElemStr )
- nDigitsPassed += pElemStr->Len();
+ nDigitsPassed += pElemStr->getLength();
break;
case NF_SYMBOLTYPE_STRING:
case NF_SYMBOLTYPE_BLANK:
@@ -1258,7 +1258,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
if ( nElemType == NF_SYMBOLTYPE_STRING || nElemType == NF_SYMBOLTYPE_PERCENT )
aEmbeddedStr = *pElemStr;
else
- SvNumberformat::InsertBlanks( aEmbeddedStr, 0, pElemStr->GetChar(1) );
+ SvNumberformat::InsertBlanks( aEmbeddedStr, 0, (*pElemStr)[1] );
sal_Int32 nEmbedPos = nIntegerSymbols - nDigitsPassed;
@@ -1281,7 +1281,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
while (!bEnd)
{
short nElemType = rFormat.GetNumForType( nPart, nPos, sal_False );
- const XubString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
+ const OUString* pElemStr = rFormat.GetNumForString( nPart, nPos, sal_False );
switch ( nElemType )
{
@@ -1328,7 +1328,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
// (#i20396# the spaces may also be in embedded-text elements)
String aBlanks;
- SvNumberformat::InsertBlanks( aBlanks, 0, pElemStr->GetChar(1) );
+ SvNumberformat::InsertBlanks( aBlanks, 0, (*pElemStr)[1] );
AddToTextElement_Impl( aBlanks );
}
break;
@@ -1415,7 +1415,7 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
case NUMBERFORMAT_FRACTION:
{
sal_Int32 nInteger = nLeading;
- if ( pElemStr && pElemStr->GetChar(0) == '?' )
+ if ( pElemStr && (*pElemStr)[0] == '?' )
{
// If the first digit character is a question mark,
// the fraction doesn't have an integer part, and no
@@ -1575,8 +1575,8 @@ void SvXMLNumFmtExport::ExportPart_Impl( const SvNumberformat& rFormat, sal_uInt
// export only if ODF 1.2 extensions are enabled
if( SvtSaveOptions().GetODFDefaultVersion() > SvtSaveOptions::ODFVER_012 )
{
- if ( pElemStr && pElemStr->Len() > 1 )
- WriteRepeatedElement_Impl( pElemStr->GetChar( 1 ) );
+ if ( pElemStr && pElemStr->getLength() > 1 )
+ WriteRepeatedElement_Impl( (*pElemStr)[1] );
}
break;
}
commit aa720dcd3ab5ed87a58540e92f754d2426614978
Author: Noel Grandin <noel at peralex.com>
Date: Mon Oct 1 11:42:00 2012 +0200
String->OUString in sComment field in svl::SvNumberFormat
Change-Id: I5a774563c791c7cd4170680a65711cc339f60c5b
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index f94e62d..0418fca 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.hxx
@@ -378,9 +378,9 @@ public:
sal_Unicode cQuote = '"',
sal_Unicode cEscIn = '\0', sal_Unicode cEscOut = '\\' );
- void SetComment( const String& rStr )
+ void SetComment( const OUString& rStr )
{ sComment = rStr; }
- const String& GetComment() const { return sComment; }
+ const OUString& GetComment() const { return sComment; }
/** Insert the number of blanks into the string that is needed to simulate
the width of character c for underscore formats */
@@ -459,7 +459,7 @@ public:
private:
ImpSvNumFor NumFor[4]; // Array for the 4 subformats
OUString sFormatstring; // The format code string
- String sComment; // Comment, since number formatter version 6
+ OUString sComment; // Comment, since number formatter version 6
double fLimit1; // Value for first condition
double fLimit2; // Value for second condition
ImpSvNumberformatScan& rScan; // Format code scanner
commit eef39fdc031ca83940d8cd48fb04a7e44355495a
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 27 13:49:39 2012 +0200
XubString->OUString in drawinglayer
Also fix method name
Change-Id: I2ebe3fe5231fbf5e8253537f2f9809e780f180cb
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index 40f653b..5f22397 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -1291,9 +1291,9 @@ namespace
/** helper which takes complete care for creating the needed text primitives. It
takes care of decorated stuff and all the geometry adaptions needed
*/
- void proccessMetaTextAction(
+ void processMetaTextAction(
const Point& rTextStartPosition,
- const XubString& rText,
+ const OUString& rText,
sal_uInt16 nTextStart,
sal_uInt16 nTextLength,
const ::std::vector< double >& rDXArray,
@@ -1994,7 +1994,7 @@ namespace
if(nTextLength && rPropertyHolders.Current().getTextColorActive())
{
const std::vector< double > aDXArray;
- proccessMetaTextAction(
+ processMetaTextAction(
pA->GetPoint(),
pA->GetText(),
nTextIndex,
@@ -2035,7 +2035,7 @@ namespace
}
}
- proccessMetaTextAction(
+ processMetaTextAction(
pA->GetPoint(),
pA->GetText(),
nTextIndex,
@@ -2098,7 +2098,7 @@ namespace
}
}
- proccessMetaTextAction(
+ processMetaTextAction(
pA->GetPoint(),
pA->GetText(),
nTextIndex,
commit 307ecf719f6a8a9c4a81b53e33de0bd00ba5eada
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 27 13:47:25 2012 +0200
UniString->OUString in chart2
Change-Id: I8fb6593ebabb38d0656a35fd95d663547e6a9e29
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 227b300..9113d90 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -128,9 +128,9 @@ DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet& rInAt
m_pPool(rInAttrs.GetPool())
{
//fill label placement list
- std::map< sal_Int32, XubString > aPlacementToStringMap;
+ std::map< sal_Int32, OUString > aPlacementToStringMap;
for( sal_Int32 nEnum=0; nEnum<m_aLB_LabelPlacement.GetEntryCount(); ++nEnum )
- aPlacementToStringMap[nEnum]=m_aLB_LabelPlacement.GetEntry(static_cast<sal_uInt16>(nEnum));
+ aPlacementToStringMap[nEnum] = m_aLB_LabelPlacement.GetEntry(static_cast<sal_uInt16>(nEnum));
::com::sun::star::uno::Sequence < sal_Int32 > aAvailabelPlacementList;
const SfxPoolItem *pPoolItem = NULL;
commit afaaf2528d11ba570ecfd466f5f06bdffc4f6fcb
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 27 11:40:09 2012 +0200
sal_Bool->bool in svl::SfxImageItem
Change-Id: I1a6d53352c65cd0999392531d8e406154bc4bf7a
diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index fce6f42..0a2e26f 100644
--- a/svl/inc/svl/imageitm.hxx
+++ b/svl/inc/svl/imageitm.hxx
@@ -42,8 +42,8 @@ public:
void SetRotation( long nValue );
long GetRotation() const;
- void SetMirrored( sal_Bool bSet );
- sal_Bool IsMirrored() const;
+ void SetMirrored( bool bSet );
+ bool IsMirrored() const;
};
#endif // _SFX_IMAGEITM_HXX
diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index 7d13eb4..7db9160 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.cxx
@@ -27,7 +27,7 @@ struct SfxImageItem_Impl
{
String aURL;
long nAngle;
- sal_Bool bMirrored;
+ bool bMirrored;
int operator == ( const SfxImageItem_Impl& rOther ) const
{ return nAngle == rOther.nAngle && bMirrored == rOther.bMirrored; }
};
@@ -39,7 +39,7 @@ SfxImageItem::SfxImageItem( sal_uInt16 which, sal_uInt16 nImage )
{
pImp = new SfxImageItem_Impl;
pImp->nAngle = 0;
- pImp->bMirrored = sal_False;
+ pImp->bMirrored = false;
}
SfxImageItem::SfxImageItem( const SfxImageItem& rItem )
@@ -109,12 +109,12 @@ long SfxImageItem::GetRotation() const
return pImp->nAngle;
}
-void SfxImageItem::SetMirrored( sal_Bool bSet )
+void SfxImageItem::SetMirrored( bool bSet )
{
pImp->bMirrored = bSet;
}
-sal_Bool SfxImageItem::IsMirrored() const
+bool SfxImageItem::IsMirrored() const
{
return pImp->bMirrored;
}
commit b8df7f62c4afb62715bfde248541938d002102c2
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 27 11:38:04 2012 +0200
sal_Bool->bool in svl::PasswordContainer
Change-Id: I2be813554e773fade260a78eb677022b4c6991b0
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index 6b69b3c..5dfd5c6 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -49,18 +49,18 @@
class NamePassRecord
{
- ::rtl::OUString m_aName;
+ ::rtl::OUString m_aName;
// there are two lists of passwords, memory passwords and persistent passwords
- sal_Bool m_bHasMemPass;
+ bool m_bHasMemPass;
::std::vector< ::rtl::OUString > m_aMemPass;
// persistent passwords are encrypted in one string
- sal_Bool m_bHasPersPass;
+ bool m_bHasPersPass;
::rtl::OUString m_aPersPass;
- void InitArrays( sal_Bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList,
- sal_Bool bHasPersistentList, const ::rtl::OUString& aPersistentList )
+ void InitArrays( bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList,
+ bool bHasPersistentList, const ::rtl::OUString& aPersistentList )
{
m_bHasMemPass = bHasMemoryList;
if ( bHasMemoryList )
@@ -75,30 +75,30 @@ public:
NamePassRecord( const ::rtl::OUString& aName )
: m_aName( aName )
- , m_bHasMemPass( sal_False )
- , m_bHasPersPass( sal_False )
+ , m_bHasMemPass( false )
+ , m_bHasPersPass( false )
{
}
NamePassRecord( const ::rtl::OUString& aName, const ::std::vector< ::rtl::OUString >& aMemoryList )
: m_aName( aName )
- , m_bHasMemPass( sal_True )
+ , m_bHasMemPass( true )
, m_aMemPass( aMemoryList )
- , m_bHasPersPass( sal_False )
+ , m_bHasPersPass( false )
{
}
NamePassRecord( const ::rtl::OUString& aName, const ::rtl::OUString& aPersistentList )
: m_aName( aName )
- , m_bHasMemPass( sal_False )
- , m_bHasPersPass( sal_True )
+ , m_bHasMemPass( false )
+ , m_bHasPersPass( true )
, m_aPersPass( aPersistentList )
{
}
NamePassRecord( const ::rtl::OUString& aName,
- sal_Bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList,
- sal_Bool bHasPersistentList, const ::rtl::OUString aPersistentList )
+ bool bHasMemoryList, const ::std::vector< ::rtl::OUString >& aMemoryList,
+ bool bHasPersistentList, const ::rtl::OUString aPersistentList )
: m_aName( aName )
, m_bHasMemPass( bHasMemoryList )
, m_bHasPersPass( bHasPersistentList )
@@ -108,8 +108,8 @@ public:
NamePassRecord( const NamePassRecord& aRecord )
: m_aName( aRecord.m_aName )
- , m_bHasMemPass( sal_False )
- , m_bHasPersPass( sal_False )
+ , m_bHasMemPass( false )
+ , m_bHasPersPass( false )
{
InitArrays( aRecord.m_bHasMemPass, aRecord.m_aMemPass, aRecord.m_bHasPersPass, aRecord.m_aPersPass );
}
@@ -130,7 +130,7 @@ public:
return m_aName;
}
- sal_Bool HasPasswords( sal_Int8 nStatus ) const
+ bool HasPasswords( sal_Int8 nStatus ) const
{
if ( nStatus == MEMORY_RECORD )
return m_bHasMemPass;
@@ -159,25 +159,25 @@ public:
void SetMemPasswords( const ::std::vector< ::rtl::OUString >& aMemList )
{
m_aMemPass = aMemList;
- m_bHasMemPass = sal_True;
+ m_bHasMemPass = true;
}
void SetPersPasswords( const ::rtl::OUString& aPersList )
{
m_aPersPass = aPersList;
- m_bHasPersPass = sal_True;
+ m_bHasPersPass = true;
}
void RemovePasswords( sal_Int8 nStatus )
{
if ( nStatus == MEMORY_RECORD )
{
- m_bHasMemPass = sal_False;
+ m_bHasMemPass = false;
m_aMemPass.clear();
}
else if ( nStatus == PERSISTENT_RECORD )
{
- m_bHasPersPass = sal_False;
+ m_bHasPersPass = false;
m_aPersPass = ::rtl::OUString();
}
}
@@ -194,14 +194,14 @@ typedef ::std::map< ::rtl::OUString, ::std::list< NamePassRecord > > PassMap;
class PasswordContainer;
class StorageItem : public ::utl::ConfigItem {
- PasswordContainer* mainCont;
- sal_Bool hasEncoded;
+ PasswordContainer* mainCont;
+ bool hasEncoded;
::rtl::OUString mEncoded;
public:
StorageItem( PasswordContainer* point, const ::rtl::OUString& path ) :
ConfigItem( path, CONFIG_MODE_IMMEDIATE_UPDATE ),
mainCont( point ),
- hasEncoded( sal_False )
+ hasEncoded( false )
{
::com::sun::star::uno::Sequence< ::rtl::OUString > aNode( 1 );
*aNode.getArray() = path;
@@ -214,10 +214,10 @@ public:
void remove( const ::rtl::OUString& url, const ::rtl::OUString& rec );
void clear();
- sal_Bool getEncodedMP( ::rtl::OUString& aResult );
- void setEncodedMP( const ::rtl::OUString& aResult, sal_Bool bAcceptEnmpty = sal_False );
- void setUseStorage( sal_Bool bUse );
- sal_Bool useStorage();
+ bool getEncodedMP( ::rtl::OUString& aResult );
+ void setEncodedMP( const ::rtl::OUString& aResult, bool bAcceptEnmpty = false );
+ void setUseStorage( bool bUse );
+ bool useStorage();
virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames );
virtual void Commit();
@@ -251,7 +251,7 @@ private:
::com::sun::star::task::UserRecord CopyToUserRecord(
const NamePassRecord& aRecord,
- sal_Bool& io_bTryToDecode,
+ bool& io_bTryToDecode,
const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& aHandler );
::com::sun::star::uno::Sequence< ::com::sun::star::task::UserRecord > FindUsr(
@@ -282,7 +282,7 @@ bool createUrlRecord(
::rtl::OUString GetMasterPassword( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler )
throw(::com::sun::star::uno::RuntimeException);
- void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, sal_Bool writeFile )
+ void UpdateVector( const ::rtl::OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile )
throw(::com::sun::star::uno::RuntimeException);
void PrivateAdd( const ::rtl::OUString& aUrl,
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 0a86600..213856f 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -258,7 +258,7 @@ PassMap StorageItem::getInfo()
//-------------------------------------------------------------------------
-void StorageItem::setUseStorage( sal_Bool bUse )
+void StorageItem::setUseStorage( bool bUse )
{
Sequence< ::rtl::OUString > sendNames(1);
Sequence< uno::Any > sendVals(1);
@@ -273,7 +273,7 @@ void StorageItem::setUseStorage( sal_Bool bUse )
//-------------------------------------------------------------------------
-sal_Bool StorageItem::useStorage()
+bool StorageItem::useStorage()
{
Sequence< ::rtl::OUString > aNodeNames( 1 );
aNodeNames[0] = ::rtl::OUString("UseStorage");
@@ -286,7 +286,7 @@ sal_Bool StorageItem::useStorage()
return sal_False;
}
- sal_Bool aResult = false;
+ bool aResult = false;
aPropertyValues[0] >>= aResult;
return aResult;
@@ -294,12 +294,12 @@ sal_Bool StorageItem::useStorage()
//-------------------------------------------------------------------------
-sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult )
+bool StorageItem::getEncodedMP( ::rtl::OUString& aResult )
{
if( hasEncoded )
{
aResult = mEncoded;
- return sal_True;
+ return true;
}
Sequence< ::rtl::OUString > aNodeNames( 2 );
@@ -311,7 +311,7 @@ sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult )
if( aPropertyValues.getLength() != aNodeNames.getLength() )
{
OSL_ENSURE( aPropertyValues.getLength() == aNodeNames.getLength(), "Problems during reading\n" );
- return sal_False;
+ return false;
}
aPropertyValues[0] >>= hasEncoded;
@@ -324,7 +324,7 @@ sal_Bool StorageItem::getEncodedMP( ::rtl::OUString& aResult )
//-------------------------------------------------------------------------
-void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, sal_Bool bAcceptEmpty )
+void StorageItem::setEncodedMP( const ::rtl::OUString& aEncoded, bool bAcceptEmpty )
{
Sequence< ::rtl::OUString > sendNames(2);
Sequence< uno::Any > sendVals(2);
@@ -598,7 +598,7 @@ vector< ::rtl::OUString > PasswordContainer::DecodePasswords( const ::rtl::OUStr
//-------------------------------------------------------------------------
-void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, sal_Bool writeFile ) throw(RuntimeException)
+void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) throw(RuntimeException)
{
for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); ++aNPIter )
if( aNPIter->GetUserName().equals( aRecord.GetUserName() ) )
@@ -632,7 +632,7 @@ void PasswordContainer::UpdateVector( const ::rtl::OUString& aURL, list< NamePas
//-------------------------------------------------------------------------
-UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, sal_Bool& io_bTryToDecode, const Reference< XInteractionHandler >& aHandler )
+UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, bool& io_bTryToDecode, const Reference< XInteractionHandler >& aHandler )
{
::std::vector< ::rtl::OUString > aPasswords;
if( aRecord.HasPasswords( MEMORY_RECORD ) )
@@ -648,7 +648,7 @@ UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, s
catch( NoMasterException& )
{
// if master password could not be detected the entry will be just ignored
- io_bTryToDecode = sal_False;
+ io_bTryToDecode = false;
}
}
@@ -661,7 +661,7 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list<
{
Sequence< UserRecord > aResult( original.size() );
sal_uInt32 nInd = 0;
- sal_Bool bTryToDecode = sal_True;
+ bool bTryToDecode = true;
for( list< NamePassRecord >::const_iterator aNPIter = original.begin();
aNPIter != original.end();
@@ -754,7 +754,7 @@ Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >&
if( aNPIter->GetUserName().equals( aName ) )
{
Sequence< UserRecord > aResult(1);
- sal_Bool bTryToDecode = sal_True;
+ bool bTryToDecode = true;
aResult[0] = CopyToUserRecord( *aNPIter, bTryToDecode, aHandler );
return aResult;
commit d5abaeb1614c65947c7c9674a319511b0450c357
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 27 11:20:55 2012 +0200
sal_Bool->bool in svl::OFSInputStreamContainer and OFSStreamContainer
Also make OFSInputStreamContainer's member variables private,
there is no reason for them to be protected
Change-Id: Ic5717b5a3740e27adfc0ee55e7677a8727b8cbae
diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index e8a53c7..d43b021 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
@@ -27,8 +27,8 @@ using namespace ::com::sun::star;
OFSInputStreamContainer::OFSInputStreamContainer( const uno::Reference< io::XInputStream >& xStream )
: m_xInputStream( xStream )
, m_xSeekable( xStream, uno::UNO_QUERY )
-, m_bSeekable( sal_False )
-, m_bDisposed( sal_False )
+, m_bSeekable( false )
+, m_bDisposed( false )
, m_pListenersContainer( NULL )
{
m_bSeekable = m_xSeekable.is();
@@ -302,7 +302,7 @@ void SAL_CALL OFSInputStreamContainer::dispose( )
m_pListenersContainer->disposeAndClear( aSource );
}
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
//-----------------------------------------------
diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index f3f8fe1..6bc2e4a 100644
--- a/svl/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
@@ -34,15 +34,14 @@ class OFSInputStreamContainer : public cppu::WeakImplHelper2 < ::com::sun::star:
,::com::sun::star::embed::XExtendedStorageStream >
, public ::com::sun::star::io::XSeekable
{
-protected:
::osl::Mutex m_aMutex;
::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > m_xInputStream;
::com::sun::star::uno::Reference < ::com::sun::star::io::XSeekable > m_xSeekable;
- sal_Bool m_bSeekable;
+ bool m_bSeekable;
- sal_Bool m_bDisposed;
+ bool m_bDisposed;
::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index f439d89..081eb59 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -25,9 +25,9 @@ using namespace ::com::sun::star;
//-----------------------------------------------
OFSStreamContainer::OFSStreamContainer( const uno::Reference < io::XStream >& xStream )
-: m_bDisposed( sal_False )
-, m_bInputClosed( sal_False )
-, m_bOutputClosed( sal_False )
+: m_bDisposed( false )
+, m_bInputClosed( false )
+, m_bOutputClosed( false )
, m_pListenersContainer( NULL )
, m_pTypeCollection( NULL )
{
@@ -261,13 +261,13 @@ void SAL_CALL OFSStreamContainer::dispose()
if ( m_xInputStream.is() && !m_bInputClosed )
{
m_xInputStream->closeInput();
- m_bInputClosed = sal_True;
+ m_bInputClosed = true;
}
if ( m_xOutputStream.is() && !m_bOutputClosed )
{
m_xOutputStream->closeOutput();
- m_bOutputClosed = sal_True;
+ m_bOutputClosed = true;
}
if ( m_pListenersContainer )
@@ -276,7 +276,7 @@ void SAL_CALL OFSStreamContainer::dispose()
m_pListenersContainer->disposeAndClear( aSource );
}
- m_bDisposed = sal_True;
+ m_bDisposed = true;
}
//-----------------------------------------------
@@ -448,7 +448,7 @@ void SAL_CALL OFSStreamContainer::closeInput()
if ( m_xInputStream.is() )
{
m_xInputStream->closeInput();
- m_bInputClosed = sal_True;
+ m_bInputClosed = true;
}
if ( m_bOutputClosed )
@@ -510,7 +510,7 @@ void SAL_CALL OFSStreamContainer::closeOutput()
if ( m_xOutputStream.is() )
{
m_xOutputStream->closeOutput();
- m_bOutputClosed = sal_True;
+ m_bOutputClosed = true;
}
if ( m_bInputClosed )
diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index a877094..fef3edc 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
@@ -52,9 +52,9 @@ class OFSStreamContainer : public cppu::OWeakObject,
::com::sun::star::uno::Reference< ::com::sun::star::io::XTruncate > m_xTruncate;
::com::sun::star::uno::Reference< ::com::sun::star::io::XAsyncOutputMonitor > m_xAsyncOutputMonitor;
- sal_Bool m_bDisposed;
- sal_Bool m_bInputClosed;
- sal_Bool m_bOutputClosed;
+ bool m_bDisposed;
+ bool m_bInputClosed;
+ bool m_bOutputClosed;
::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners
::cppu::OTypeCollection* m_pTypeCollection;
commit 2c270eeff422ef93100376ce0717a131d4f3cc2f
Author: Noel Grandin <noel at peralex.com>
Date: Thu Sep 27 11:13:36 2012 +0200
sal_Bool->bool in svl::SvtCTLOptions
Change-Id: I824595b6b60d4114f27bf64d8a84f2973f778e39
diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 3a0b826..525e8e7 100644
--- a/svl/inc/svl/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
@@ -37,20 +37,20 @@ private:
public:
// bDontLoad is for referencing purposes only
- SvtCTLOptions( sal_Bool bDontLoad = sal_False );
+ SvtCTLOptions( bool bDontLoad = false );
virtual ~SvtCTLOptions();
- void SetCTLFontEnabled( sal_Bool _bEnabled );
- sal_Bool IsCTLFontEnabled() const;
+ void SetCTLFontEnabled( bool _bEnabled );
+ bool IsCTLFontEnabled() const;
- void SetCTLSequenceChecking( sal_Bool _bEnabled );
- sal_Bool IsCTLSequenceChecking() const;
+ void SetCTLSequenceChecking( bool _bEnabled );
+ bool IsCTLSequenceChecking() const;
- void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingRestricted( void ) const;
+ void SetCTLSequenceCheckingRestricted( bool _bEnable );
+ bool IsCTLSequenceCheckingRestricted( void ) const;
- void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingTypeAndReplace() const;
+ void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable );
+ bool IsCTLSequenceCheckingTypeAndReplace() const;
enum CursorMovement
{
@@ -79,7 +79,7 @@ public:
E_CTLSEQUENCECHECKINGRESTRICTED,
E_CTLSEQUENCECHECKINGTYPEANDREPLACE
};
- sal_Bool IsReadOnly(EOption eOption) const;
+ bool IsReadOnly(EOption eOption) const;
};
#endif // _SVTOOLS_CTLOPTIONS_HXX
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index e7cb760..36d8df1 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -42,20 +42,20 @@ using namespace ::com::sun::star::uno;
class SvtCTLOptions_Impl : public utl::ConfigItem
{
private:
- sal_Bool m_bIsLoaded;
- sal_Bool m_bCTLFontEnabled;
- sal_Bool m_bCTLSequenceChecking;
- sal_Bool m_bCTLRestricted;
- sal_Bool m_bCTLTypeAndReplace;
+ bool m_bIsLoaded;
+ bool m_bCTLFontEnabled;
+ bool m_bCTLSequenceChecking;
+ bool m_bCTLRestricted;
+ bool m_bCTLTypeAndReplace;
SvtCTLOptions::CursorMovement m_eCTLCursorMovement;
SvtCTLOptions::TextNumerals m_eCTLTextNumerals;
- sal_Bool m_bROCTLFontEnabled;
- sal_Bool m_bROCTLSequenceChecking;
- sal_Bool m_bROCTLRestricted;
- sal_Bool m_bROCTLTypeAndReplace;
- sal_Bool m_bROCTLCursorMovement;
- sal_Bool m_bROCTLTextNumerals;
+ bool m_bROCTLFontEnabled;
+ bool m_bROCTLSequenceChecking;
+ bool m_bROCTLRestricted;
+ bool m_bROCTLTypeAndReplace;
+ bool m_bROCTLCursorMovement;
+ bool m_bROCTLTextNumerals;
public:
SvtCTLOptions_Impl();
@@ -65,18 +65,18 @@ public:
virtual void Commit();
void Load();
- sal_Bool IsLoaded() { return m_bIsLoaded; }
- void SetCTLFontEnabled( sal_Bool _bEnabled );
- sal_Bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; }
+ bool IsLoaded() { return m_bIsLoaded; }
+ void SetCTLFontEnabled( bool _bEnabled );
+ bool IsCTLFontEnabled() const { return m_bCTLFontEnabled; }
- void SetCTLSequenceChecking( sal_Bool _bEnabled );
- sal_Bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;}
+ void SetCTLSequenceChecking( bool _bEnabled );
+ bool IsCTLSequenceChecking() const { return m_bCTLSequenceChecking;}
- void SetCTLSequenceCheckingRestricted( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; }
+ void SetCTLSequenceCheckingRestricted( bool _bEnable );
+ bool IsCTLSequenceCheckingRestricted( void ) const { return m_bCTLRestricted; }
- void SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable );
- sal_Bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; }
+ void SetCTLSequenceCheckingTypeAndReplace( bool _bEnable );
+ bool IsCTLSequenceCheckingTypeAndReplace() const { return m_bCTLTypeAndReplace; }
void SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eMovement );
SvtCTLOptions::CursorMovement
@@ -86,7 +86,7 @@ public:
SvtCTLOptions::TextNumerals
GetCTLTextNumerals() const { return m_eCTLTextNumerals; }
- sal_Bool IsReadOnly(SvtCTLOptions::EOption eOption) const;
+ bool IsReadOnly(SvtCTLOptions::EOption eOption) const;
};
//------------------------------------------------------------------------------
namespace
@@ -95,9 +95,9 @@ namespace
: public rtl::Static< Sequence< rtl::OUString >, PropertyNames > {};
}
//------------------------------------------------------------------------------
-sal_Bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
+bool SvtCTLOptions_Impl::IsReadOnly(SvtCTLOptions::EOption eOption) const
{
- sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
+ bool bReadOnly = CFG_READONLY_DEFAULT;
switch(eOption)
{
case SvtCTLOptions::E_CTLFONT : bReadOnly = m_bROCTLFontEnabled ; break;
@@ -303,7 +303,7 @@ void SvtCTLOptions_Impl::Load()
m_bIsLoaded = sal_True;
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLFontEnabled( bool _bEnabled )
{
if(!m_bROCTLFontEnabled && m_bCTLFontEnabled != _bEnabled)
{
@@ -313,7 +313,7 @@ void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
}
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLSequenceChecking( bool _bEnabled )
{
if(!m_bROCTLSequenceChecking && m_bCTLSequenceChecking != _bEnabled)
{
@@ -323,7 +323,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
}
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( bool _bEnabled )
{
if(!m_bROCTLRestricted && m_bCTLRestricted != _bEnabled)
{
@@ -333,7 +333,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled )
}
}
//------------------------------------------------------------------------------
-void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnabled )
+void SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( bool _bEnabled )
{
if(!m_bROCTLTypeAndReplace && m_bCTLTypeAndReplace != _bEnabled)
{
@@ -370,7 +370,7 @@ namespace { struct CTLMutex : public rtl::Static< osl::Mutex, CTLMutex > {}; }
// class SvtCTLOptions --------------------------------------------------
-SvtCTLOptions::SvtCTLOptions( sal_Bool bDontLoad )
+SvtCTLOptions::SvtCTLOptions( bool bDontLoad )
{
// Global access, must be guarded (multithreading)
::osl::MutexGuard aGuard( CTLMutex::get() );
@@ -399,49 +399,49 @@ SvtCTLOptions::~SvtCTLOptions()
DELETEZ( pCTLOptions );
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLFontEnabled( sal_Bool _bEnabled )
+void SvtCTLOptions::SetCTLFontEnabled( bool _bEnabled )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLFontEnabled( _bEnabled );
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLFontEnabled() const
+bool SvtCTLOptions::IsCTLFontEnabled() const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLFontEnabled();
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLSequenceChecking( sal_Bool _bEnabled )
+void SvtCTLOptions::SetCTLSequenceChecking( bool _bEnabled )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLSequenceChecking(_bEnabled);
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLSequenceChecking() const
+bool SvtCTLOptions::IsCTLSequenceChecking() const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLSequenceChecking();
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLSequenceCheckingRestricted( sal_Bool _bEnable )
+void SvtCTLOptions::SetCTLSequenceCheckingRestricted( bool _bEnable )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLSequenceCheckingRestricted(_bEnable);
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const
+bool SvtCTLOptions::IsCTLSequenceCheckingRestricted( void ) const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLSequenceCheckingRestricted();
}
// -----------------------------------------------------------------------------
-void SvtCTLOptions::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnable )
+void SvtCTLOptions::SetCTLSequenceCheckingTypeAndReplace( bool _bEnable )
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
pCTLOptions->SetCTLSequenceCheckingTypeAndReplace(_bEnable);
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsCTLSequenceCheckingTypeAndReplace() const
+bool SvtCTLOptions::IsCTLSequenceCheckingTypeAndReplace() const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsCTLSequenceCheckingTypeAndReplace();
@@ -471,7 +471,7 @@ SvtCTLOptions::TextNumerals SvtCTLOptions::GetCTLTextNumerals() const
return pCTLOptions->GetCTLTextNumerals();
}
// -----------------------------------------------------------------------------
-sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const
+bool SvtCTLOptions::IsReadOnly(EOption eOption) const
{
DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
return pCTLOptions->IsReadOnly(eOption);
More information about the Libreoffice-commits
mailing list