diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-02-25 10:56:06 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-02-25 10:56:51 +0900 |
commit | 359b0ebc911b3bba30d0bb715a49ba335c413d28 (patch) | |
tree | 4d4179daa7df69591453b89cb899e8470730dded /sw | |
parent | 227be92635a6c1a1cc46b2b547eccd5a1a8cd583 (diff) |
sal_Bool to bool
Change-Id: Iee9b03c8c5e8c226710822108b3503b0ee4f9717
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/ui/chrdlg/drpcps.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/optload.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/cption.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/shdwcrsr.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/uitool.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/unotools.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/utlui/numfmtlb.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/utlui/shdwcrsr.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/utlui/uitool.cxx | 12 | ||||
-rw-r--r-- | sw/source/ui/utlui/unotools.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbabookmark.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbabookmark.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafield.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafind.cxx | 18 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafind.hxx | 6 |
16 files changed, 37 insertions, 37 deletions
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 3ef4051018c7..1b2cc0c58da6 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -622,7 +622,7 @@ void SwDropCapsPage::Reset(const SfxItemSet &rSet) aDistanceField.SetValue(0); } - ::FillCharStyleListBox(aTemplateBox, rSh.GetView().GetDocShell(), sal_True); + ::FillCharStyleListBox(aTemplateBox, rSh.GetView().GetDocShell(), true); aTemplateBox.InsertEntry(SW_RESSTR(SW_STR_NONE), 0); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index e8910d39867e..aa04658203e3 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -462,7 +462,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) } } - ::FillCharStyleListBox( aCharStyleLB, pSh->GetView().GetDocShell(), sal_True, sal_True ); + ::FillCharStyleListBox( aCharStyleLB, pSh->GetView().GetDocShell(), true, true ); } diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx index af90e5552d4c..ab1e5d8f30cb 100644 --- a/sw/source/ui/frmdlg/cption.cxx +++ b/sw/source/ui/frmdlg/cption.cxx @@ -448,7 +448,7 @@ SwSequenceOptionDialog::SwSequenceOptionDialog( Window *pParent, SwView &rV, m_pEdDelim->SetText(sDelim); m_pLbCharStyle->InsertEntry(sNone); - ::FillCharStyleListBox( *m_pLbCharStyle, rView.GetDocShell(), sal_True, sal_True ); + ::FillCharStyleListBox( *m_pLbCharStyle, rView.GetDocShell(), true, true ); m_pLbCharStyle->SelectEntryPos( 0 ); } diff --git a/sw/source/ui/inc/shdwcrsr.hxx b/sw/source/ui/inc/shdwcrsr.hxx index ef2de90e7457..b13e801fc46d 100644 --- a/sw/source/ui/inc/shdwcrsr.hxx +++ b/sw/source/ui/inc/shdwcrsr.hxx @@ -34,7 +34,7 @@ class SwShadowCursor long nOldHeight; sal_uInt16 nOldMode; - void DrawTri( const Point& rPt, long nHeight, sal_Bool bLeft ); + void DrawTri( const Point& rPt, long nHeight, bool bLeft ); void DrawCrsr( const Point& rPt, long nHeight, sal_uInt16 nMode ); public: diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx index c3a95f8a3b81..6373801954cc 100644 --- a/sw/source/ui/inc/uitool.hxx +++ b/sw/source/ui/inc/uitool.hxx @@ -68,7 +68,7 @@ SW_DLLPUBLIC sal_Bool HasCharUnit( sal_Bool bWeb ); void SetApplyCharUnit(sal_Bool bApplyChar, sal_Bool bWeb); // ListBox mit allen Zeichenvorlagen fuellen - ausser Standard! -SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, sal_Bool bSorted = sal_False, sal_Bool bWithDefault = sal_False); +SW_DLLPUBLIC void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted = false, bool bWithDefault = false); //inserts a string sorted into a ListBox, SW_DLLPUBLIC sal_uInt16 InsertStringSorted(const String& rEntry, ListBox& rToFill, sal_uInt16 nOffset); diff --git a/sw/source/ui/inc/unotools.hxx b/sw/source/ui/inc/unotools.hxx index 658a77eb3f21..33a8cbab8a1f 100644 --- a/sw/source/ui/inc/unotools.hxx +++ b/sw/source/ui/inc/unotools.hxx @@ -87,7 +87,7 @@ class SW_DLLPUBLIC SwOneExampleFrame sal_Bool bIsInitialized; sal_Bool bServiceAvailable; - static sal_Bool bShowServiceNotAvailableMessage; + static bool bShowServiceNotAvailableMessage; SW_DLLPRIVATE DECL_LINK( TimeoutHdl, Timer* ); SW_DLLPRIVATE DECL_LINK( PopupHdl, Menu* ); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 83d9e358aa8e..9546729c6add 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -2764,7 +2764,7 @@ IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, CheckBox*, pBox) void SwTOXEntryTabPage::SetWrtShell(SwWrtShell& rSh) { SwDocShell* pDocSh = rSh.GetView().GetDocShell(); - ::FillCharStyleListBox(aCharStyleLB, pDocSh, sal_True, sal_True); + ::FillCharStyleListBox(aCharStyleLB, pDocSh, true, true); const String sDefault(SW_RES(STR_POOLCOLL_STANDARD)); for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++) { diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx index f7549dc5e633..ced66d4a1731 100644 --- a/sw/source/ui/utlui/numfmtlb.cxx +++ b/sw/source/ui/utlui/numfmtlb.cxx @@ -323,9 +323,9 @@ void NumFormatListBox::SetDefFormat(const sal_uLong nDefFmt) sal_uLong nSysNumFmt = pFormatter->GetFormatIndex( NF_NUMBER_SYSTEM, eCurLanguage); sal_uLong nSysShortDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_SHORT, eCurLanguage); sal_uLong nSysLongDateFmt = pFormatter->GetFormatIndex( NF_DATE_SYSTEM_LONG, eCurLanguage); - sal_Bool bSysLang = sal_False; + bool bSysLang = false; if( eCurLanguage == GetAppLanguage() ) - bSysLang = sal_True; + bSysLang = true; sal_uLong nNumFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysNumFmt, LANGUAGE_SYSTEM ); sal_uLong nShortDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysShortDateFmt, LANGUAGE_SYSTEM ); sal_uLong nLongDateFormatForLanguage = pFormatter->GetFormatForLanguageIfBuiltIn(nSysLongDateFmt, LANGUAGE_SYSTEM ); diff --git a/sw/source/ui/utlui/shdwcrsr.cxx b/sw/source/ui/utlui/shdwcrsr.cxx index 33dd53874f1c..e0f1facbfe4c 100644 --- a/sw/source/ui/utlui/shdwcrsr.cxx +++ b/sw/source/ui/utlui/shdwcrsr.cxx @@ -48,7 +48,7 @@ void SwShadowCursor::SetPos( const Point& rPt, long nHeight, sal_uInt16 nMode ) } } -void SwShadowCursor::DrawTri( const Point& rPt, long nHeight, sal_Bool bLeft ) +void SwShadowCursor::DrawTri( const Point& rPt, long nHeight, bool bLeft ) { long nLineDiff = ( nHeight / 2 ); long nLineDiffHalf = nLineDiff / 2; @@ -84,9 +84,9 @@ void SwShadowCursor::DrawCrsr( const Point& rPt, long nHeight, sal_uInt16 nMode // 2. das Dreieck if( text::HoriOrientation::LEFT == nMode || text::HoriOrientation::CENTER == nMode ) // Pfeil nach rechts - DrawTri( rPt, nHeight, sal_False ); + DrawTri( rPt, nHeight, false ); if( text::HoriOrientation::RIGHT == nMode || text::HoriOrientation::CENTER == nMode ) // Pfeil nach links - DrawTri( rPt, nHeight, sal_True ); + DrawTri( rPt, nHeight, true ); pWin->Pop(); } diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 2c4087ee0273..4b029f2b0348 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -542,12 +542,12 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) const SfxPoolItem* pItem; SwFmtPageDesc aPgDesc; - sal_Bool bChanged = sal_False; + bool bChanged = false; // Seitennummer if(SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_PARA_PAGENUM, sal_False, &pItem)) { aPgDesc.SetNumOffset(((SfxUInt16Item*)pItem)->GetValue()); - bChanged = sal_True; + bChanged = true; } if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_PARA_MODEL, sal_False, &pItem )) { @@ -562,7 +562,7 @@ void SfxToSwPageDescAttr( const SwWrtShell& rShell, SfxItemSet& rSet ) aPgDesc.RegisterToPageDesc( *pDesc ); } rSet.ClearItem( SID_ATTR_PARA_MODEL ); - bChanged = sal_True; + bChanged = true; } else { @@ -589,7 +589,7 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet ) const SfxPoolItem* pItem = 0; String aName; sal_uInt16 nPageNum = 0; - sal_Bool bPut = sal_True; + bool bPut = true; switch( rCoreSet.GetItemState( RES_PAGEDESC, sal_True, &pItem ) ) { case SFX_ITEM_SET: @@ -608,7 +608,7 @@ void SwToSfxPageDescAttr( SfxItemSet& rCoreSet ) break; default: - bPut = sal_False; + bPut = false; } SfxUInt16Item aPageNum( SID_ATTR_PARA_PAGENUM, nPageNum ); rCoreSet.Put( aPageNum ); @@ -649,7 +649,7 @@ sal_uInt16 InsertStringSorted(const String& rEntry, ListBox& rToFill, sal_uInt16 } return rToFill.InsertEntry(rEntry, i); } -void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, sal_Bool bSorted, sal_Bool bWithDefault) +void FillCharStyleListBox(ListBox& rToFill, SwDocShell* pDocSh, bool bSorted, bool bWithDefault) { sal_Bool bHasOffset = rToFill.GetEntryCount() > 0; SfxStyleSheetBasePool* pPool = pDocSh->GetStyleSheetPool(); diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index 69f1331f0763..2d426e9fe472 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -59,7 +59,7 @@ using ::rtl::OUString; const sal_Char cFrameControl[] = "com.sun.star.frame.FrameControl"; const sal_Char cFactory[] = "private:factory/swriter"; -sal_Bool SwOneExampleFrame::bShowServiceNotAvailableMessage = sal_True; +bool SwOneExampleFrame::bShowServiceNotAvailableMessage = true; SwOneExampleFrame::SwOneExampleFrame( Window& rWin, sal_uInt32 nFlags, @@ -96,7 +96,7 @@ void SwOneExampleFrame::CreateErrorMessage(Window* pParent) String sInfo(SW_RES(STR_SERVICE_UNAVAILABLE)); sInfo += rtl::OUString(cFrameControl); InfoBox(pParent, sInfo).Execute(); - SwOneExampleFrame::bShowServiceNotAvailableMessage = sal_False; + SwOneExampleFrame::bShowServiceNotAvailableMessage = false; } } diff --git a/sw/source/ui/vba/vbabookmark.cxx b/sw/source/ui/vba/vbabookmark.cxx index 4e9b5aa9b07d..776f583c9edd 100644 --- a/sw/source/ui/vba/vbabookmark.cxx +++ b/sw/source/ui/vba/vbabookmark.cxx @@ -33,7 +33,7 @@ using namespace ::com::sun::star; SwVbaBookmark::SwVbaBookmark( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const css::uno::Reference< frame::XModel >& rModel, const rtl::OUString& rName ) throw ( css::uno::RuntimeException ) : - SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( sal_True ) + SwVbaBookmark_BASE( rParent, rContext ), mxModel( rModel ), maName( rName ), mbValid( true ) { uno::Reference< text::XBookmarksSupplier > xBookmarksSupplier( mxModel, uno::UNO_QUERY_THROW ); mxBookmark.set( xBookmarksSupplier->getBookmarks()->getByName( maName ), uno::UNO_QUERY_THROW ); @@ -54,7 +54,7 @@ void SAL_CALL SwVbaBookmark::Delete() throw ( uno::RuntimeException ) checkVality(); uno::Reference< text::XTextDocument > xTextDocument( mxModel, uno::UNO_QUERY_THROW ); xTextDocument->getText()->removeTextContent( mxBookmark ); - mbValid = sal_False; + mbValid = false; } void SAL_CALL SwVbaBookmark::Select() throw ( uno::RuntimeException ) diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index b416e6c0c0e2..7343a541096f 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -33,7 +33,7 @@ private: css::uno::Reference< css::frame::XModel > mxModel; css::uno::Reference< css::text::XTextContent > mxBookmark; rtl::OUString maName; - sal_Bool mbValid; + bool mbValid; private: void checkVality() throw ( css::uno::RuntimeException ); diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx index 7173fc8ab7fd..f462360033b0 100644 --- a/sw/source/ui/vba/vbafield.cxx +++ b/sw/source/ui/vba/vbafield.cxx @@ -450,7 +450,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const throw uno::RuntimeException(); } - sal_Bool bCustom = sal_True; + bool bCustom = true; rtl::OUString sFieldService; // find the build in document properties for( const DocPropertyTable* pTable = aDocPropertyTables; pTable->sDocPropertyName != NULL; pTable++ ) @@ -459,7 +459,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const { if( pTable->sFieldService != NULL ) sFieldService = rtl::OUString::createFromAscii(pTable->sFieldService); - bCustom = sal_False; + bCustom = false; break; } } diff --git a/sw/source/ui/vba/vbafind.cxx b/sw/source/ui/vba/vbafind.cxx index a4cfc4ea4e17..f4b34f02f668 100644 --- a/sw/source/ui/vba/vbafind.cxx +++ b/sw/source/ui/vba/vbafind.cxx @@ -29,7 +29,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; SwVbaFind::SwVbaFind( const uno::Reference< ooo::vba::XHelperInterface >& rParent, const uno::Reference< uno::XComponentContext >& rContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< text::XTextRange >& xTextRange ) throw ( uno::RuntimeException ) : - SwVbaFind_BASE( rParent, rContext ), mxModel( xModel ), mxTextRange( xTextRange ), mbReplace( sal_False ), mnReplaceType( word::WdReplace::wdReplaceOne ), mnWrap( word::WdFindWrap::wdFindStop ) + SwVbaFind_BASE( rParent, rContext ), mxModel( xModel ), mxTextRange( xTextRange ), mbReplace( false ), mnReplaceType( word::WdReplace::wdReplaceOne ), mnWrap( word::WdFindWrap::wdFindStop ) { mxReplaceable.set( mxModel, uno::UNO_QUERY_THROW ); mxPropertyReplace.set( mxReplaceable->createReplaceDescriptor(), uno::UNO_QUERY_THROW ); @@ -41,26 +41,26 @@ SwVbaFind::~SwVbaFind() { } -sal_Bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException ) +bool SwVbaFind::InRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException ) { uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW ); if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) >= 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) <= 0 ) - return sal_True; - return sal_False; + return true; + return false; } -sal_Bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException ) +bool SwVbaFind::InEqualRange( const uno::Reference< text::XTextRange >& xCurrentRange ) throw ( uno::RuntimeException ) { uno::Reference< text::XTextRangeCompare > xTRC( mxTextRange->getText(), uno::UNO_QUERY_THROW ); if( xTRC->compareRegionStarts( mxTextRange, xCurrentRange ) == 0 && xTRC->compareRegionEnds( mxTextRange, xCurrentRange ) == 0 ) - return sal_True; - return sal_False; + return true; + return false; } void SwVbaFind::SetReplaceWith( const rtl::OUString& rText ) throw (uno::RuntimeException) { mxPropertyReplace->setReplaceString( rText ); - mbReplace = sal_True; + mbReplace = true; } rtl::OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException) @@ -70,7 +70,7 @@ rtl::OUString SwVbaFind::GetReplaceWith() throw (uno::RuntimeException) void SwVbaFind::SetReplace( sal_Int32 type ) { mnReplaceType = type; - mbReplace = sal_True; + mbReplace = true; } uno::Reference< text::XTextRange > SwVbaFind::FindOneElement() throw ( uno::RuntimeException ) { diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index 4ae7561cc2d5..219260269e4d 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -40,13 +40,13 @@ private: css::uno::Reference< css::util::XPropertyReplace> mxPropertyReplace; css::uno::Reference< css::text::XTextViewCursor> mxTVC; css::uno::Reference< css::view::XSelectionSupplier> mxSelSupp; - sal_Bool mbReplace; + bool mbReplace; sal_Int32 mnReplaceType; sal_Int32 mnWrap; private: - sal_Bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); - sal_Bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); + bool InRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); + bool InEqualRange( const css::uno::Reference< css::text::XTextRange >& xCurrentRange ) throw ( css::uno::RuntimeException ); void SetReplace( sal_Int32 type ); void SetReplaceWith( const rtl::OUString& rText ) throw ( css::uno::RuntimeException ); rtl::OUString GetReplaceWith() throw ( css::uno::RuntimeException ); |