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

tweak ambiguities for F-15 gcc 4.6.1-9

Browse Source
This commit is contained in:
Caolán McNamara
2011-09-29 23:02:56 +01:00
parent 350e1e2456
commit 1b78b83fbd
6 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dbaccess/source/core/dataaccess/databasedocument.cxx
View File

@@ -1800,10 +1800,13 @@ void ODatabaseDocument::disposing()
::osl::ClearableMutexGuard aGuard( m_aMutex ); ::osl::ClearableMutexGuard aGuard( m_aMutex );
OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" ); OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
// normally, nobody should explicitly dispose, but only XCloseable::close the document. And upon // normally, nobody should explicitly dispose, but only XCloseable::close
// closing, our controllers are closed, too // the document. And upon closing, our controllers are closed, too
aKeepAlive.push_back( m_xUIConfigurationManager ); {
uno::Reference<uno::XInterface> xUIInterface = m_xUIConfigurationManager;
aKeepAlive.push_back( xUIInterface );
}
m_xUIConfigurationManager = NULL; m_xUIConfigurationManager = NULL;
clearObjectContainer( m_xForms ); clearObjectContainer( m_xForms );
@@ -1825,10 +1828,16 @@ void ODatabaseDocument::disposing()
OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" ); OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
impl_disposeControllerFrames_nothrow(); impl_disposeControllerFrames_nothrow();
aKeepAlive.push_back( m_xModuleManager ); {
uno::Reference<uno::XInterface> xModuleInterface = m_xModuleManager;
aKeepAlive.push_back( xModuleInterface );
}
m_xModuleManager.clear(); m_xModuleManager.clear();
aKeepAlive.push_back( m_xTitleHelper ); {
uno::Reference<uno::XInterface> xTitleInterface = m_xTitleHelper;
aKeepAlive.push_back( xTitleInterface );
}
m_xTitleHelper.clear(); m_xTitleHelper.clear();
m_pImpl.clear(); m_pImpl.clear();

6
dbaccess/source/ui/browser/unodatbr.cxx
View File

@@ -784,7 +784,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
if ( xSupplier.is() ) if ( xSupplier.is() )
aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier")), makeAny( xSupplier ) ) ); aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormatsSupplier")), makeAny( xSupplier ) ) );
aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TreatAsNumber")), makeAny( (sal_Bool)bFormattedIsNumeric ) ) ); aInitialValues.push_back( NamedValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TreatAsNumber")), makeAny( (sal_Bool)bFormattedIsNumeric ) ) );
aCopyProperties.push_back( PROPERTY_FORMATKEY ); aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) );
break; break;
} }
@@ -817,8 +817,8 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
aInitialValues.push_back( NamedValue( sDefaultProperty, aDefault ) ); aInitialValues.push_back( NamedValue( sDefaultProperty, aDefault ) );
// transfer properties from the definition to the UNO-model : // transfer properties from the definition to the UNO-model :
aCopyProperties.push_back( PROPERTY_HIDDEN ); aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_HIDDEN) );
aCopyProperties.push_back( PROPERTY_WIDTH ); aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_WIDTH) );
// help text to display for the column // help text to display for the column
Any aDescription; Any aDescription;

6
dbaccess/source/ui/querydesign/TableWindowAccess.cxx
View File

@@ -254,7 +254,11 @@ namespace dbaui
::std::vector< Reference<XInterface> > aRelations; ::std::vector< Reference<XInterface> > aRelations;
aRelations.reserve(5); // just guessing aRelations.reserve(5); // just guessing
for (; aIter != aEnd ; ++aIter ) for (; aIter != aEnd ; ++aIter )
aRelations.push_back(getParentChild(aIter - pConnectionList->begin())); {
uno::Reference<uno::XInterface> xInterface =
getParentChild(aIter - pConnectionList->begin());
aRelations.push_back(xInterface);
}
Reference<XInterface> *pRelations = aRelations.empty() ? 0 : &aRelations[0]; Reference<XInterface> *pRelations = aRelations.empty() ? 0 : &aRelations[0];
Sequence< Reference<XInterface> > aSeq(pRelations, aRelations.size()); Sequence< Reference<XInterface> > aSeq(pRelations, aRelations.size());

16
reportdesign/source/filter/xml/xmlExport.cxx
View File

@@ -1201,15 +1201,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
if ( !aPos.X ) if ( !aPos.X )
{ {
sBorderProp = PROPERTY_BORDERLEFT; sBorderProp = PROPERTY_BORDERLEFT;
aProps.push_back(PROPERTY_BORDERRIGHT); aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT));
} }
else else
{ {
sBorderProp = PROPERTY_BORDERRIGHT; 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(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP));
aProps.push_back(PROPERTY_BORDERBOTTOM); aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERBOTTOM));
} }
else // horizontal else // horizontal
{ {
@@ -1217,15 +1217,15 @@ void ORptExport::exportAutoStyle(XPropertySet* _xProp,const Reference<XFormatted
if ( (aPos.Y + aSize.Height) == nSectionHeight ) if ( (aPos.Y + aSize.Height) == nSectionHeight )
{ {
sBorderProp = PROPERTY_BORDERBOTTOM; sBorderProp = PROPERTY_BORDERBOTTOM;
aProps.push_back(PROPERTY_BORDERTOP); aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERTOP));
} }
else else
{ {
sBorderProp = PROPERTY_BORDERTOP; 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(static_cast<const rtl::OUString&>(PROPERTY_BORDERRIGHT));
aProps.push_back(PROPERTY_BORDERLEFT); aProps.push_back(static_cast<const rtl::OUString&>(PROPERTY_BORDERLEFT));
} }
xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue)); xBorderProp->setPropertyValue(sBorderProp,uno::makeAny(aValue));

3
reportdesign/source/ui/report/ReportController.cxx
View File

@@ -258,7 +258,8 @@ void lcl_getReportControlFormat(const Sequence< PropertyValue >& aArgs,
} }
else else
{ {
_rControlsFormats.push_back(xReportControlFormat); uno::Reference<uno::XInterface> xInterface = xReportControlFormat;
_rControlsFormats.push_back(xInterface);
} }
if ( !_xWindow.is() ) if ( !_xWindow.is() )

6
reportdesign/source/ui/report/ReportSection.cxx
View File

@@ -727,7 +727,11 @@ void OReportSection::fillControlModelSelection(::std::vector< uno::Reference< un
const SdrObject* pDlgEdObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); const SdrObject* pDlgEdObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
const OObjectBase* pObj = dynamic_cast<const OObjectBase*>(pDlgEdObj); const OObjectBase* pObj = dynamic_cast<const OObjectBase*>(pDlgEdObj);
if ( pObj ) if ( pObj )
_rSelection.push_back(pObj->getReportComponent()); {
uno::Reference<uno::XInterface> xInterface =
pObj->getReportComponent();
_rSelection.push_back(xInterface);
}
} }
} }
} }