summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-16 14:25:53 +0200
committerNoel Grandin <noel@peralex.com>2015-04-22 10:28:39 +0200
commit8b98bc855d7436828553948a1d28d686848e139c (patch)
treed66dcf3d316e2694421d90f2694ba8de553811c3 /sw
parenta4d460c5f38e4262a657e4919d093bcc722a7763 (diff)
convert SFX_STYLESHEET_ constants to scoped enum
Change-Id: Iceba35cb058afa55374cf3cac70ed2207b7bc8b4
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/doc/docdesc.cxx4
-rw-r--r--sw/source/core/doc/docfmt.cxx16
-rw-r--r--sw/source/core/doc/docnum.cxx6
-rw-r--r--sw/source/core/unocore/unostyle.cxx4
-rw-r--r--sw/source/uibase/app/docst.cxx4
-rw-r--r--sw/source/uibase/app/docstyle.cxx14
6 files changed, 24 insertions, 24 deletions
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 3ef0eaee0940..17f27487831f 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -622,7 +622,7 @@ void SwDoc::DelPageDesc( sal_uInt16 i, bool bBroadcast )
if (bBroadcast)
BroadcastStyleOperation(rDel.GetName(), SFX_STYLE_FAMILY_PAGE,
- SFX_STYLESHEET_ERASED);
+ SfxStyleSheetHintId::ERASED);
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -670,7 +670,7 @@ SwPageDesc* SwDoc::MakePageDesc(const OUString &rName, const SwPageDesc *pCpy,
if (bBroadcast)
BroadcastStyleOperation(rName, SFX_STYLE_FAMILY_PAGE,
- SFX_STYLESHEET_CREATED);
+ SfxStyleSheetHintId::CREATED);
if (GetIDocumentUndoRedo().DoesUndo())
{
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index a253811a3655..08bb0562127e 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -673,7 +673,7 @@ void SwDoc::DelCharFmt(sal_uInt16 nFmt, bool bBroadcast)
if (bBroadcast)
BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_CHAR,
- SFX_STYLESHEET_ERASED);
+ SfxStyleSheetHintId::ERASED);
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -714,7 +714,7 @@ void SwDoc::DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast )
if (bBroadcast)
BroadcastStyleOperation(pFmt->GetName(),
SFX_STYLE_FAMILY_FRAME,
- SFX_STYLESHEET_ERASED);
+ SfxStyleSheetHintId::ERASED);
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -828,7 +828,7 @@ SwFrmFmt *SwDoc::MakeFrmFmt(const OUString &rFmtName,
if (bBroadcast)
{
BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_FRAME,
- SFX_STYLESHEET_CREATED);
+ SfxStyleSheetHintId::CREATED);
}
return pFmt;
@@ -864,7 +864,7 @@ SwCharFmt *SwDoc::MakeCharFmt( const OUString &rFmtName,
if (bBroadcast)
{
BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_CHAR,
- SFX_STYLESHEET_CREATED);
+ SfxStyleSheetHintId::CREATED);
}
return pFmt;
@@ -900,7 +900,7 @@ SwTxtFmtColl* SwDoc::MakeTxtFmtColl( const OUString &rFmtName,
if (bBroadcast)
BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_PARA,
- SFX_STYLESHEET_CREATED);
+ SfxStyleSheetHintId::CREATED);
return pFmtColl;
}
@@ -934,7 +934,7 @@ SwConditionTxtFmtColl* SwDoc::MakeCondTxtFmtColl( const OUString &rFmtName,
if (bBroadcast)
BroadcastStyleOperation(rFmtName, SFX_STYLE_FAMILY_PARA,
- SFX_STYLESHEET_CREATED);
+ SfxStyleSheetHintId::CREATED);
return pFmtColl;
}
@@ -963,7 +963,7 @@ void SwDoc::DelTxtFmtColl(sal_uInt16 nFmtColl, bool bBroadcast)
if (bBroadcast)
BroadcastStyleOperation(pDel->GetName(), SFX_STYLE_FAMILY_PARA,
- SFX_STYLESHEET_ERASED);
+ SfxStyleSheetHintId::ERASED);
if (GetIDocumentUndoRedo().DoesUndo())
{
@@ -1907,7 +1907,7 @@ void SwDoc::RenameFmt(SwFmt & rFmt, const OUString & sNewName,
rFmt.SetName(sNewName);
if (bBroadcast)
- BroadcastStyleOperation(sNewName, eFamily, SFX_STYLESHEET_MODIFIED);
+ BroadcastStyleOperation(sNewName, eFamily, SfxStyleSheetHintId::MODIFIED);
}
void SwDoc::dumpAsXml(xmlTextWriterPtr pWriter) const
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 4d3e46df5ed5..aeff01cd1e25 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1020,7 +1020,7 @@ bool SwDoc::DelNumRule( const OUString& rName, bool bBroadcast )
if (bBroadcast)
BroadcastStyleOperation(rName, SFX_STYLE_FAMILY_PSEUDO,
- SFX_STYLESHEET_ERASED);
+ SfxStyleSheetHintId::ERASED);
getIDocumentListsAccess().deleteListForListStyle( rName );
getIDocumentListsAccess().deleteListsByDefaultListStyle( rName );
@@ -1091,7 +1091,7 @@ bool SwDoc::RenameNumRule(const OUString & rOldName, const OUString & rNewName,
if (bBroadcast)
BroadcastStyleOperation(rOldName, SFX_STYLE_FAMILY_PSEUDO,
- SFX_STYLESHEET_MODIFIED);
+ SfxStyleSheetHintId::MODIFIED);
}
return bResult;
@@ -2171,7 +2171,7 @@ sal_uInt16 SwDoc::MakeNumRule( const OUString &rName,
if (bBroadcast)
BroadcastStyleOperation(pNew->GetName(), SFX_STYLE_FAMILY_PSEUDO,
- SFX_STYLESHEET_CREATED);
+ SfxStyleSheetHintId::CREATED);
return nRet;
}
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 800ccf49daf2..e9f8a89996c9 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3303,12 +3303,12 @@ void SwXStyle::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
const SfxSimpleHint* pHint = dynamic_cast<const SfxSimpleHint*>(&rHint);
if( pHint )
{
- if(( pHint->GetId() & SFX_HINT_DYING ) || ( pHint->GetId() & SFX_STYLESHEET_ERASED))
+ if(( pHint->GetId() & SFX_HINT_DYING ) || ( pHint->GetId() & SfxStyleSheetHintId::ERASED))
{
pBasePool = 0;
EndListening(rBC);
}
- else if( pHint->GetId() &(SFX_STYLESHEET_CHANGED|SFX_STYLESHEET_ERASED) )
+ else if( pHint->GetId() &(SfxStyleSheetHintId::CHANGED|SfxStyleSheetHintId::ERASED) )
{
static_cast<SfxStyleSheetBasePool&>(rBC).SetSearchMask(eFamily);
SfxStyleSheetBase* pOwnBase = static_cast<SfxStyleSheetBasePool&>(rBC).Find(m_sStyleName);
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index a5f883540500..e110b0d75ed3 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -603,7 +603,7 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl)
pView->InvalidateRulerPos();
if( m_bNew )
- m_xBasePool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *m_xTmp.get() ) );
+ m_xBasePool->Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::CREATED, *m_xTmp.get() ) );
pDoc->getIDocumentState().SetModified();
if( !m_bModified )
@@ -857,7 +857,7 @@ sal_uInt16 SwDocShell::Edit(
m_pView->InvalidateRulerPos();
if( bNew )
- m_xBasePool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *xTmp.get() ) );
+ m_xBasePool->Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::CREATED, *xTmp.get() ) );
m_pDoc->getIDocumentState().SetModified();
if( !bModified ) // Bug 57028
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 75fde3674ffd..1b9c81cb2148 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -485,7 +485,7 @@ void SwDocStyleSheet::SetGrabBagItem(const uno::Any& rVal)
if (bChg)
{
dynamic_cast<SwDocStyleSheetPool&>(*pPool).InvalidateIterator();
- pPool->Broadcast(SfxStyleSheetHint(SFX_STYLESHEET_MODIFIED, *this));
+ pPool->Broadcast(SfxStyleSheetHint(SfxStyleSheetHintId::MODIFIED, *this));
SwEditShell* pSh = rDoc.GetEditShell();
if (pSh)
pSh->CallChgLnk();
@@ -582,7 +582,7 @@ void SwDocStyleSheet::SetHidden( bool bValue )
{
// calling pPool->First() here would be quite slow...
dynamic_cast<SwDocStyleSheetPool&>(*pPool).InvalidateIterator(); // internal list has to be updated
- pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
+ pPool->Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::MODIFIED, *this ) );
SwEditShell* pSh = rDoc.GetEditShell();
if( pSh )
pSh->CallChgLnk();
@@ -1058,7 +1058,7 @@ bool SwDocStyleSheet::SetName(const OUString& rStr, bool bReindexNow)
if( bChg )
{
pPool->First(); // internal list has to be updated
- pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this ) );
+ pPool->Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::MODIFIED, *this ) );
SwEditShell* pSh = rDoc.GetEditShell();
if( pSh )
pSh->CallChgLnk();
@@ -1109,7 +1109,7 @@ bool SwDocStyleSheet::SetParent( const OUString& rStr)
if( bRet )
{
aParent = rStr;
- pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED,
+ pPool->Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::MODIFIED,
*this ) );
}
}
@@ -2396,7 +2396,7 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle)
}
if( bBroadcast )
- Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *pStyle ) );
+ Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::ERASED, *pStyle ) );
}
bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
@@ -2448,7 +2448,7 @@ bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
else
mxStyleSheet->PresetFollow( OUString() );
- Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED,
+ Broadcast( SfxStyleSheetHint( SfxStyleSheetHintId::MODIFIED,
*(mxStyleSheet.get()) ) );
}
}
@@ -3040,7 +3040,7 @@ void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
// search and remove from View-List!!
const SfxStyleSheetHint* pStyleSheetHint = dynamic_cast<const SfxStyleSheetHint*>(&rHint);
if( pStyleSheetHint &&
- SFX_STYLESHEET_ERASED == pStyleSheetHint->GetHint() )
+ SfxStyleSheetHintId::ERASED == pStyleSheetHint->GetHint() )
{
SfxStyleSheetBase* pStyle = pStyleSheetHint->GetStyleSheet();