summaryrefslogtreecommitdiff
path: root/svx/qa/unit
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-04 11:31:33 +0200
committerNoel Grandin <noel@peralex.com>2016-05-09 10:17:13 +0200
commitbcb41235deaf4b7ca90522bda3ba21a686819e6e (patch)
tree29f397deeb5c776b290b782847a4f9ec8487adb2 /svx/qa/unit
parentb55b7a057f19521ad88fc6a274fcf071b798eb3e (diff)
convert SfxStyleFamily to scoped enum
and update the RSC compiler to accept such In the process fix some confusion in SD where it was confusing SfxStyleFamily and the index of the relevant family (which other parts of the code in SVL use) Change-Id: I1efc9f85fbed8ab76eafe8f6e1ada411753ae5f9
Diffstat (limited to 'svx/qa/unit')
-rw-r--r--svx/qa/unit/svdraw/test_SdrTextObject.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/svx/qa/unit/svdraw/test_SdrTextObject.cxx b/svx/qa/unit/svdraw/test_SdrTextObject.cxx
index 3b8264deba6e..1062fc0fec57 100644
--- a/svx/qa/unit/svdraw/test_SdrTextObject.cxx
+++ b/svx/qa/unit/svdraw/test_SdrTextObject.cxx
@@ -26,16 +26,16 @@ public:
void SdrTextObjTest::AllFamiliesCanBeRestoredFromSavedString() {
std::vector<SfxStyleFamily> allFamilies;
- allFamilies.push_back(SFX_STYLE_FAMILY_CHAR);
- allFamilies.push_back(SFX_STYLE_FAMILY_PARA);
- allFamilies.push_back(SFX_STYLE_FAMILY_PAGE);
- allFamilies.push_back(SFX_STYLE_FAMILY_PSEUDO);
+ allFamilies.push_back(SfxStyleFamily::Char);
+ allFamilies.push_back(SfxStyleFamily::Para);
+ allFamilies.push_back(SfxStyleFamily::Page);
+ allFamilies.push_back(SfxStyleFamily::Pseudo);
for (SfxStyleFamily family : allFamilies) {
OUString styleName = "styleName";
SdrTextObj::AppendFamilyToStyleName(styleName, family);
SfxStyleFamily readFamily = SdrTextObj::ReadFamilyFromStyleName(styleName);
- CPPUNIT_ASSERT_EQUAL(family, readFamily);
+ CPPUNIT_ASSERT_EQUAL((int)family, (int)readFamily);
}
}