tweak ambiguities for F-15 gcc 4.6.1-9

6 files changed, 37 insertions, 19 deletions

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 3350275a12c4..f11df1c5eb9a 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1800,10 +1800,13 @@ void ODatabaseDocument::disposing()
     ::osl::ClearableMutexGuard aGuard( m_aMutex );
 
     OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
-        // normally, nobody should explicitly dispose, but only XCloseable::close the document. And upon
-        // closing, our controllers are closed, too
+    // normally, nobody should explicitly dispose, but only XCloseable::close
+    // 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;
 
     clearObjectContainer( m_xForms );
@@ -1825,10 +1828,16 @@ void ODatabaseDocument::disposing()
     OSL_ENSURE( m_aControllers.empty(), "ODatabaseDocument::disposing: there still are controllers!" );
     impl_disposeControllerFrames_nothrow();
 
-    aKeepAlive.push_back( m_xModuleManager );
+    {
+        uno::Reference<uno::XInterface> xModuleInterface = m_xModuleManager;
+        aKeepAlive.push_back( xModuleInterface );
+    }
     m_xModuleManager.clear();
 
-    aKeepAlive.push_back( m_xTitleHelper );
+    {
+        uno::Reference<uno::XInterface> xTitleInterface = m_xTitleHelper;
+        aKeepAlive.push_back( xTitleInterface );
+    }
     m_xTitleHelper.clear();
 
     m_pImpl.clear();
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index fb136694de8d..34bc0b07fe75 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -784,7 +784,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                         if ( xSupplier.is() )
                             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 ) ) );
-                        aCopyProperties.push_back( PROPERTY_FORMATKEY );
+                        aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) );
                         break;
                 }
 
@@ -817,8 +817,8 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
                     aInitialValues.push_back( NamedValue( sDefaultProperty, aDefault ) );
 
                 // transfer properties from the definition to the UNO-model :
-                aCopyProperties.push_back( PROPERTY_HIDDEN );
-                aCopyProperties.push_back( PROPERTY_WIDTH );
+                aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_HIDDEN) );
+                aCopyProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_WIDTH) );
 
                 // help text to display for the column
                 Any aDescription;
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 44b3953b57e8..b03b08c69c37 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -254,7 +254,11 @@ namespace dbaui
             ::std::vector< Reference<XInterface> > aRelations;
             aRelations.reserve(5); // just guessing
             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];
             Sequence< Reference<XInterface> > aSeq(pRelations, aRelations.size());
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);
+            }
         }
     }
 }