[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 7 commits - boost/boost_1_44_0-gcc4.8.patch boost/UnpackedTarball_boost.mk connectivity/source dbaccess/source extensions/source jvmfwk/plugins reportdesign/source sd/source shell/source svx/source toolkit/source tubes/source ucb/source xmloff/source
Ivan Timofeev
timofeev.i.s at gmail.com
Fri Aug 23 09:23:19 PDT 2013
boost/UnpackedTarball_boost.mk | 2
boost/boost_1_44_0-gcc4.8.patch | 226 ++++++++++++++++++
connectivity/source/drivers/evoab2/NStatement.hxx | 2
dbaccess/source/core/api/RowSet.cxx | 10
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 9
dbaccess/source/ui/dlg/indexdialog.cxx | 6
dbaccess/source/ui/misc/dsmeta.cxx | 6
extensions/source/dbpilots/gridwizard.cxx | 20 -
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 1
reportdesign/source/filter/xml/xmlControlProperty.cxx | 9
sd/source/ui/dlg/RemoteDialogClientBox.cxx | 2
shell/source/backends/gconfbe/gconfaccess.cxx | 2
shell/source/sessioninstall/SyncDbusSessionHelper.cxx | 2
svx/source/form/fmshimp.cxx | 12
toolkit/source/controls/unocontrol.cxx | 8
tubes/source/manager.cxx | 2
ucb/source/ucp/gio/gio_provider.cxx | 4
xmloff/source/forms/propertyimport.cxx | 5
18 files changed, 285 insertions(+), 43 deletions(-)
New commits:
commit 970dcd197a69cbc6f6801fbf51299ac1e8f7c4ef
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Fri Apr 19 17:41:20 2013 +0400
use GLIB_CHECK_VERSION instead of GLIB_VERSION_X_XX
Michael Meeks pointed out that the latter can cause problems.
Change-Id: I68e7f8c6dcfae52305738b2a8cdee72e9c2c7f93
(cherry picked from commit 9dd52eb86a9122e34c307a9160ae3ccd5706c94e)
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 532fd10..70016ab 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,7 +51,7 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
/* initialize glib object type library */
g_type_init();
#endif
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index 9967548..4c3baf5 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,7 @@ namespace shell { namespace sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
#endif
}
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index a3c8990..0a97aeb 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -889,7 +889,7 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
}
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index c95117b..bf6a501 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,7 +100,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
-#if !defined(GLIB_VERSION_2_36)
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
#endif
if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
commit 906e5677ae9255ff2aac735ce6e91ab222ba58e6
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Wed Apr 17 20:04:45 2013 +0400
WaE: g_type_init has been deprecated since GLib 2.36
Change-Id: Ied9b2c2424d780d589cb1b07df0ec38107d49829
Reviewed-on: https://gerrit.libreoffice.org/3434
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit 025857d81d4781a95cda4e790808b05b97eb97d9)
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 205a2cf..532fd10 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -51,8 +51,10 @@ GConfClient* getGconfClient()
static GConfClient* mClient= 0;
if (mClient == NULL)
{
+#if !defined(GLIB_VERSION_2_36)
/* initialize glib object type library */
g_type_init();
+#endif
GError* aError = NULL;
if (!gconf_init(0, NULL, &aError))
diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
index 47f0749..9967548 100644
--- a/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
+++ b/shell/source/sessioninstall/SyncDbusSessionHelper.cxx
@@ -62,7 +62,9 @@ namespace shell { namespace sessioninstall
{
SyncDbusSessionHelper::SyncDbusSessionHelper(Reference<XComponentContext> const&)
{
+#if !defined(GLIB_VERSION_2_36)
g_type_init ();
+#endif
}
void SAL_CALL SyncDbusSessionHelper::InstallPackageNames( const ::sal_uInt32 nXid, const Sequence< OUString >& vPackages, const OUString& sInteraction ) throw (RuntimeException)
{
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index b924e8f..a3c8990 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -889,7 +889,9 @@ TeleManagerImpl::TeleManagerImpl()
mpFileTransferClient( NULL),
mpAccountManager( NULL)
{
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
+#endif
}
TeleManagerImpl::~TeleManagerImpl()
diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx
index 93ec2d4..c95117b 100644
--- a/ucb/source/ucp/gio/gio_provider.cxx
+++ b/ucb/source/ucp/gio/gio_provider.cxx
@@ -100,9 +100,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co
uno::Reference< lang::XMultiServiceFactory > xSMgr
(reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) );
uno::Reference< lang::XSingleServiceFactory > xFactory;
-
+#if !defined(GLIB_VERSION_2_36)
g_type_init();
-
+#endif
if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) )
xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr );
commit 5ea8066a58a3dc1eb19f59849a37100d26183f2b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 8 10:59:05 2013 +0100
-Werror=unused-local-typedefs (GCC 4.8)
(cherry picked from commit 52c5eb20fd96d63e17cb9cd18912030131bcc787)
Conflicts:
sd/source/ui/toolpanel/controls/MasterPageObserver.cxx
Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 33db97d..fd9ce49 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -605,7 +605,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
putenv(strdup(osJavaHome.getStr()));
#endif
- typedef jint JNICALL JNI_InitArgs_Type(void *);
typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *);
rtl::OUString sSymbolCreateJava(
RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM"));
diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 8c4f129c..2694218 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved()
if ( ! m_vRemovedEntries.empty() )
{
- typedef std::vector< TClientBoxEntry >::iterator ITER;
-
m_vRemovedEntries.clear();
}
commit 9ae744b6f9a1b6559b58a0a1564a6c7d6f04f263
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Dec 6 10:32:34 2012 +0100
-Werror,-Wuninitialized
Change-Id: I885851dd3121e34a3f860a449d4d23d185a4d278
(cherry picked from commit 150a965248da361440b5cc195c810751ab11e92e)
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 52f86f4..2036199 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -93,7 +93,7 @@ namespace connectivity
QueryData( const QueryData& _rhs )
:pQuery( NULL )
,sTable()
- ,eFilterType( eFilterType )
+ ,eFilterType( eFilterOther )
,xSelectColumns()
,aSortOrder()
{
commit 3a467fb3ce08a0a1da698629ebcc4d401670c713
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 8 11:32:48 2013 +0100
Work around -Werror=unused-local-typedefs from comphelper/stl_types.hxx
Change-Id: Id9f588e551b40a64bc86cae7c6d50f99659f94ab
(cherry picked from commit 3912e47044f753f82c63ac11e803be5fb756c14f)
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 50b9aa3..235ef59 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -17,6 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
+#include <map>
+#include <utility>
+
#include <string.h>
#include "RowSet.hxx"
#include "dbastrings.hrc"
@@ -1836,8 +1841,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
sal_Int32 nCount = xMetaData->getColumnCount();
m_aDataColumns.reserve(nCount+1);
aColumns->get().reserve(nCount+1);
- DECLARE_STL_USTRINGACCESS_MAP(int,StringMap);
- StringMap aColumnMap;
+ std::map< OUString, int > aColumnMap;
for (sal_Int32 i = 0 ; i < nCount; ++i)
{
// retrieve the name of the column
@@ -1861,7 +1865,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
aDescription,
::rtl::OUString(),
m_aCurrentRow);
- aColumnMap.insert(StringMap::value_type(sName,0));
+ aColumnMap.insert(std::make_pair(sName,0));
aColumns->get().push_back(pColumn);
pColumn->setName(sName);
aNames.push_back(sName);
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index c893a50..8e96816 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
+#include <map>
+
#include "xmlDataSourceSetting.hxx"
#include "xmlDataSource.hxx"
#include <sax/tools/converter.hxx>
@@ -68,8 +72,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
case XML_TOK_DATA_SOURCE_SETTING_TYPE:
{
// needs to be translated into a ::com::sun::star::uno::Type
- DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Type, MapString2Type );
- static MapString2Type s_aTypeNameMap;
+ static std::map< OUString, css::uno::Type > s_aTypeNameMap;
if (!s_aTypeNameMap.size())
{
s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType();
@@ -81,7 +84,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType();
}
- const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue);
+ const std::map< OUString, css::uno::Type >::const_iterator aTypePos = s_aTypeNameMap.find(sValue);
OSL_ENSURE(s_aTypeNameMap.end() != aTypePos, "OXMLDataSourceSetting::OXMLDataSourceSetting: invalid type!");
if (s_aTypeNameMap.end() != aTypePos)
m_aPropType = aTypePos->second;
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 4c7f2e0..e83ae1d 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -17,6 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
+#include <set>
#include "indexdialog.hxx"
#include "dbu_dlg.hrc"
@@ -714,8 +717,7 @@ DBG_NAME(DbaIndexDialog)
}
// no double fields
- DECLARE_STL_STDKEY_SET( String, StringBag );
- StringBag aExistentFields;
+ std::set< String > aExistentFields;
for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin();
aFieldCheck != _rPos->aFields.end();
++aFieldCheck
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index 69adb66..d590579 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -23,6 +23,7 @@
#include <comphelper/processfactory.hxx>
#include <map>
+#include <utility>
//........................................................................
namespace dbaui
@@ -126,8 +127,7 @@ namespace dbaui
//--------------------------------------------------------------------
static AuthenticationMode getAuthenticationMode( const ::rtl::OUString& _sURL )
{
- DECLARE_STL_USTRINGACCESS_MAP( FeatureSupport, Supported);
- static Supported s_aSupport;
+ static std::map< OUString, FeatureSupport > s_aSupport;
if ( s_aSupport.empty() )
{
::connectivity::DriversConfig aDriverConfig(::comphelper::getProcessServiceFactory());
@@ -147,7 +147,7 @@ namespace dbaui
else if ( sAuth == "Password" )
aInit = AuthPwd;
}
- s_aSupport.insert(Supported::value_type(*pIter,aInit));
+ s_aSupport.insert(std::make_pair(*pIter,aInit));
}
}
OSL_ENSURE(s_aSupport.find(_sURL) != s_aSupport.end(),"Illegal URL!");
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index dcb73bb..1309f1e 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -17,10 +17,13 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
+#include <vector>
+
#include "gridwizard.hxx"
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
-#include <comphelper/stl_types.hxx>
#include <tools/string.hxx>
#include <com/sun/star/form/XGridColumnFactory.hpp>
#include <com/sun/star/awt/MouseWheelBehavior.hpp>
@@ -107,10 +110,9 @@ namespace dbp
static const ::rtl::OUString s_sEmptyString;
// collect "descriptors" for the to-be-created (grid)columns
- DECLARE_STL_VECTOR( ::rtl::OUString, OUStringArray );
- OUStringArray aColumnServiceNames; // service names to be used with the XGridColumnFactory
- OUStringArray aColumnLabelPostfixes; // postfixes to append to the column labels
- OUStringArray aFormFieldNames; // data field names
+ std::vector< OUString > aColumnServiceNames; // service names to be used with the XGridColumnFactory
+ std::vector< OUString > aColumnLabelPostfixes; // postfixes to append to the column labels
+ std::vector< OUString > aFormFieldNames; // data field names
aColumnServiceNames.reserve(getSettings().aSelectedFields.getLength());
aColumnLabelPostfixes.reserve(getSettings().aSelectedFields.getLength());
@@ -185,10 +187,10 @@ namespace dbp
{
Reference< XNameAccess > xExistenceChecker(xColumnContainer.get());
- ConstOUStringArrayIterator pColumnServiceName = aColumnServiceNames.begin();
- ConstOUStringArrayIterator pColumnLabelPostfix = aColumnLabelPostfixes.begin();
- ConstOUStringArrayIterator pFormFieldName = aFormFieldNames.begin();
- ConstOUStringArrayIterator pColumnServiceNameEnd = aColumnServiceNames.end();
+ std::vector< OUString >::const_iterator pColumnServiceName = aColumnServiceNames.begin();
+ std::vector< OUString >::const_iterator pColumnLabelPostfix = aColumnLabelPostfixes.begin();
+ std::vector< OUString >::const_iterator pFormFieldName = aFormFieldNames.begin();
+ std::vector< OUString >::const_iterator pColumnServiceNameEnd = aColumnServiceNames.end();
for (;pColumnServiceName < pColumnServiceNameEnd; ++pColumnServiceName, ++pColumnLabelPostfix, ++pFormFieldName)
{
diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index c5929c2..f3fbc12 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
+#include <map>
+
#include "xmlControlProperty.hxx"
#include <rtl/strbuf.hxx>
@@ -80,8 +84,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
case XML_TOK_VALUE_TYPE:
{
// needs to be translated into a ::com::sun::star::uno::Type
- DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Type, MapString2Type );
- static MapString2Type s_aTypeNameMap;
+ static std::map< OUString, css::uno::Type > s_aTypeNameMap;
if (!s_aTypeNameMap.size())
{
s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType();
@@ -95,7 +98,7 @@ OXMLControlProperty::OXMLControlProperty( ORptFilter& rImport
s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType();
}
- const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue);
+ const std::map< OUString, css::uno::Type >::const_iterator aTypePos = s_aTypeNameMap.find(sValue);
OSL_ENSURE(s_aTypeNameMap.end() != aTypePos, "OXMLControlProperty::OXMLControlProperty: invalid type!");
if (s_aTypeNameMap.end() != aTypePos)
m_aPropType = aTypePos->second;
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 5d0dab3..18f5cc3 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -81,7 +81,6 @@
#include <comphelper/evtmethodhelper.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/property.hxx>
-#include <comphelper/stl_types.hxx>
#include <comphelper/string.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/servicefactory.hxx>
@@ -101,6 +100,7 @@
#include <algorithm>
#include <functional>
+#include <map>
#include <vector>
// wird fuer Invalidate verwendet -> mitpflegen
@@ -3310,11 +3310,9 @@ void FmXFormShell::CreateExternalView()
sal_Int16 nAddedColumns = 0;
// for radio buttons we need some special structures
- DECLARE_STL_USTRINGACCESS_MAP(Sequence< ::rtl::OUString>, MapUString2UstringSeq);
- DECLARE_STL_ITERATORS(MapUString2UstringSeq);
- DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, FmMapUString2UString);
- DECLARE_STL_USTRINGACCESS_MAP(sal_Int16, FmMapUString2Int16);
- DECLARE_STL_ITERATORS(FmMapUString2Int16);
+ typedef std::map< OUString, Sequence< ::rtl::OUString> > MapUString2UstringSeq;
+ typedef std::map< OUString, OUString > FmMapUString2UString;
+ typedef std::map< OUString, sal_Int16 > FmMapUString2Int16;
MapUString2UstringSeq aRadioValueLists;
MapUString2UstringSeq aRadioListSources;
@@ -3481,7 +3479,7 @@ void FmXFormShell::CreateExternalView()
// properties describing the "direct" column properties
const sal_Int16 nListBoxDescription = 6;
Sequence< PropertyValue> aListBoxDescription(nListBoxDescription);
- for ( ConstFmMapUString2UStringIterator aCtrlSource = aRadioControlSources.begin();
+ for ( FmMapUString2UString::const_iterator aCtrlSource = aRadioControlSources.begin();
aCtrlSource != aRadioControlSources.end();
++aCtrlSource, ++nOffset
)
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 6cefb82..bcd8641 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -47,6 +47,7 @@
#include <algorithm>
#include <set>
+#include <vector>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -495,8 +496,7 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
if( getPeer().is() )
{
- DECLARE_STL_VECTOR( PropertyValue, PropertyValueVector);
- PropertyValueVector aPeerPropertiesToSet;
+ std::vector< PropertyValue > aPeerPropertiesToSet;
sal_Int32 nIndependentPos = 0;
bool bResourceResolverSet( false );
// position where to insert the independent properties into aPeerPropertiesToSet,
@@ -675,8 +675,8 @@ void UnoControl::ImplModelPropertiesChanged( const Sequence< PropertyChangeEvent
// setting peer properties may result in an attemp to acquire the solar mutex, 'cause the peers
// usually don't have an own mutex but use the SolarMutex instead.
// To prevent deadlocks resulting from this, we do this without our own mutex locked
- PropertyValueVectorIterator aEnd = aPeerPropertiesToSet.end();
- for ( PropertyValueVectorIterator aLoop = aPeerPropertiesToSet.begin();
+ std::vector< PropertyValue >::iterator aEnd = aPeerPropertiesToSet.end();
+ for ( std::vector< PropertyValue >::iterator aLoop = aPeerPropertiesToSet.begin();
aLoop != aEnd;
++aLoop
)
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 98c450a..8bd21c6 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -247,8 +247,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType )
{
Type aUnoType( ::getVoidCppuType() );
- DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Type, MapString2Type );
- static MapString2Type s_aTypeNameMap;
+ static std::map< OUString, css::uno::Type > s_aTypeNameMap;
if ( s_aTypeNameMap.empty() )
{
s_aTypeNameMap[ token::GetXMLToken( token::XML_BOOLEAN ) ] = ::getBooleanCppuType();
@@ -257,7 +256,7 @@ Type PropertyConversion::xmlTypeToUnoType( const ::rtl::OUString& _rType )
s_aTypeNameMap[ token::GetXMLToken( token::XML_VOID ) ] = ::getVoidCppuType();
}
- const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find( _rType );
+ const std::map< OUString, css::uno::Type >::iterator aTypePos = s_aTypeNameMap.find( _rType );
OSL_ENSURE( s_aTypeNameMap.end() != aTypePos, "PropertyConversion::xmlTypeToUnoType: invalid property name!" );
if ( s_aTypeNameMap.end() != aTypePos )
aUnoType = aTypePos->second;
commit 7f46f8c654acd2a53b56859a03ccdc1269105c4b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 8 11:45:35 2013 +0100
-Werror=unused-local-typedefs (GCC 4.8)
Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb
(cherry picked from commit 72c62e0e83598862e1c6e00e4264d7720aa94e41)
diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
index 9fc603e..2d2beeb 100644
--- a/boost/boost_1_44_0-gcc4.8.patch
+++ b/boost/boost_1_44_0-gcc4.8.patch
@@ -1,3 +1,45 @@
+--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
++++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp
+@@ -142,7 +142,6 @@
+ ForwardIteratorT End,
+ std::forward_iterator_tag ) const
+ {
+- typedef ForwardIteratorT input_iterator_type;
+ typedef iterator_range<ForwardIteratorT> result_type;
+
+ first_finder_type first_finder(
+@@ -263,7 +262,6 @@
+ ForwardIteratorT End,
+ unsigned int N) const
+ {
+- typedef ForwardIteratorT input_iterator_type;
+ typedef iterator_range<ForwardIteratorT> result_type;
+
+ // Sanity check
+@@ -298,7 +296,6 @@
+ ForwardIteratorT End,
+ unsigned int N) const
+ {
+- typedef ForwardIteratorT input_iterator_type;
+ typedef iterator_range<ForwardIteratorT> result_type;
+
+ // Sanity check
+@@ -362,7 +359,6 @@
+ unsigned int N,
+ std::random_access_iterator_tag )
+ {
+- typedef ForwardIteratorT input_iterator_type;
+ typedef iterator_range<ForwardIteratorT> result_type;
+
+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
+@@ -436,7 +432,6 @@
+ unsigned int N,
+ std::random_access_iterator_tag )
+ {
+- typedef ForwardIteratorT input_iterator_type;
+ typedef iterator_range<ForwardIteratorT> result_type;
+
+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) )
--- misc/boost_1_44_0/boost/bind/arg.hpp
+++ misc/build/boost_1_44_0/boost/bind/arg.hpp
@@ -35,6 +35,8 @@
@@ -22,3 +64,163 @@
}}
+--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp
++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp
+@@ -113,7 +113,6 @@
+ spec_str = "mdy";
+ }
+
+- typedef typename date_type::year_type year_type;
+ typedef typename date_type::month_type month_type;
+ unsigned pos = 0;
+ unsigned short year(0), month(0), day(0);
+@@ -159,7 +158,7 @@
+ parse_undelimited_date(const std::string& s) {
+ int offsets[] = {4,2,2};
+ int pos = 0;
+- typedef typename date_type::year_type year_type;
++ //typedef typename date_type::year_type year_type;
+ //typename date_type::ymd_type ymd((year_type::min)(),1,1);
+ unsigned short y = 0, m = 0, d = 0;
+
+--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp
+@@ -36,7 +36,6 @@
+ boost::io::ios_flags_saver iflags(os);
+ typedef local_date_time time_type;//::utc_time_type typename
+ typedef date_time::time_facet<time_type, CharT> custom_time_facet;
+- typedef std::time_put<CharT> std_time_facet;
+ std::ostreambuf_iterator<CharT> oitr(os);
+
+ if(std::has_facet<custom_time_facet>(os.getloc())) {
+@@ -123,7 +122,6 @@
+ const boost::local_time::local_time_period& p) {
+ boost::io::ios_flags_saver iflags(os);
+ typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet;
+- typedef std::time_put<CharT> std_time_facet;
+ std::ostreambuf_iterator<CharT> oitr(os);
+ if (std::has_facet<custom_facet>(os.getloc())) {
+ std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p);
+--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp
+@@ -47,7 +47,6 @@
+ const ptime& p) {
+ boost::io::ios_flags_saver iflags(os);
+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
+- typedef std::time_put<CharT> std_ptime_facet;
+ std::ostreambuf_iterator<CharT> oitr(os);
+ if (std::has_facet<custom_ptime_facet>(os.getloc()))
+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
+@@ -114,7 +113,6 @@
+ const boost::posix_time::time_period& p) {
+ boost::io::ios_flags_saver iflags(os);
+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
+- typedef std::time_put<CharT> std_time_facet;
+ std::ostreambuf_iterator<CharT> oitr(os);
+ if (std::has_facet<custom_ptime_facet>(os.getloc())) {
+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p);
+@@ -180,7 +178,6 @@
+ {
+ boost::io::ios_flags_saver iflags(os);
+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet;
+- typedef std::time_put<CharT> std_ptime_facet;
+ std::ostreambuf_iterator<CharT> oitr(os);
+ if (std::has_facet<custom_ptime_facet>(os.getloc()))
+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td);
+--- misc/boost_1_44_0/boost/date_time/string_convert.hpp
++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp
+@@ -21,7 +21,6 @@
+ inline
+ std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str)
+ {
+- typedef std::basic_string<InputT> input_type;
+ typedef std::basic_string<OutputT> output_type;
+ output_type result;
+ result.insert(result.begin(), inp_str.begin(), inp_str.end());
+--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp
++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp
+@@ -35,7 +35,6 @@
+ {
+ typedef std::basic_string<charT> string_type;
+ typedef std::vector<string_type> collection_type;
+- typedef std::basic_ostringstream<charT> ostream_type;
+ typedef std::ostreambuf_iterator<charT> ostream_iter_type;
+ typedef std::basic_ostringstream<charT> stringstream_type;
+ typedef std::time_put<charT> time_put_facet_type;
+@@ -85,7 +84,6 @@
+ {
+ typedef std::basic_string<charT> string_type;
+ typedef std::vector<string_type> collection_type;
+- typedef std::basic_ostringstream<charT> ostream_type;
+ typedef std::ostreambuf_iterator<charT> ostream_iter_type;
+ typedef std::basic_ostringstream<charT> stringstream_type;
+ typedef std::time_put<charT> time_put_facet_type;
+--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp
++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp
+@@ -39,8 +39,6 @@
+
+ template <typename Array, typename IdxGen, typename Call_Type>
+ static void call(Array& a, const IdxGen& idgen, Call_Type c) {
+- typedef typename Array::index_range index_range_;
+- typedef typename Array::index index_;
+ idgen_helper<N-1>::call(a,idgen[c],c);
+ }
+ };
+@@ -50,8 +48,6 @@
+
+ template <typename Array, typename IdxGen, typename Call_Type>
+ static void call(Array& a, const IdxGen& idgen, Call_Type) {
+- typedef typename Array::index_range index_range_;
+- typedef typename Array::index index_;
+ a[ idgen ];
+ }
+ };
+--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
+@@ -307,7 +307,6 @@
+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)
+ typedef impl::grammar_helper_base<GrammarT> helper_base_t;
+ typedef grammar_helper_list<GrammarT> helper_list_t;
+- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+
+ helper_list_t& helpers =
+ # if !defined(__GNUC__) || (__GNUC__ > 2)
+@@ -318,6 +317,7 @@
+
+ # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
+ || defined(BOOST_INTEL_CXX_VERSION)
++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;
+ for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
+ (*i)->undefine(self);
+ # else
+--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp
+@@ -47,7 +47,6 @@
+ typename parser_result<self_t, ScannerT>::type
+ parse(ScannerT const& scan) const
+ {
+- typedef typename parser_result<self_t, ScannerT>::type result_t;
+ typedef typename ScannerT::value_t value_t;
+ typedef typename ScannerT::iterator_t iterator_t;
+
+--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp
+@@ -140,7 +140,6 @@
+ parse(ScannerT const& scan) const
+ {
+ typedef typename parser_result<ParserT, ScannerT>::type result_t;
+- typedef typename ScannerT::iterator_t iterator_t;
+
+ result_t hit = this->subject().parse(scan);
+ if (!hit)
+--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp
+@@ -49,8 +49,6 @@
+ typename parser_result<self_t, ScannerT>::type
+ parse(ScannerT const& scan) const
+ {
+- typedef typename parser_result<self_t, ScannerT>::type result_t;
+- typedef typename ScannerT::value_t value_t;
+ typedef typename ScannerT::iterator_t iterator_t;
+
+ iterator_t const s(scan.first);
commit f01281a363a3f2d1c08d224ff39ebc5f5f6c000e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Mar 8 10:36:44 2013 +0100
Work around GCC 4.8 -Werror=unused-local-typedefs in boost
(cherry picked from commit 6bea5311d70f518444fe3218cf0b6f49bd93cc34)
Conflicts:
boost/UnpackedTarball_boost.mk
Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk
index 0682306..262fbec 100644
--- a/boost/UnpackedTarball_boost.mk
+++ b/boost/UnpackedTarball_boost.mk
@@ -53,6 +53,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch
# in GCC-4.7 experimental":
boost_patches += boost_1_44_0-gthreads.patch
+boost_patches += boost_1_44_0-gcc4.8.patch
+
boost_patches += boost.ptree.patch
$(eval $(call gb_UnpackedTarball_UnpackedTarball,boost))
diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch
new file mode 100644
index 0000000..9fc603e
--- /dev/null
+++ b/boost/boost_1_44_0-gcc4.8.patch
@@ -0,0 +1,24 @@
+--- misc/boost_1_44_0/boost/bind/arg.hpp
++++ misc/build/boost_1_44_0/boost/bind/arg.hpp
+@@ -35,6 +35,8 @@
+ {
+ // static assert I == is_placeholder<T>::value
+ typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ];
++ T_must_be_placeholder dummy; (void) dummy;
++ // silence -Werror=unused-local-typedefs (GCC 4.8)
+ }
+ };
+
+--- misc/boost_1_44_0/boost/concept/detail/general.hpp
++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp
+@@ -68,7 +68,9 @@
+ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \
+ typedef ::boost::concepts::detail::instantiate< \
+ &::boost::concepts::requirement_<ModelFnPtr>::failed> \
+- BOOST_PP_CAT(boost_concept_check,__LINE__)
++ BOOST_PP_CAT(boost_concept_check,__LINE__); \
++ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)()
++ // silence -Werror=unused-local-typedefs (GCC 4.8)
+
+ }}
+
More information about the Libreoffice-commits
mailing list