[Libreoffice-commits] core.git: include/svx reportdesign/inc reportdesign/source sc/inc sc/source sd/inc sd/source svx/source sw/source
Noel Grandin
noel at peralex.com
Tue Feb 11 02:59:26 PST 2014
include/svx/svdmodel.hxx | 4 ++--
reportdesign/inc/RptModel.hxx | 2 +-
reportdesign/source/core/api/ReportDefinition.cxx | 2 +-
reportdesign/source/core/sdr/RptModel.cxx | 2 +-
sc/inc/drwlayer.hxx | 2 +-
sc/source/core/data/drwlayer.cxx | 2 +-
sd/inc/drawdoc.hxx | 6 +++---
sd/source/core/drawdoc.cxx | 4 ++--
sd/source/core/drawdoc2.cxx | 4 ++--
sd/source/core/drawdoc4.cxx | 2 +-
sd/source/ui/dlg/LayerTabBar.cxx | 2 +-
sd/source/ui/func/fucushow.cxx | 2 +-
sd/source/ui/func/fupage.cxx | 2 +-
sd/source/ui/func/fusldlg.cxx | 2 +-
sd/source/ui/func/futempl.cxx | 10 +++++-----
sd/source/ui/sidebar/DocumentHelper.cxx | 2 +-
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 2 +-
sd/source/ui/unoidl/unolayer.cxx | 2 +-
sd/source/ui/view/MediaObjectBar.cxx | 2 +-
sd/source/ui/view/Outliner.cxx | 2 +-
sd/source/ui/view/drviews2.cxx | 2 +-
sd/source/ui/view/drviewsb.cxx | 4 ++--
sd/source/ui/view/drviewsg.cxx | 2 +-
sd/source/ui/view/outlnvsh.cxx | 2 +-
sd/source/ui/view/sdview2.cxx | 2 +-
svx/source/dialog/_contdlg.cxx | 4 ++--
svx/source/dialog/contwnd.cxx | 4 ++--
svx/source/dialog/graphctl.cxx | 2 +-
svx/source/dialog/imapwnd.cxx | 12 ++++++------
svx/source/svdraw/svdedxv.cxx | 2 +-
svx/source/svdraw/svdmodel.cxx | 2 +-
svx/source/svdraw/svdoole2.cxx | 2 +-
sw/source/ui/shells/beziersh.cxx | 4 ++--
sw/source/ui/shells/drawdlg.cxx | 8 ++++----
sw/source/ui/shells/drawsh.cxx | 8 ++++----
sw/source/ui/shells/drwbassh.cxx | 4 ++--
sw/source/ui/shells/mediash.cxx | 4 ++--
sw/source/ui/shells/navsh.cxx | 4 ++--
38 files changed, 65 insertions(+), 65 deletions(-)
New commits:
commit 08c40a2474405b160aab96cabe115d8437d68f8a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 11 11:43:35 2014 +0200
sal_Bool->bool
Change-Id: I31fb9d5b49260fd1a8fc1312b01fd5632c97ab2e
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 8a3796a..a624e85 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -438,8 +438,8 @@ public:
// Modified-Flag. Wird automatisch gesetzt, wenn an den Pages oder
// Zeichenobjekten was geaendert wird. Zuruecksetzen muss man es
// jedoch selbst (z.B. bei Save() ...).
- sal_Bool IsChanged() const { return mbChanged; }
- virtual void SetChanged(sal_Bool bFlg = sal_True);
+ bool IsChanged() const { return mbChanged; }
+ virtual void SetChanged(bool bFlg = true);
// PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar
// auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 8c71619..66a229a 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -58,7 +58,7 @@ public:
OReportModel(::reportdesign::OReportDefinition* _pReportDefinition);
virtual ~OReportModel();
- virtual void SetChanged(sal_Bool bFlg = sal_True);
+ virtual void SetChanged(bool bFlg = true) SAL_OVERRIDE;
virtual SdrPage* AllocPage(bool bMasterPage);
virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
/** @returns the numbering type that is used to format page fields in drawing shapes */
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 6bb4ac4..b8ea4b6 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1934,7 +1934,7 @@ void SAL_CALL OReportDefinition::setModified( ::sal_Bool _bModified ) throw (bea
if ( m_pImpl->m_bModified != _bModified )
{
m_pImpl->m_bModified = _bModified;
- if ( m_pImpl->m_pReportModel->IsChanged() != _bModified )
+ if ( ( m_pImpl->m_pReportModel->IsChanged() ? 1 : 0 ) != _bModified )
m_pImpl->m_pReportModel->SetChanged(_bModified);
lang::EventObject aEvent(*this);
diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx
index 3505804..63ce08f 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -81,7 +81,7 @@ SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/)
//----------------------------------------------------------------------------
-void OReportModel::SetChanged( sal_Bool bChanged )
+void OReportModel::SetChanged( bool bChanged )
{
SdrModel::SetChanged( bChanged );
SetModified( bChanged );
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 750b8df..456fc88 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -101,7 +101,7 @@ public:
virtual SdrPage* AllocPage(bool bMasterPage);
virtual SdrModel* AllocModel() const;
- virtual void SetChanged( sal_Bool bFlg = sal_True );
+ virtual void SetChanged( bool bFlg = true ) SAL_OVERRIDE;
virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const;
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 5fb2b86..1ae0d4e 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -2056,7 +2056,7 @@ void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist)
pGlobalDrawPersist = pPersist;
}
-void ScDrawLayer::SetChanged( sal_Bool bFlg /* = sal_True */ )
+void ScDrawLayer::SetChanged( bool bFlg /* = true */ )
{
if ( bFlg && pDoc )
pDoc->SetChartListenerCollectionNeedsUpdate( true );
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 695cf6b..3921a95 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -220,8 +220,8 @@ public:
virtual SdrModel* AllocModel() const;
virtual SdrPage* AllocPage(bool bMasterPage);
- virtual bool IsReadOnly() const;
- virtual void SetChanged(sal_Bool bFlag = sal_True);
+ virtual bool IsReadOnly() const;
+ virtual void SetChanged(bool bFlag = true) SAL_OVERRIDE;
SfxItemPool& GetPool() { return( *pItemPool ); }
@@ -684,7 +684,7 @@ private:
DrawDocShell* mpDocShell;
SdDrawDocument* mpDoc;
sal_Bool mbIsEnableSetModified;
- sal_Bool mbIsDocumentChanged;
+ bool mbIsDocumentChanged;
};
}
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 04c49f3..f00fbaf 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -506,7 +506,7 @@ SdrPage* SdDrawDocument::AllocPage(bool bMasterPage)
}
// When the model has changed
-void SdDrawDocument::SetChanged(sal_Bool bFlag)
+void SdDrawDocument::SetChanged(bool bFlag)
{
if (mpDocSh)
{
@@ -676,7 +676,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
UpdateAllLinks();
- SetChanged( sal_False );
+ SetChanged( false );
}
/** updates all links, only links in this document should by resolved */
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 234b082..2051165 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -635,7 +635,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
mpWorkStartupTimer->SetTimeout(2000);
mpWorkStartupTimer->Start();
- SetChanged(sal_False);
+ SetChanged(false);
}
}
@@ -678,7 +678,7 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
bOK = sal_True;
StopWorkStartupDelay();
- SetChanged(sal_False);
+ SetChanged(false);
}
return(bOK);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 0d04d9e..4b8717a 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1347,7 +1347,7 @@ void ModifyGuard::init()
}
mbIsEnableSetModified = mpDocShell ? mpDocShell->IsEnableSetModified() : sal_False;
- mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : sal_False;
+ mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : false;
if( mbIsEnableSetModified )
mpDocShell->EnableSetModified( sal_False );
diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx
index 36c53ef..5877251 100644
--- a/sd/source/ui/dlg/LayerTabBar.cxx
+++ b/sd/source/ui/dlg/LayerTabBar.cxx
@@ -288,7 +288,7 @@ void LayerTabBar::EndRenaming()
// the View then already has to know the Layer
pView->SetActiveLayer(aNewName);
pLayer->SetName(aNewName);
- rDoc.SetChanged(sal_True);
+ rDoc.SetChanged(true);
}
}
}
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index ab408e2..ab1ccd4 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -65,7 +65,7 @@ void FuCustomShowDlg::DoExecute( SfxRequest& )
sal_uInt16 nRet = pDlg->Execute();
if( pDlg->IsModified() )
{
- mpDoc->SetChanged( sal_True );
+ mpDoc->SetChanged( true );
sd::PresentationSettings& rSettings = mpDoc->getPresentationSettings();
rSettings.mbCustomShow = pDlg->IsCustomShow();
}
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 762c47d..be5458a 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -453,7 +453,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
mpDoc->SetDefaultWritingMode( nVal == FRMDIR_HORI_RIGHT_TOP ? ::com::sun::star::text::WritingMode_RL_TB : ::com::sun::star::text::WritingMode_LR_TB );
}
- mpDoc->SetChanged(sal_True);
+ mpDoc->SetChanged(true);
// BackgroundFill of Masterpage: no hard attributes allowed
SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage();
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index b7fd1fc..64a028a 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -224,7 +224,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
// is something has changed, we set the modified flag
if ( bValuesChanged )
- mpDoc->SetChanged( sal_True );
+ mpDoc->SetChanged( true );
}
delete pDlg;
}
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index aec57f7..e282b7c 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -207,7 +207,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
{
pSSPool->Remove( pStyleSheet );
nRetMask = sal_True;
- mpDoc->SetChanged(sal_True);
+ mpDoc->SetChanged(true);
}
else
{
@@ -245,7 +245,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
(pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) )
{
mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet);
- mpDoc->SetChanged(sal_True);
+ mpDoc->SetChanged(true);
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
@@ -571,7 +571,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
}
- mpDoc->SetChanged(sal_True);
+ mpDoc->SetChanged(true);
}
break;
@@ -621,7 +621,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
}
( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
- mpDoc->SetChanged(sal_True);
+ mpDoc->SetChanged(true);
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
@@ -648,7 +648,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
mpView->SetStyleSheet( (SfxStyleSheet*) pStyleSheet);
( (SfxStyleSheet*) pStyleSheet )->Broadcast( SfxSimpleHint( SFX_HINT_DATACHANGED ) );
- mpDoc->SetChanged(sal_True);
+ mpDoc->SetChanged(true);
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index aa1bdbc..c4bd96c 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -150,7 +150,7 @@ SdPage* DocumentHelper::CopyMasterPageToLocalDocument (
// We are not interested in any automatisms for our modified internal
// document.
- rTargetDocument.SetChanged (sal_False);
+ rTargetDocument.SetChanged(false);
return pNewMasterPage;
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 23eb705..9961a19 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1035,7 +1035,7 @@ bool SlotManager::RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const OUStri
// aTabControl.SetPageText( nPageId, rName );
// set document to modified state
- pDocument->SetChanged( sal_True );
+ pDocument->SetChanged( true );
// inform navigator about change
SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
diff --git a/sd/source/ui/unoidl/unolayer.cxx b/sd/source/ui/unoidl/unolayer.cxx
index a4639ea..f0ef6b8 100644
--- a/sd/source/ui/unoidl/unolayer.cxx
+++ b/sd/source/ui/unoidl/unolayer.cxx
@@ -737,7 +737,7 @@ void SdLayerManager::UpdateLayerView( sal_Bool modify ) const throw()
}
if(modify)
- mpModel->mpDoc->SetChanged(sal_True);
+ mpModel->mpDoc->SetChanged(true);
}
}
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 4fed915..39eab04 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -148,7 +148,7 @@ void MediaObjectBar::Execute( SfxRequest& rReq )
//fdo #32598: after changing playback opts, set document's modified flag
SdDrawDocument& rDoc = mpView->GetDoc();
- rDoc.SetChanged(sal_True);
+ rDoc.SetChanged(true);
}
}
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 34e61d9..b400a2e 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -351,7 +351,7 @@ void Outliner::EndSpelling (void)
if(mpView && mpView->ISA(OutlineView))
static_cast<OutlineView*>(mpView)->PrepareClose(sal_False);
if(mpDrawDocument && !mpDrawDocument->IsChanged())
- mpDrawDocument->SetChanged(sal_True);
+ mpDrawDocument->SetChanged(true);
}
// Now clear the modify flag to have a specified state of
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index dcf2839..679471c 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1526,7 +1526,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
ResetActualLayer();
- GetDoc()->SetChanged(sal_True);
+ GetDoc()->SetChanged(true);
GetViewFrame()->GetDispatcher()->Execute(SID_SWITCHLAYER,
SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD);
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index efca498..d6dddd5 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -117,7 +117,7 @@ bool DrawViewShell::RenameSlide( sal_uInt16 nPageId, const OUString & rName )
maTabControl.SetPageText( nPageId, rName );
// set document to modified state
- GetDoc()->SetChanged( sal_True );
+ GetDoc()->SetChanged( true );
// inform navigator about change
SfxBoolItem aItem( SID_NAVIGATOR_INIT, true );
@@ -188,7 +188,7 @@ void DrawViewShell::ModifyLayer (
mpDrawView->SetLayerLocked( rLayerName, bIsLocked);
mpDrawView->SetLayerPrintable(rLayerName, bIsPrintable);
- GetDoc()->SetChanged(sal_True);
+ GetDoc()->SetChanged(true);
GetLayerTabControl()->SetPageText(nCurPage, rLayerName);
diff --git a/sd/source/ui/view/drviewsg.cxx b/sd/source/ui/view/drviewsg.cxx
index 5b3e401..bb83db6 100644
--- a/sd/source/ui/view/drviewsg.cxx
+++ b/sd/source/ui/view/drviewsg.cxx
@@ -68,7 +68,7 @@ void DrawViewShell::ExecIMap( SfxRequest& rReq )
else
pIMapInfo->SetImageMap( rImageMap );
- GetDoc()->SetChanged( sal_True );
+ GetDoc()->SetChanged( true );
}
}
}
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index cfdbfc7..654a74c 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -959,7 +959,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet )
if (pOlView->GetOutliner()->IsModified())
{
- GetDoc()->SetChanged(sal_True);
+ GetDoc()->SetChanged(true);
}
// the status has to be set here because of overloading
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index d7317f4..3e8d460 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -337,7 +337,7 @@ void View::DoPaste (::Window* pWindow)
if( !mrDoc.IsChanged() )
{
if( pOutliner && pOutliner->IsModified() )
- mrDoc.SetChanged( sal_True );
+ mrDoc.SetChanged( true );
}
}
}
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 39e21e2..34d3042 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -361,7 +361,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
}
aContourWnd.SetPolyPolygon( aPolyPoly );
- aContourWnd.GetSdrModel()->SetChanged( sal_True );
+ aContourWnd.GetSdrModel()->SetChanged( true );
}
PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
@@ -607,7 +607,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
aUpdatePolyPoly = PolyPolygon();
bUpdateGraphicLinked = sal_False;
- aContourWnd.GetSdrModel()->SetChanged( sal_False );
+ aContourWnd.GetSdrModel()->SetChanged( false );
}
GetBindings().Invalidate( SID_CONTOUR_EXEC );
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index a6f0600..e562116 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -88,7 +88,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
pView->CombineMarkedObjects( sal_False );
}
- pModel->SetChanged( sal_False );
+ pModel->SetChanged( false );
}
const PolyPolygon& ContourWindow::GetPolyPolygon()
@@ -108,7 +108,7 @@ const PolyPolygon& ContourWindow::GetPolyPolygon()
aPolyPoly = PolyPolygon(aB2DPolyPolygon);
}
- pModel->SetChanged( sal_False );
+ pModel->SetChanged( false );
}
return aPolyPoly;
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 2a5aa5f..81b4d6e 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -157,7 +157,7 @@ void GraphCtrl::InitSdrModel()
pPage->SetSize( aGraphSize );
pPage->SetBorder( 0, 0, 0, 0 );
pModel->InsertPage( pPage );
- pModel->SetChanged( sal_False );
+ pModel->SetChanged( false );
// Creating a View
pView = new GraphCtrlView( pModel, this );
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 61fc258..bf6b89a 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -127,7 +127,7 @@ sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
pIMapObj->SetURL( rNewInfo.aMarkURL );
pIMapObj->SetAltText( rNewInfo.aMarkAltText );
pIMapObj->SetTarget( rNewInfo.aMarkTarget );
- pModel->SetChanged( sal_True );
+ pModel->SetChanged( true );
UpdateInfo( sal_False );
bRet = sal_True;
@@ -152,7 +152,7 @@ const ImageMap& IMapWindow::GetImageMap()
aIMap.InsertIMapObject( *( ( (IMapUserData*) pPage->GetObj( i )->GetUserData( 0 ) )->GetObject() ) );
}
- pModel->SetChanged( sal_False );
+ pModel->SetChanged( false );
}
return aIMap;
@@ -167,7 +167,7 @@ void IMapWindow::SetTargetList( TargetList& rTargetList )
for( size_t i = 0, n = rTargetList.size(); i < n; ++i )
aTargetList.push_back( rTargetList[ i ] );
- pModel->SetChanged( sal_False );
+ pModel->SetChanged( false );
}
SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
@@ -527,7 +527,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
pIMapObj->SetURL( aBookMark.GetURL() );
pIMapObj->SetAltText( aBookMark.GetDescription() );
- pModel->SetChanged( sal_True );
+ pModel->SetChanged( true );
pView->UnmarkAll();
pView->MarkObj( pSdrObj, pView->GetSdrPageView() );
UpdateInfo( sal_True );
@@ -649,7 +649,7 @@ void IMapWindow::DoMacroAssign()
{
const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
- pModel->SetChanged( sal_True );
+ pModel->SetChanged( true );
UpdateInfo( sal_False );
}
@@ -687,7 +687,7 @@ void IMapWindow::DoPropertyDialog()
pIMapObj->SetDesc( aDlg->GetDesc() );
pIMapObj->SetTarget( aDlg->GetTarget() );
pIMapObj->SetName( aDlg->GetName() );
- pModel->SetChanged( sal_True );
+ pModel->SetChanged( true );
UpdateInfo( sal_True );
}
delete aDlg;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 215d972..a869db6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -1202,7 +1202,7 @@ sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
if( pMod )
{
if( pTextEditOutliner && pTextEditOutliner->IsModified() )
- pMod->SetChanged( sal_True );
+ pMod->SetChanged( true );
}
if (pWin!=NULL && pWin!=pTextEditWin) SetTextEditWin(pWin);
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index a42559a..b0182ad 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1387,7 +1387,7 @@ void SdrModel::TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPerc
rStr += "%";
}
-void SdrModel::SetChanged(sal_Bool bFlg)
+void SdrModel::SetChanged(bool bFlg)
{
mbChanged = bFlg;
}
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a9a9a55..854057c 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -2046,7 +2046,7 @@ void SdrOle2Obj::GetObjRef_Impl()
// set the modified state of the model.
if(!bWasChanged && pModel && pModel->IsChanged())
{
- pModel->SetChanged( sal_False );
+ pModel->SetChanged( false );
}
}
diff --git a/sw/source/ui/shells/beziersh.cxx b/sw/source/ui/shells/beziersh.cxx
index 7b3751d..486a159 100644
--- a/sw/source/ui/shells/beziersh.cxx
+++ b/sw/source/ui/shells/beziersh.cxx
@@ -71,7 +71,7 @@ void SwBezierShell::Execute(SfxRequest &rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
sal_uInt16 nSlotId = rReq.GetSlot();
sal_Bool bChanged = pSdrView->GetModel()->IsChanged();
- pSdrView->GetModel()->SetChanged(sal_False);
+ pSdrView->GetModel()->SetChanged(false);
const SfxPoolItem* pItem;
if(pArgs)
pArgs->GetItemState(nSlotId, sal_False, &pItem);
@@ -216,7 +216,7 @@ void SwBezierShell::Execute(SfxRequest &rReq)
if (pSdrView->GetModel()->IsChanged())
GetShell().SetModified();
else if (bChanged)
- pSdrView->GetModel()->SetChanged(sal_True);
+ pSdrView->GetModel()->SetChanged(true);
}
void SwBezierShell::GetState(SfxItemSet &rSet)
diff --git a/sw/source/ui/shells/drawdlg.cxx b/sw/source/ui/shells/drawdlg.cxx
index 8373278..9553699 100644
--- a/sw/source/ui/shells/drawdlg.cxx
+++ b/sw/source/ui/shells/drawdlg.cxx
@@ -40,7 +40,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
SdrView* pView = pSh->GetDrawView();
SdrModel* pDoc = pView->GetModel();
sal_Bool bChanged = pDoc->IsChanged();
- pDoc->SetChanged(sal_False);
+ pDoc->SetChanged(false);
SfxItemSet aNewAttr( pDoc->GetItemPool() );
pView->GetAttributes( aNewAttr );
@@ -165,7 +165,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
GetShell().SetModified();
else
if (bChanged)
- pDoc->SetChanged(sal_True);
+ pDoc->SetChanged(true);
}
void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
@@ -174,7 +174,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
SdrView* pView = pSh->GetDrawView();
const SfxItemSet* pArgs = rReq.GetArgs();
sal_Bool bChanged = pView->GetModel()->IsChanged();
- pView->GetModel()->SetChanged(sal_False);
+ pView->GetModel()->SetChanged(false);
GetView().NoRotate();
@@ -214,7 +214,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest& rReq)
GetShell().SetModified();
else
if (bChanged)
- pView->GetModel()->SetChanged(sal_True);
+ pView->GetModel()->SetChanged(true);
}
void SwDrawShell::GetDrawAttrState(SfxItemSet& rSet)
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 84f394a..df9bb3f 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -198,7 +198,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
sal_uInt16 nSlotId = rReq.GetSlot();
sal_Bool bChanged = pSdrView->GetModel()->IsChanged();
- pSdrView->GetModel()->SetChanged(sal_False);
+ pSdrView->GetModel()->SetChanged(false);
const SfxPoolItem* pItem;
if(pArgs)
@@ -401,7 +401,7 @@ void SwDrawShell::Execute(SfxRequest &rReq)
if (pSdrView->GetModel()->IsChanged())
rSh.SetModified();
else if (bChanged)
- pSdrView->GetModel()->SetChanged(sal_True);
+ pSdrView->GetModel()->SetChanged(true);
}
void SwDrawShell::GetState(SfxItemSet& rSet)
@@ -522,7 +522,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
SwWrtShell &rSh = GetShell();
SdrView* pDrView = rSh.GetDrawView();
sal_Bool bChanged = pDrView->GetModel()->IsChanged();
- pDrView->GetModel()->SetChanged(sal_False);
+ pDrView->GetModel()->SetChanged(false);
const SdrMarkList& rMarkList = pDrView->GetMarkedObjectList();
@@ -542,7 +542,7 @@ void SwDrawShell::ExecFormText(SfxRequest& rReq)
rSh.SetModified();
else
if (bChanged)
- pDrView->GetModel()->SetChanged(sal_True);
+ pDrView->GetModel()->SetChanged(true);
}
//Return status values for FontWork
diff --git a/sw/source/ui/shells/drwbassh.cxx b/sw/source/ui/shells/drwbassh.cxx
index e92e5f0..bff73cf 100644
--- a/sw/source/ui/shells/drwbassh.cxx
+++ b/sw/source/ui/shells/drwbassh.cxx
@@ -102,7 +102,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
sal_uInt16 nSlotId = rReq.GetSlot();
sal_Bool bChanged = pSdrView->GetModel()->IsChanged();
- pSdrView->GetModel()->SetChanged(sal_False);
+ pSdrView->GetModel()->SetChanged(false);
const SfxPoolItem* pItem = 0;
if(pArgs)
pArgs->GetItemState(nSlotId, sal_False, &pItem);
@@ -599,7 +599,7 @@ void SwDrawBaseShell::Execute(SfxRequest &rReq)
if (pSdrView->GetModel()->IsChanged())
pSh->SetModified();
else if (bChanged)
- pSdrView->GetModel()->SetChanged(sal_True);
+ pSdrView->GetModel()->SetChanged(true);
// 40220: After Delete from DrawObjecs over the API GPF through self-destruction
if(bNotify)
GetView().AttrChangedNotify(pSh); // Shell switch if applicable...
diff --git a/sw/source/ui/shells/mediash.cxx b/sw/source/ui/shells/mediash.cxx
index 3bb0c31..9666079 100644
--- a/sw/source/ui/shells/mediash.cxx
+++ b/sw/source/ui/shells/mediash.cxx
@@ -85,7 +85,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
sal_uInt16 nSlotId = rReq.GetSlot();
sal_Bool bChanged = pSdrView->GetModel()->IsChanged();
- pSdrView->GetModel()->SetChanged( sal_False );
+ pSdrView->GetModel()->SetChanged( false );
switch( nSlotId )
{
@@ -141,7 +141,7 @@ void SwMediaShell::ExecMedia(SfxRequest &rReq)
if( pSdrView->GetModel()->IsChanged() )
GetShell().SetModified();
else if( bChanged )
- pSdrView->GetModel()->SetChanged(sal_True);
+ pSdrView->GetModel()->SetChanged(true);
}
}
diff --git a/sw/source/ui/shells/navsh.cxx b/sw/source/ui/shells/navsh.cxx
index 5d9ea9a..f821f4c 100644
--- a/sw/source/ui/shells/navsh.cxx
+++ b/sw/source/ui/shells/navsh.cxx
@@ -49,7 +49,7 @@ void SwNavigationShell::Execute(SfxRequest &rReq)
const SfxItemSet *pArgs = rReq.GetArgs();
sal_uInt16 nSlotId = rReq.GetSlot();
sal_Bool bChanged = pSdrView->GetModel()->IsChanged();
- pSdrView->GetModel()->SetChanged(sal_False);
+ pSdrView->GetModel()->SetChanged(false);
SwNavigationMgr& aSwNavigationMgr = pSh->GetNavigationMgr();
const SfxPoolItem* pItem;
if(pArgs)
@@ -69,7 +69,7 @@ void SwNavigationShell::Execute(SfxRequest &rReq)
if (pSdrView->GetModel()->IsChanged())
GetShell().SetModified();
else if (bChanged)
- pSdrView->GetModel()->SetChanged(sal_True);
+ pSdrView->GetModel()->SetChanged(true);
}
// determine if the buttons should be enabled/disabled
More information about the Libreoffice-commits
mailing list