Kaydet (Commit) 50c3352e authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen

clean up and reduce indent levels, remove hugely scoped Any

Change-Id: I2681ddb9b9cba0529ea88c5b81c1f060d1df8eb4
üst a9618132
...@@ -576,16 +576,15 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName) ...@@ -576,16 +576,15 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName)
throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
uno::Any aRet;
OUString sStyleName; OUString sStyleName;
SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( m_eFamily ), true ); SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum(m_eFamily), true);
if(m_pBasePool) if(!m_pBasePool)
{ throw uno::RuntimeException();
m_pBasePool->SetSearchMask(m_eFamily); m_pBasePool->SetSearchMask(m_eFamily);
SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName); SfxStyleSheetBase* pBase = m_pBasePool->Find(sStyleName);
if(pBase) if(!pBase)
{ throw container::NoSuchElementException();
uno::Reference< style::XStyle > xStyle = _FindStyle(sStyleName); uno::Reference<style::XStyle> xStyle = _FindStyle(sStyleName);
if(!xStyle.is()) if(!xStyle.is())
{ {
switch(m_eFamily) switch(m_eFamily)
...@@ -600,15 +599,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName) ...@@ -600,15 +599,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName)
xStyle = new SwXStyle(*m_pBasePool, m_eFamily, m_pDocShell->GetDoc(), sStyleName); xStyle = new SwXStyle(*m_pBasePool, m_eFamily, m_pDocShell->GetDoc(), sStyleName);
} }
} }
aRet.setValue(&xStyle, cppu::UnoType<style::XStyle>::get()); return uno::makeAny(xStyle);
}
else
throw container::NoSuchElementException();
}
else
throw uno::RuntimeException();
return aRet;
} }
uno::Sequence< OUString > SwXStyleFamily::getElementNames() throw( uno::RuntimeException, std::exception ) uno::Sequence< OUString > SwXStyleFamily::getElementNames() throw( uno::RuntimeException, std::exception )
......
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