diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-04-24 16:41:09 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-04-24 17:03:55 +0300 |
| commit | 10bd0604194db9e42fe76adab4ca17a6c7d0ac7c (patch) | |
| tree | 4e3a87d2337a673e1766028aa5cb3271f838242b /reportdesign/source | |
| parent | c93a752ae77f5c03b61c29a2b05dd9580f181400 (diff) | |
Fix MSVC build: A ? : operator doesn't automagically construct an OUString
Change-Id: I0bf2dcd24a7b59682c90a8910279117f1bf0467f
Diffstat (limited to 'reportdesign/source')
| -rw-r--r-- | reportdesign/source/ui/misc/RptUndo.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 6a280720da5a..82ed522c8db0 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -299,7 +299,7 @@ void OGroupSectionUndo::implReInsert( ) { uno::Sequence< beans::PropertyValue > aArgs(2); - aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON : PROPERTY_FOOTERON; + aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON); aArgs[0].Value <<= sal_True; aArgs[1].Name = PROPERTY_GROUP; aArgs[1].Value <<= m_aGroupHelper.getGroup(); @@ -318,7 +318,7 @@ void OGroupSectionUndo::implReRemove( ) uno::Sequence< beans::PropertyValue > aArgs(2); - aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON : PROPERTY_FOOTERON; + aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON); aArgs[0].Value <<= sal_False; aArgs[1].Name = PROPERTY_GROUP; aArgs[1].Value <<= m_aGroupHelper.getGroup(); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index bd4fde87764b..27c76ab9c35a 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3900,7 +3900,7 @@ void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader if ( m_xReportDefinition.is() ) { const SequenceAsHashMap aMap(_aArgs); - const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? PROPERTY_HEADERON : PROPERTY_FOOTERON,sal_False); + const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False); uno::Reference< report::XGroup> xGroup = aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference< report::XGroup>()); if ( xGroup.is() ) { |