summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2015-04-09 14:56:16 +0200
committerJan Holesovsky <kendy@collabora.com>2015-04-09 14:56:16 +0200
commitd378648150d4354a0fa9ddff0555ddaeddc40849 (patch)
treeb8a190d9c838256d76337ed26dedbb26c18814b6
parent879a20e9b915103bf5e6403a0775bd979df78079 (diff)
Few post-backport fixes.private/kendy/condformat-api
Change-Id: Ic7943d8e5795a6861a051a84ce39f1836661ec39
-rw-r--r--sc/source/ui/unoobj/condformatuno.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx
index e69c3e93b780..03cc45e56573 100644
--- a/sc/source/ui/unoobj/condformatuno.cxx
+++ b/sc/source/ui/unoobj/condformatuno.cxx
@@ -274,9 +274,9 @@ const SfxItemPropertyMapEntry* getCondDatePropSet()
{
static const SfxItemPropertyMapEntry aCondDatePropertyMap_Impl[] =
{
- {OUString("StyleName"), StyleName, cppu::UnoType<OUString>::get(), 0, 0},
- {OUString("DateType"), Icons, getCppuType(&sheet::DateType::TODAY), 0, 0 },
- {OUString(), 0, css::uno::Type(), 0, 0}
+ {MAP_CHAR_LEN("StyleName"), StyleName, &cppu::UnoType<OUString>::get(), 0, 0},
+ {MAP_CHAR_LEN("DateType"), Icons, &getCppuType(&sheet::DateType::TODAY), 0, 0 },
+ {0, 0, 0, 0, 0, 0}
};
return aCondDatePropertyMap_Impl;
}
@@ -354,9 +354,9 @@ sal_Int32 ScCondFormatsObj::createByRange(const uno::Reference< sheet::XSheetCel
SCTAB nTab = aCoreRange[0]->aStart.Tab();
- ScConditionalFormat* pNewFormat = new ScConditionalFormat(0, &mpDocShell->GetDocument());
- pNewFormat->SetRange(aCoreRange);
- return mpDocShell->GetDocument().AddCondFormat(pNewFormat, nTab);
+ ScConditionalFormat* pNewFormat = new ScConditionalFormat(0, mpDocShell->GetDocument());
+ pNewFormat->AddRange(aCoreRange);
+ return mpDocShell->GetDocument()->AddCondFormat(pNewFormat, nTab);
}
void ScCondFormatsObj::removeByID(const sal_Int32 nID)
@@ -475,7 +475,7 @@ void ScCondFormatObj::createEntry(const sal_Int32 nType, const sal_Int32 nPos)
throw lang::IllegalArgumentException();
ScFormatEntry* pNewEntry = NULL;
- ScDocument* pDoc = &mpDocShell->GetDocument();
+ ScDocument* pDoc = mpDocShell->GetDocument();
switch (nType)
{
case sheet::ConditionEntryType::CONDITION: