diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-29 23:02:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-30 09:09:26 +0100 |
| commit | 1b78b83fbdd16a83780085bc528f7fc733fae5fe (patch) | |
| tree | 720b546bcc66251c9687bb93040681bc13641256 /reportdesign | |
| parent | 350e1e245643e107b6e46b2de3dc73906ab844a5 (diff) | |
tweak ambiguities for F-15 gcc 4.6.1-9
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 16 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 3 | ||||
| -rw-r--r-- | reportdesign/source/ui/report/ReportSection.cxx | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 98909e81b18d..9d986e5ac868 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1201,15 +1201,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted if ( !aPos.X ) { sBorderProp = PROPERTY_BORDERLEFT; - aProps.push_back(PROPERTY_BORDERRIGHT); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT)); } else { sBorderProp = PROPERTY_BORDERRIGHT; - aProps.push_back(PROPERTY_BORDERLEFT); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT)); } - aProps.push_back(PROPERTY_BORDERTOP); - aProps.push_back(PROPERTY_BORDERBOTTOM); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP)); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM)); } else // horizontal { @@ -1217,15 +1217,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted if ( (aPos.Y + aSize.Height) == nSectionHeight ) { sBorderProp = PROPERTY_BORDERBOTTOM; - aProps.push_back(PROPERTY_BORDERTOP); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP)); } else { sBorderProp = PROPERTY_BORDERTOP; - aProps.push_back(PROPERTY_BORDERBOTTOM); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM)); } - aProps.push_back(PROPERTY_BORDERRIGHT); - aProps.push_back(PROPERTY_BORDERLEFT); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT)); + aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT)); } xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue)); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index d8aa5ebafd95..974a2f4804f6 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -258,7 +258,8 @@ void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs, } else { - _rControlsFormats.push_back(xReportControlFormat); + uno::Reference<uno::XInterface> xInterface = xReportControlFormat; + _rControlsFormats.push_back(xInterface); } if ( !_xWindow.is() ) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 9f72392b4782..a88e1884a185 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -727,7 +727,11 @@ void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un const SdrObject* pDlgEdObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); const OObjectBase* pObj = dynamic_cast<const OObjectBase*>(pDlgEdObj); if ( pObj ) - _rSelection.push_back(pObj->getReportComponent()); + { + uno::Reference<uno::XInterface> xInterface = + pObj->getReportComponent(); + _rSelection.push_back(xInterface); + } } } } |