GCC 4.7 -Werror=deprecated, -Werror=narrowing

(cherry picked from commit 042f74a90557ab312ce6e7d7925204ba531adbe9)

Signed-off-by: Michael Stahl <mstahl@redhat.com>

11 files changed, 21 insertions, 24 deletions

diff --git a/binfilter/bf_forms/source/component/forms_FormattedField.cxx b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
index 2edab09ad..be0834464 100644
--- a/binfilter/bf_forms/source/component/forms_FormattedField.cxx
+++ b/binfilter/bf_forms/source/component/forms_FormattedField.cxx
@@ -97,8 +97,8 @@ public:
     StandardFormatsSupplier(const Reference<XMultiServiceFactory>& _rxFactory,LanguageType _eSysLanguage);
 
     operator Reference<XNumberFormatsSupplier> ();
-    SvNumberFormatsSupplierObj::operator new;
-    SvNumberFormatsSupplierObj::operator delete;
+    using SvNumberFormatsSupplierObj::operator new;
+    using SvNumberFormatsSupplierObj::operator delete;
 
 protected:
     ~StandardFormatsSupplier() { if (m_pMyPrivateFormatter) delete m_pMyPrivateFormatter; }
diff --git a/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx b/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx
index d6a0f079c..000fb605f 100644
--- a/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx
+++ b/binfilter/bf_sc/source/filter/xml/XMLExportIterator.hxx
@@ -96,7 +96,7 @@ public:
                                 ScMyShapesContainer();
     virtual                     ~ScMyShapesContainer();
 
-                                ScMyIteratorBase::UpdateAddress;
+                                using ScMyIteratorBase::UpdateAddress;
     void                        AddNewShape(const ScMyShape& aShape);
     sal_Bool                    HasShapes() { return !aShapeList.empty(); }
     const ScMyShapeList*        GetShapes() { return &aShapeList; }
@@ -127,7 +127,7 @@ public:
     virtual                     ~ScMyMergedRangesContainer();
     void                        AddRange(const ::com::sun::star::table::CellRangeAddress aMergedRange);
 
-                                ScMyIteratorBase::UpdateAddress;
+                                using ScMyIteratorBase::UpdateAddress;
     virtual void                SetCellData( ScMyCell& rMyCell );
     virtual void                Sort(); // + remove doublets
 };
@@ -167,7 +167,7 @@ public:
     inline void                 AddNewAreaLink( const ScMyAreaLink& rAreaLink )
                                     { aAreaLinkList.push_back( rAreaLink ); }
 
-                                ScMyIteratorBase::UpdateAddress;
+                                using ScMyIteratorBase::UpdateAddress;
     virtual void                SetCellData( ScMyCell& rMyCell );
     virtual void                Sort();
 };
@@ -193,7 +193,7 @@ public:
     virtual                     ~ScMyEmptyDatabaseRangesContainer();
     void                        AddNewEmptyDatabaseRange(const ::com::sun::star::table::CellRangeAddress& aCellRangeAddress);
 
-                                ScMyIteratorBase::UpdateAddress;
+                                using ScMyIteratorBase::UpdateAddress;
     virtual void                SetCellData( ScMyCell& rMyCell );
     virtual void                Sort();
 };
@@ -228,7 +228,7 @@ public:
                                     const ScRange& rSourceRange,
                                     sal_Bool bHasError );
 
-                                ScMyIteratorBase::UpdateAddress;
+                                using ScMyIteratorBase::UpdateAddress;
     virtual void                SetCellData( ScMyCell& rMyCell );
     virtual void                Sort();
 };
@@ -258,7 +258,7 @@ public:
 
     void                        AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex );
 
-                                ScMyIteratorBase::UpdateAddress;
+                                using ScMyIteratorBase::UpdateAddress;
     virtual void                SetCellData( ScMyCell& rMyCell );
     virtual void                Sort();
 };
diff --git a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
index a359233bf..3c88c1682 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_xmlstyle.cxx
@@ -58,7 +58,7 @@ using namespace ::binfilter::xmloff::token;
 
 using rtl::OUString;
 
-#define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
 #define MAP_END()   { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0 }
 
 const XMLPropertyMapEntry aXMLScCellStylesProperties[] =
diff --git a/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx b/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx
index b49135098..64856e8c6 100644
--- a/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx
+++ b/binfilter/bf_sfx2/source/appl/imestatuswindow.hxx
@@ -71,11 +71,8 @@ public:
      */
     void init();
 
-    // At least the Solaris "CC: Forte Developer 7 C++ 5.4 2002/03/09" compiler
-    // does not accept the following using-declarations for virtual functions,
-    // so use (deprecated) access declarations instead:
-    /*using*/ ImeStatusWindow_Impl::acquire;
-    /*using*/ ImeStatusWindow_Impl::release;
+    using ImeStatusWindow_Impl::acquire;
+    using ImeStatusWindow_Impl::release;
     using ImeStatusWindow_Impl::operator new;
     using ImeStatusWindow_Impl::operator delete;
 
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
index 3da58556f..57e2ac214 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx
@@ -116,9 +116,9 @@ sal_Char SW5HEADER[] = "SW5HDR";        // 5.0 Header
 class Sw3RecordSizeTable: private Table
 {
 public:
-    Table::Count;
-    Table::SearchKey;
-    Table::GetObjectKey;
+    using Table::Count;
+    using Table::SearchKey;
+    using Table::GetObjectKey;
 
     Sw3RecordSizeTable() :
         Table()
diff --git a/binfilter/bf_xmloff/source/chart/PropertyMap.hxx b/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
index 924cf07dc..0d15a7992 100644
--- a/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
+++ b/binfilter/bf_xmloff/source/chart/PropertyMap.hxx
@@ -78,7 +78,7 @@ namespace binfilter {
 
 #define MAP_ENTRY( a, ns, nm, t ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, 0 }
 #define MAP_CONTEXT( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t, XML_SCH_CONTEXT_##c }
-#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, t | MID_FLAG_SPECIAL_ITEM, XML_SCH_CONTEXT_SPECIAL_##c }
+#define MAP_SPECIAL( a, ns, nm, t, c ) { a, sizeof(a)-1, XML_NAMESPACE_##ns, xmloff::token::nm, sal::static_int_cast< sal_Int32 >(t | MID_FLAG_SPECIAL_ITEM), XML_SCH_CONTEXT_SPECIAL_##c }
 #define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
 
 // ---------------------------------------------------------
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
index ca3544817..fcaf280c3 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_sdpropls.cxx
@@ -75,7 +75,7 @@ using namespace ::rtl;
 using namespace ::com::sun::star;
 using namespace ::binfilter::xmloff::token;
 
-#define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
 #define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx b/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx
index 7124eb476..df804ae5d 100644
--- a/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx
+++ b/binfilter/bf_xmloff/source/forms/xmloff_controlpropertymap.cxx
@@ -47,7 +47,7 @@ namespace xmloff
 //.........................................................................
 
 #define MAP_ASCII( name, prefix, token, type, context )  { name, sizeof(name)-1, prefix, token, type, context }
-#define MAP_CONST( name, prefix, token, type, context )  { name.ascii, name.length, prefix, token, type, context }
+#define MAP_CONST( name, prefix, token, type, context )  { name.ascii, name.length, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
 #define MAP_END()   { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0 }
 
     XMLPropertyMapEntry* getControlStylePropertyMap_Access( )
diff --git a/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx b/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
index e9b66753e..c3f2a6bac 100644
--- a/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
+++ b/binfilter/bf_xmloff/source/style/xmloff_PageMasterStyleMap.cxx
@@ -33,7 +33,7 @@ namespace binfilter {
 
 using namespace ::binfilter::xmloff::token;
 
-#define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, type, context }
+#define MAP(name,prefix,token,type,context)  { name, sizeof(name)-1, prefix, token, sal::static_int_cast< sal_Int32 >(type), context }
 #define MAP_ENTRY_END { 0,0,0,xmloff::token::XML_TOKEN_INVALID,0,0 }
 //______________________________________________________________________________
 
diff --git a/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx b/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
index 7c901b61a..10cb7d849 100644
--- a/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
+++ b/binfilter/bf_xmloff/source/text/xmloff_txtprmap.cxx
@@ -38,10 +38,10 @@ using namespace ::com::sun::star::uno;
 using namespace ::binfilter::xmloff::token;
 
 #define M_E( a, p, l, t, c ) \
-    { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, t, c }
+    { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, sal::static_int_cast< sal_Int32 >(t), c }
 
 #define M_ED( a, p, l, t, c ) \
-    { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, (t) | MID_FLAG_DEFAULT_ITEM_EXPORT, c }
+    { a, sizeof(a)-1, XML_NAMESPACE_##p, XML_##l, sal::static_int_cast< sal_Int32 >((t) | MID_FLAG_DEFAULT_ITEM_EXPORT), c }
 
 #define M_END() \
     { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0 }
diff --git a/binfilter/inc/bf_sch/schopt.hxx b/binfilter/inc/bf_sch/schopt.hxx
index ebde75eb7..766477469 100644
--- a/binfilter/inc/bf_sch/schopt.hxx
+++ b/binfilter/inc/bf_sch/schopt.hxx
@@ -56,7 +56,7 @@ public:
 
 
     // make public
-    Table::Count;
+    using Table::Count;
 
     // specialized methods from Table
     void            ClearAndDestroy();