Kaydet (Commit) 9a883d6d authored tarafından Noel Grandin's avatar Noel Grandin

sal_Bool->bool

Change-Id: I999a8f72d184f611b6abee8aa64590ccd3cd41c4
üst 28e8649a
...@@ -41,7 +41,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) ...@@ -41,7 +41,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
nFieldSepCode = 0; nFieldSepCode = 0;
nTextSepCode = 0; nTextSepCode = 0;
eCharSet = RTL_TEXTENCODING_DONTKNOW; eCharSet = RTL_TEXTENCODING_DONTKNOW;
bSaveAsShown = sal_True; // "true" if not in string (after CSV import) bSaveAsShown = true; // "true" if not in string (after CSV import)
bQuoteAllText = false; bQuoteAllText = false;
bSaveFormulas = false; bSaveFormulas = false;
sal_Int32 nTokenCount = comphelper::string::getTokenCount(rStr, ','); sal_Int32 nTokenCount = comphelper::string::getTokenCount(rStr, ',');
...@@ -50,7 +50,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) ...@@ -50,7 +50,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
// first 3 tokens: common // first 3 tokens: common
OUString aToken( rStr.getToken( 0, ',' ) ); OUString aToken( rStr.getToken( 0, ',' ) );
if( aToken.equalsIgnoreAsciiCase( pStrFix ) ) if( aToken.equalsIgnoreAsciiCase( pStrFix ) )
bFixedWidth = sal_True; bFixedWidth = true;
else else
nFieldSepCode = ScAsciiOptions::GetWeightedFieldSep( aToken, true); nFieldSepCode = ScAsciiOptions::GetWeightedFieldSep( aToken, true);
nTextSepCode = (sal_Unicode) rStr.getToken(1,',').toInt32(); nTextSepCode = (sal_Unicode) rStr.getToken(1,',').toInt32();
...@@ -61,7 +61,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) ...@@ -61,7 +61,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr )
{ {
// compatibility with old options string: "Save as shown" as 4th token, numeric // compatibility with old options string: "Save as shown" as 4th token, numeric
bSaveAsShown = (rStr.getToken( 3, ',' ).toInt32() ? sal_True : false); bSaveAsShown = (rStr.getToken( 3, ',' ).toInt32() ? sal_True : false);
bQuoteAllText = sal_True; // use old default then bQuoteAllText = true; // use old default then
} }
else else
{ {
......
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
return *this; return *this;
} }
sal_Bool operator==( const ScImportOptions& rCmp ) bool operator==( const ScImportOptions& rCmp )
{ {
return return
nFieldSepCode == rCmp.nFieldSepCode nFieldSepCode == rCmp.nFieldSepCode
...@@ -95,10 +95,10 @@ public: ...@@ -95,10 +95,10 @@ public:
sal_Unicode nTextSepCode; sal_Unicode nTextSepCode;
OUString aStrFont; OUString aStrFont;
rtl_TextEncoding eCharSet; rtl_TextEncoding eCharSet;
sal_Bool bFixedWidth; bool bFixedWidth;
sal_Bool bSaveAsShown; bool bSaveAsShown;
sal_Bool bQuoteAllText; bool bQuoteAllText;
sal_Bool bSaveFormulas; bool bSaveFormulas;
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment