commit b025e60b8d00b0d8fbb694285eafb2c95b7b129e
author Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Wed Dec 23 19:57:53 2015 +0100
committer Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Fri Dec 25 13:15:32 2015 +0100
tree c852f4b7da734b4aa13e0d2ba575d9e6229995ae
parent dc7879fe51f1db089a2be9b42548e7bc6d99c0b4

refactor SwXStyle::isUserDefined/isInUse

Change-Id: I67d8408d410698f0f31738fcc30321c627307c73

sw/source/core/unocore/unostyle.cxx

diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 16313af..9b8d860 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1217,34 +1217,22 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException, std:
sal_Bool SwXStyle::isUserDefined() throw( uno::RuntimeException, std::exception )
{
    SolarMutexGuard aGuard;
    bool bRet = false;
    if(m_pBasePool)
    {
        m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
        SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName);
        //if it is not found it must be non user defined
        if(pBase)
            bRet = pBase->IsUserDefined();
    }
    else
    if(!m_pBasePool)
        throw uno::RuntimeException();
    return bRet;
    m_pBasePool->SetSearchMask(m_rEntry.m_eFamily);
    SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName);
    //if it is not found it must be non user defined
    return pBase && pBase->IsUserDefined();
}

sal_Bool SwXStyle::isInUse() throw( uno::RuntimeException, std::exception )
{
    SolarMutexGuard aGuard;
    bool bRet = false;
    if(m_pBasePool)
    {
        m_pBasePool->SetSearchMask(m_rEntry.m_eFamily, SFXSTYLEBIT_USED);
        SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName);
        if(pBase)
            bRet = pBase->IsUsed();
    }
    else
    if(!m_pBasePool)
        throw uno::RuntimeException();
    return bRet;
    m_pBasePool->SetSearchMask(m_rEntry.m_eFamily, SFXSTYLEBIT_USED);
    SfxStyleSheetBase* pBase = m_pBasePool->Find(m_sStyleName);
    return pBase && pBase->IsUsed();
}

OUString SwXStyle::getParentStyle() throw( uno::RuntimeException, std::exception )