mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reorder as we are touching this already

Browse Source 
Change-Id: Ie00f27203a28a139de073102428fe9b99db507ea
This commit is contained in:
Bjoern Michaelsen
2015-11-27 13:46:31 +01:00
parent fe151f719d
commit 0168313e95
1 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
sw/source/core/unocore/unostyle.cxx
View File

@@ -114,15 +114,6 @@ namespace
}; };
} }
// Already implemented autostyle families: 3
#define AUTOSTYLE_FAMILY_COUNT 3
const IStyleAccess::SwAutoStyleFamily aAutoStyleByIndex[] =
{
IStyleAccess::AUTO_STYLE_CHAR,
IStyleAccess::AUTO_STYLE_RUBY,
IStyleAccess::AUTO_STYLE_PARA
};
using namespace ::com::sun::star; using namespace ::com::sun::star;
static SwGetPoolIdFromName lcl_GetSwEnumFromSfxEnum(SfxStyleFamily eFamily) static SwGetPoolIdFromName lcl_GetSwEnumFromSfxEnum(SfxStyleFamily eFamily)
@@ -135,20 +126,6 @@ static SwGetPoolIdFromName lcl_GetSwEnumFromSfxEnum(SfxStyleFamily eFamily)
return nsSwGetPoolIdFromName::GET_POOLID_CHRFMT; return nsSwGetPoolIdFromName::GET_POOLID_CHRFMT;
} }
class SwAutoStylesEnumImpl
{
std::vector<SfxItemSet_Pointer_t> mAutoStyles;
std::vector<SfxItemSet_Pointer_t>::iterator aIter;
SwDoc* pDoc;
IStyleAccess::SwAutoStyleFamily eFamily;
public:
SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAutoStyleFamily eFam );
bool hasMoreElements() { return aIter != mAutoStyles.end(); }
SfxItemSet_Pointer_t nextElement() { return *(aIter++); }
IStyleAccess::SwAutoStyleFamily getFamily() const { return eFamily; }
SwDoc* getDoc() const { return pDoc; }
};
OUString SwXStyleFamilies::getImplementationName() throw( uno::RuntimeException, std::exception ) OUString SwXStyleFamilies::getImplementationName() throw( uno::RuntimeException, std::exception )
{ return {"SwXStyleFamilies"}; } { return {"SwXStyleFamilies"}; }
@@ -161,15 +138,12 @@ uno::Sequence< OUString > SwXStyleFamilies::getSupportedServiceNames() throw( un
{ return { "com.sun.star.style.StyleFamilies" }; } { return { "com.sun.star.style.StyleFamilies" }; }
SwXStyleFamilies::SwXStyleFamilies(SwDocShell& rDocShell) : SwXStyleFamilies::SwXStyleFamilies(SwDocShell& rDocShell) :
SwUnoCollection(rDocShell.GetDoc()), SwUnoCollection(rDocShell.GetDoc()),
m_pDocShell(&rDocShell) m_pDocShell(&rDocShell)
{ { }
}
SwXStyleFamilies::~SwXStyleFamilies() SwXStyleFamilies::~SwXStyleFamilies()
{ { }
}
uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name) uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name)
throw( throw(
@@ -227,13 +201,10 @@ uno::Type SwXStyleFamilies::getElementType()
throw( uno::RuntimeException, std::exception ) throw( uno::RuntimeException, std::exception )
{ {
return cppu::UnoType<container::XNameContainer>::get(); return cppu::UnoType<container::XNameContainer>::get();
} }
sal_Bool SwXStyleFamilies::hasElements() throw( uno::RuntimeException, std::exception ) sal_Bool SwXStyleFamilies::hasElements() throw( uno::RuntimeException, std::exception )
{ { return true; }
return sal_True;
}
void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL,
const uno::Sequence< beans::PropertyValue >& aOptions) const uno::Sequence< beans::PropertyValue >& aOptions)
@@ -312,6 +283,29 @@ sal_Bool SwXStyleFamily::supportsService(const OUString& rServiceName) throw( un
uno::Sequence< OUString > SwXStyleFamily::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) uno::Sequence< OUString > SwXStyleFamily::getSupportedServiceNames() throw( uno::RuntimeException, std::exception )
{ return { "com.sun.star.style.StyleFamily" }; } { return { "com.sun.star.style.StyleFamily" }; }
// Already implemented autostyle families: 3
#define AUTOSTYLE_FAMILY_COUNT 3
const IStyleAccess::SwAutoStyleFamily aAutoStyleByIndex[] =
{
IStyleAccess::AUTO_STYLE_CHAR,
IStyleAccess::AUTO_STYLE_RUBY,
IStyleAccess::AUTO_STYLE_PARA
};
class SwAutoStylesEnumImpl
{
std::vector<SfxItemSet_Pointer_t> mAutoStyles;
std::vector<SfxItemSet_Pointer_t>::iterator aIter;
SwDoc* pDoc;
IStyleAccess::SwAutoStyleFamily eFamily;
public:
SwAutoStylesEnumImpl( SwDoc* pInitDoc, IStyleAccess::SwAutoStyleFamily eFam );
bool hasMoreElements() { return aIter != mAutoStyles.end(); }
SfxItemSet_Pointer_t nextElement() { return *(aIter++); }
IStyleAccess::SwAutoStyleFamily getFamily() const { return eFamily; }
SwDoc* getDoc() const { return pDoc; }
};
SwXStyleFamily::SwXStyleFamily(SwDocShell* pDocSh, sal_uInt16 nFamily) : SwXStyleFamily::SwXStyleFamily(SwDocShell* pDocSh, sal_uInt16 nFamily) :
m_eFamily((SfxStyleFamily)nFamily), m_eFamily((SfxStyleFamily)nFamily),
m_pBasePool(pDocSh->GetStyleSheetPool()), m_pBasePool(pDocSh->GetStyleSheetPool()),