View | Details | Raw Unified | Return to issue 121585
Collapse All | Expand All

(-)a/main/basebmp/source/intconversion.hxx (-2 / +2 lines)
Lines 55-62 namespace basebmp Link Here
55
    /// Get converter from given data type to sal_uInt32
55
    /// Get converter from given data type to sal_uInt32
56
    template< typename DataType > struct uInt32Converter
56
    template< typename DataType > struct uInt32Converter
57
    {
57
    {
58
        typedef std::identity<DataType> to;
58
        typedef std_identity<DataType> to;
59
        typedef std::identity<DataType> from;
59
        typedef std_identity<DataType> from;
60
    };
60
    };
61
    template< unsigned int RedIndex, 
61
    template< unsigned int RedIndex, 
62
              unsigned int GreenIndex, 
62
              unsigned int GreenIndex, 
(-)a/main/boost/makefile.mk (+1 lines)
Lines 115-120 $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) Link Here
115
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda $(INCCOM)$/$(PRJNAME)
115
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/lambda $(INCCOM)$/$(PRJNAME)
116
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic $(INCCOM)$/$(PRJNAME)
116
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/logic $(INCCOM)$/$(PRJNAME)
117
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math $(INCCOM)$/$(PRJNAME)
117
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/math $(INCCOM)$/$(PRJNAME)
118
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/move $(INCCOM)$/$(PRJNAME)
118
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi $(INCCOM)$/$(PRJNAME)
119
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpi $(INCCOM)$/$(PRJNAME)
119
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
120
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/mpl $(INCCOM)$/$(PRJNAME)
120
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm $(INCCOM)$/$(PRJNAME)
121
    @$(GNUCOPY) -R $(PACKAGE_DIR)$/$(TARFILE_NAME)$/boost$/msm $(INCCOM)$/$(PRJNAME)
(-)a/main/boost/prj/d.lst (-1 / +2 lines)
Lines 1037-1044 mkdir: %_DEST%\inc%_EXT%\boost\xpressive\traits\detail Link Here
1037
..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc%_EXT%\boost\math\special_functions\detail
1037
..\%__SRC%\inc\boost\math\special_functions\detail\* %_DEST%\inc%_EXT%\boost\math\special_functions\detail
1038
..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools
1038
..\%__SRC%\inc\boost\math\tools\* %_DEST%\inc%_EXT%\boost\math\tools
1039
..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail
1039
..\%__SRC%\inc\boost\math\tools\detail\* %_DEST%\inc%_EXT%\boost\math\tools\detail
1040
..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
1040
..\%__SRC%\inc\boost\move\* %_DEST%\inc%_EXT%\boost\move
1041
..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
1041
..\%__SRC%\inc\boost\mpi\* %_DEST%\inc%_EXT%\boost\mpi
1042
..\%__SRC%\inc\boost\mpi\collectives\* %_DEST%\inc%_EXT%\boost\mpi\collectives
1042
..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
1043
..\%__SRC%\inc\boost\mpi\detail\* %_DEST%\inc%_EXT%\boost\mpi\detail
1043
..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc%_EXT%\boost\mpi\python
1044
..\%__SRC%\inc\boost\mpi\python\* %_DEST%\inc%_EXT%\boost\mpi\python
1044
..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config
1045
..\%__SRC%\inc\boost\mpl\aux_\config\* %_DEST%\inc%_EXT%\boost\mpl\aux_\config
(-)a/main/cppu/source/uno/EnvStack.cxx (-1 / +2 lines)
Lines 80-86 static void s_setCurrent(uno_Environment * pEnv) Link Here
80
	else
80
	else
81
	{
81
	{
82
		ThreadMap::iterator iEnv = s_threadMap.find(threadId);
82
		ThreadMap::iterator iEnv = s_threadMap.find(threadId);
83
		s_threadMap.erase(iEnv);
83
		if( iEnv != s_threadMap.end())
84
			s_threadMap.erase(iEnv);
84
	}
85
	}
85
}
86
}
86
87
(-)a/main/dbaccess/source/ui/browser/genericcontroller.cxx (-1 / +1 lines)
Lines 1665-1671 Sequence< DispatchInformation > SAL_CALL OGenericUnoController::getConfigurableD Link Here
1665
    ::std::transform( aInformationList.begin(),
1665
    ::std::transform( aInformationList.begin(),
1666
        aInformationList.end(),
1666
        aInformationList.end(),
1667
        aInformation.getArray(),
1667
        aInformation.getArray(),
1668
        ::std::identity< DispatchInformation >()
1668
        std_identity< DispatchInformation >()
1669
    );
1669
    );
1670
1670
1671
    return aInformation;
1671
    return aInformation;
(-)a/main/external_deps.lst (-18 lines)
Lines 168-191 if ( true ) Link Here
168
    URL1 = http://archive.apache.org/dist/apr/$(name)
168
    URL1 = http://archive.apache.org/dist/apr/$(name)
169
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
169
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
170
170
171
if ( true )
172
    MD5 = c441926f3a552ed3e5b274b62e86af16
173
    name = STLport-4.0.tar.gz
174
    # This seems to be the original host, but the MD5 sum does not match.
175
    # URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.0.tar.gz/download
176
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
177
178
if ( true )
179
    MD5 = 18f577b374d60b3c760a3a3350407632
180
    name = STLport-4.5.tar.gz
181
    URL1 = http://sourceforge.net/projects/stlport/files/STLport%20archive/STLport%204/STLport-4.5.tar.gz/download
182
    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
183
184
if ( true )
185
    MD5 = 7376930b0d3f3d77a685d94c4a3acda8
186
    name = STLport-4.5-0119.tar.gz
187
    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
188
189
if (SYSTEM_LIBXML != YES)
171
if (SYSTEM_LIBXML != YES)
190
    MD5 = 8127a65e8c3b08856093099b52599c86
172
    MD5 = 8127a65e8c3b08856093099b52599c86
191
    name = libxml2-2.7.8.tar.gz
173
    name = libxml2-2.7.8.tar.gz
(-)a/main/i18npool/source/localedata/LocaleNode.cxx (-6 / +6 lines)
Lines 158-184 LocaleNode* LocaleNode::createNode (const OUString& name, const Reference< XAttr Link Here
158
158
159
#define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr())
159
#define OSTR(s) (OUStringToOString( (s), RTL_TEXTENCODING_UTF8).getStr())
160
160
161
void print_OUString( const OUString& s )
161
static void print_OUString( const OUString& s )
162
{
162
{
163
    printf( "%s", OSTR(s));
163
    printf( "%s", OSTR(s));
164
}
164
}
165
165
166
bool is_empty( const OUString& s )
166
static bool is_empty_string( const OUString& s )
167
{
167
{
168
     return (s.getLength()==0) || (s.getLength()==1 && s[0]=='\n');
168
     return (s.getLength()==0) || (s.getLength()==1 && s[0]=='\n');
169
}
169
}
170
170
171
void print_indent( int depth )
171
static void print_indent( int depth )
172
{
172
{
173
     for( int i=0; i<depth; i++ ) printf("    ");
173
     for( int i=0; i<depth; i++ ) printf("    ");
174
}
174
}
175
175
176
void print_color( int color )
176
static void print_color( int color )
177
{
177
{
178
     printf("\033[%dm", color);
178
     printf("\033[%dm", color);
179
}
179
}
180
180
181
void print_node( const LocaleNode* p, int depth=0 )
181
static void print_node( const LocaleNode* p, int depth=0 )
182
{
182
{
183
     if( !p ) return;
183
     if( !p ) return;
184
184
Lines 206-212 void print_node( const LocaleNode* p, int depth=0 ) Link Here
206
     }
206
     }
207
     printf(">");
207
     printf(">");
208
     printf("\n");
208
     printf("\n");
209
     if( !is_empty( p->getValue() ) )
209
     if( !is_empty_string( p->getValue() ) )
210
     {
210
     {
211
          print_indent( depth+1 );
211
          print_indent( depth+1 );
212
          printf("value: ");
212
          printf("value: ");
(-)a/main/io/source/acceptor/acc_socket.cxx (-3 / +3 lines)
Lines 66-72 namespace io_acceptor { Link Here
66
	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, 
66
	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, 
67
                             ReferenceHash< ::com::sun::star::io::XStreamListener>, 
67
                             ReferenceHash< ::com::sun::star::io::XStreamListener>, 
68
                             ReferenceEqual< ::com::sun::star::io::XStreamListener> >
68
                             ReferenceEqual< ::com::sun::star::io::XStreamListener> >
69
	        XStreamListener_hash_set;
69
	        XStreamListener_unordered_set;
70
70
71
71
72
	class SocketConnection : public ::cppu::WeakImplHelper2< 
72
	class SocketConnection : public ::cppu::WeakImplHelper2< 
Lines 112-124 namespace io_acceptor { Link Here
112
		sal_Bool     _started;
112
		sal_Bool     _started;
113
		sal_Bool     _closed;
113
		sal_Bool     _closed;
114
		sal_Bool     _error;
114
		sal_Bool     _error;
115
		XStreamListener_hash_set _listeners;
115
		XStreamListener_unordered_set _listeners;
116
	};
116
	};
117
117
118
	template<class T>
118
	template<class T>
119
	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)
119
	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)
120
	{
120
	{
121
  		XStreamListener_hash_set listeners;
121
  		XStreamListener_unordered_set listeners;
122
122
123
		{
123
		{
124
			::osl::MutexGuard guard(pCon->_mutex);
124
			::osl::MutexGuard guard(pCon->_mutex);
(-)a/main/io/source/connector/connector.hxx (-2 / +2 lines)
Lines 58-64 namespace stoc_connector Link Here
58
	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, 
58
	typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, 
59
                             ReferenceHash< ::com::sun::star::io::XStreamListener>, 
59
                             ReferenceHash< ::com::sun::star::io::XStreamListener>, 
60
                             ReferenceEqual< ::com::sun::star::io::XStreamListener> >
60
                             ReferenceEqual< ::com::sun::star::io::XStreamListener> >
61
	        XStreamListener_hash_set;
61
	        XStreamListener_unordered_set;
62
62
63
	class PipeConnection :
63
	class PipeConnection :
64
		public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection >
64
		public ::cppu::WeakImplHelper1< ::com::sun::star::connection::XConnection >
Lines 133-139 namespace stoc_connector Link Here
133
		sal_Bool     _closed;
133
		sal_Bool     _closed;
134
		sal_Bool     _error;
134
		sal_Bool     _error;
135
135
136
  		XStreamListener_hash_set _listeners;
136
  		XStreamListener_unordered_set _listeners;
137
	};
137
	};
138
}
138
}
139
139
(-)a/main/io/source/connector/ctr_socket.cxx (-1 / +1 lines)
Lines 39-45 namespace stoc_connector { Link Here
39
	template<class T>
39
	template<class T>
40
	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)
40
	void notifyListeners(SocketConnection * pCon, sal_Bool * notified, T t)
41
	{
41
	{
42
  		XStreamListener_hash_set listeners;
42
  		XStreamListener_unordered_set listeners;
43
43
44
		{
44
		{
45
			::osl::MutexGuard guard(pCon->_mutex);
45
			::osl::MutexGuard guard(pCon->_mutex);
(-)a/main/rsc/source/rsc/rsc.cxx (-1 / +1 lines)
Lines 1298-1304 void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, Link Here
1298
                                aBaseFileName += ByteString::CreateFromInt32( 0 );
1298
                                aBaseFileName += ByteString::CreateFromInt32( 0 );
1299
1299
1300
                            if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) )
1300
                            if( GetImageFilePath( rOutputFile, rContext, aBaseFileName += aLine , aFilePath, pSysListFile ) )
1301
                                aEntryVector.push_back( ::std::make_pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );
1301
                                aEntryVector.push_back( ::std::pair< ByteString, sal_Int32 >( aFilePath, nNumber ) );
1302
                            else
1302
                            else
1303
                                aMissingImages.push_back( aBaseFileName );
1303
                                aMissingImages.push_back( aBaseFileName );
1304
                        }
1304
                        }
(-)a/main/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx (-1 / +1 lines)
Lines 189-195 void MasterPageObserver::Implementation::RegisterDocument ( Link Here
189
    SdDrawDocument& rDocument)
189
    SdDrawDocument& rDocument)
190
{
190
{
191
    // Gather the names of all the master pages in the given document.
191
    // Gather the names of all the master pages in the given document.
192
    MasterPageContainer::data_type aMasterPageSet;
192
    MasterPageContainer::mapped_type aMasterPageSet;
193
    sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
193
    sal_uInt16 nMasterPageCount = rDocument.GetMasterSdPageCount(PK_STANDARD);
194
    for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
194
    for (sal_uInt16 nIndex=0; nIndex<nMasterPageCount; nIndex++)
195
    {
195
    {
(-)a/main/slideshow/source/engine/animationfactory.cxx (-3 / +3 lines)
Lines 603-609 namespace slideshow Link Here
603
            {
603
            {
604
                return ::boost::shared_ptr< AnimationBase >( 
604
                return ::boost::shared_ptr< AnimationBase >( 
605
                    new GenericAnimation< AnimationBase, 
605
                    new GenericAnimation< AnimationBase, 
606
                    					  ::std::identity< typename AnimationBase::ValueType > >( 
606
                                              std_identity< typename AnimationBase::ValueType > >( 
607
                                              rShapeManager,
607
                                              rShapeManager,
608
                                              nFlags,
608
                                              nFlags,
609
                                              pIsValid,
609
                                              pIsValid,
Lines 611-618 namespace slideshow Link Here
611
                                              pGetValue,
611
                                              pGetValue,
612
                                              pSetValue,
612
                                              pSetValue,
613
                                              // no modification necessary, use identity functor here
613
                                              // no modification necessary, use identity functor here
614
                                              ::std::identity< typename AnimationBase::ValueType >(),
614
                                              std_identity< typename AnimationBase::ValueType >(),
615
                                              ::std::identity< typename AnimationBase::ValueType >() ) );
615
                                              std_identity< typename AnimationBase::ValueType >()));
616
            }
616
            }
617
617
618
            class Scaler
618
            class Scaler
(-)a/main/solenv/gbuild/platform/linux.mk (+1 lines)
Lines 83-88 gb_CFLAGS := \ Link Here
83
	-pipe \
83
	-pipe \
84
84
85
gb_CXXFLAGS := \
85
gb_CXXFLAGS := \
86
	-std=c++11 \
86
	-Wall \
87
	-Wall \
87
	-Wendif-labels \
88
	-Wendif-labels \
88
	-Wextra \
89
	-Wextra \
(-)a/main/solenv/inc/unxlng.mk (-20 / +3 lines)
Lines 39-45 JAVAFLAGSDEBUG=-g Link Here
39
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
39
#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
40
40
41
# _PTHREADS is needed for the stl
41
# _PTHREADS is needed for the stl
42
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
42
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
43
CDEFS+=-DBOOST_DETAIL_NO_CONTAINER_FWD
43
44
44
# enable visibility define in "sal/types.h"
45
# enable visibility define in "sal/types.h"
45
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
46
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
Lines 83-89 CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs Link Here
83
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
84
CFLAGS_NO_EXCEPTIONS=-fno-exceptions
84
85
85
# -fpermissive should be removed as soon as possible
86
# -fpermissive should be removed as soon as possible
86
CFLAGSCXX= -pipe $(ARCH_FLAGS)
87
CFLAGSCXX= -std=c++11 -pipe $(ARCH_FLAGS)
87
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
88
.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
88
CFLAGSCXX += -fvisibility-inlines-hidden
89
CFLAGSCXX += -fvisibility-inlines-hidden
89
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
90
.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
Lines 221-244 X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed Link Here
221
222
222
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
223
LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
223
224
224
.IF "$(USE_STLP_DEBUG)" != ""
225
.IF "$(STLPORT_VER)" >= "500"
226
LIBSTLPORT=$(DYNAMIC) -lstlportstlg
227
LIBSTLPORTST=$(STATIC) -lstlportstlg $(DYNAMIC)
228
.ELSE
229
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc_stldebug
230
LIBSTLPORTST=$(STATIC) -lstlport_gcc_stldebug $(DYNAMIC)
231
.ENDIF
232
.ELSE # "$(USE_STLP_DEBUG)" != ""
233
.IF "$(STLPORT_VER)" >= "500"
234
LIBSTLPORT=$(DYNAMIC) -lstlport
235
LIBSTLPORTST=$(STATIC) -lstlport $(DYNAMIC)
236
.ELSE
237
LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
238
LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
239
.ENDIF
240
.ENDIF # "$(USE_STLP_DEBUG)" != ""
241
242
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
225
#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
243
226
244
# name of library manager
227
# name of library manager
(-)a/main/stlport/systemstl/functional (+2 lines)
Lines 52-56 namespace std Link Here
52
# error UNSUPPORTED COMPILER
52
# error UNSUPPORTED COMPILER
53
#endif
53
#endif
54
54
55
template< typename T> struct std_identity { T operator() (const T& v) const { return v; }; };
56
55
#endif
57
#endif
56
/* vi:set tabstop=4 shiftwidth=4 expandtab: */
58
/* vi:set tabstop=4 shiftwidth=4 expandtab: */
(-)a/main/svl/inc/svl/itemset.hxx (-4 lines)
Lines 25-35 Link Here
25
25
26
#include "svl/svldllapi.h"
26
#include "svl/svldllapi.h"
27
27
28
#if STLPORT_VERSION<321
29
#include <stdarg.h>
30
#else
31
#include <cstdarg> 	// std::va_list and friends
28
#include <cstdarg> 	// std::va_list and friends
32
#endif
33
#include <svl/poolitem.hxx>
29
#include <svl/poolitem.hxx>
34
#include <tools/rtti.hxx>
30
#include <tools/rtti.hxx>
35
#include <tools/solar.h>
31
#include <tools/solar.h>
(-)a/main/svl/source/items/itemset.cxx (-3 lines)
Lines 25-34 Link Here
25
#include "precompiled_svl.hxx"
25
#include "precompiled_svl.hxx"
26
26
27
#include <string.h>
27
#include <string.h>
28
29
#if STLPORT_VERSION>=321
30
#include <cstdarg>
28
#include <cstdarg>
31
#endif
32
29
33
#define _SVSTDARR_USHORTS
30
#define _SVSTDARR_USHORTS
34
#define _SVSTDARR_ULONGS
31
#define _SVSTDARR_ULONGS
(-)a/main/sw/source/ui/app/appenv.cxx (-4 lines)
Lines 24-34 Link Here
24
// MARKER(update_precomp.py): autogen include statement, do not remove
24
// MARKER(update_precomp.py): autogen include statement, do not remove
25
#include "precompiled_sw.hxx"
25
#include "precompiled_sw.hxx"
26
26
27
28
#if STLPORT_VERSION>=321
29
#include <cstdarg>
27
#include <cstdarg>
30
#endif
31
32
28
33
#include <hintids.hxx>
29
#include <hintids.hxx>
34
30
(-)a/main/sw/source/ui/app/applab.cxx (-4 lines)
Lines 24-34 Link Here
24
// MARKER(update_precomp.py): autogen include statement, do not remove
24
// MARKER(update_precomp.py): autogen include statement, do not remove
25
#include "precompiled_sw.hxx"
25
#include "precompiled_sw.hxx"
26
26
27
28
#if STLPORT_VERSION>=321
29
#include <cstdarg>
27
#include <cstdarg>
30
#endif
31
32
28
33
#include <hintids.hxx>
29
#include <hintids.hxx>
34
30
(-)a/main/sw/source/ui/dbui/dbmgr.cxx (-3 / +2 lines)
Lines 23-33 Link Here
23
23
24
// MARKER(update_precomp.py): autogen include statement, do not remove
24
// MARKER(update_precomp.py): autogen include statement, do not remove
25
#include "precompiled_sw.hxx"
25
#include "precompiled_sw.hxx"
26
#if STLPORT_VERSION>=321
26
27
#include <cstdarg>
27
#include <cstdarg>
28
#endif
28
#include <cstdio>
29
29
30
#include <stdio.h>
31
#include <unotxdoc.hxx>
30
#include <unotxdoc.hxx>
32
#include <com/sun/star/text/NotePrintMode.hpp>
31
#include <com/sun/star/text/NotePrintMode.hpp>
33
#include <sfx2/app.hxx>
32
#include <sfx2/app.hxx>
(-)a/main/sw/source/ui/shells/textsh2.cxx (-4 lines)
Lines 24-34 Link Here
24
// MARKER(update_precomp.py): autogen include statement, do not remove
24
// MARKER(update_precomp.py): autogen include statement, do not remove
25
#include "precompiled_sw.hxx"
25
#include "precompiled_sw.hxx"
26
26
27
28
29
#if STLPORT_VERSION>=321
30
#include <cstdarg>
27
#include <cstdarg>
31
#endif
32
28
33
#include <svtools/svmedit.hxx>
29
#include <svtools/svmedit.hxx>
34
#include <svl/eitem.hxx>
30
#include <svl/eitem.hxx>
(-)a/main/sw/source/ui/uiview/viewprt.cxx (-2 lines)
Lines 26-34 Link Here
26
26
27
#include <com/sun/star/text/NotePrintMode.hpp>
27
#include <com/sun/star/text/NotePrintMode.hpp>
28
28
29
#if STLPORT_VERSION>=321
30
#include <cstdarg>
29
#include <cstdarg>
31
#endif
32
30
33
#ifndef _CMDID_H
31
#ifndef _CMDID_H
34
#include <cmdid.h>
32
#include <cmdid.h>
(-)a/main/sw/source/ui/wrtsh/wrtsh1.cxx (-2 lines)
Lines 33-41 Link Here
33
#include <com/sun/star/chart2/XChartDocument.hpp>
33
#include <com/sun/star/chart2/XChartDocument.hpp>
34
#include <com/sun/star/util/XModifiable.hpp>
34
#include <com/sun/star/util/XModifiable.hpp>
35
35
36
#if STLPORT_VERSION>=321
37
#include <math.h>	// prevent conflict between exception and std::exception
36
#include <math.h>	// prevent conflict between exception and std::exception
38
#endif
39
#include <hintids.hxx>
37
#include <hintids.hxx>
40
#include <svx/svdview.hxx>
38
#include <svx/svdview.hxx>
41
#include <sot/factory.hxx>
39
#include <sot/factory.hxx>
(-)a/main/unotools/source/config/cmdoptions.cxx (-1 / +1 lines)
Lines 102-108 class SvtCmdOptions Link Here
102
102
103
        void SetContainerSize( sal_Int32 nSize )
103
        void SetContainerSize( sal_Int32 nSize )
104
		{
104
		{
105
			m_aCommandHashMap.resize( nSize );
105
			m_aCommandHashMap.rehash( nSize );
106
		}
106
		}
107
107
108
		sal_Bool Lookup( const OUString& aCmd ) const
108
		sal_Bool Lookup( const OUString& aCmd ) const
(-)a/main/unotools/source/config/inetoptions.cxx (-15 / +6 lines)
Lines 207-219 void Link Here
207
SvtInetOptions::Impl::notifyListeners(
207
SvtInetOptions::Impl::notifyListeners(
208
    star::uno::Sequence< rtl::OUString > const & rKeys)
208
    star::uno::Sequence< rtl::OUString > const & rKeys)
209
{
209
{
210
	typedef
210
		typedef std::pair< star::uno::Reference< star::beans::XPropertiesChangeListener >,
211
        std::vector< std::pair< star::uno::Reference<
211
		                   star::uno::Sequence< star::beans::PropertyChangeEvent > > Listen2EventPair;
212
                                    star::beans::XPropertiesChangeListener >,
212
		typedef std::vector< Listen2EventPair > NotificationList;
213
                                star::uno::Sequence<
213
	NotificationList aNotifications;
214
                                    star::beans::PropertyChangeEvent > > >
215
    List;
216
	List aNotifications;
217
	{
214
	{
218
		osl::MutexGuard aGuard(m_aMutex);
215
		osl::MutexGuard aGuard(m_aMutex);
219
		aNotifications.reserve(m_aListeners.size());
216
		aNotifications.reserve(m_aListeners.size());
Lines 240-255 SvtInetOptions::Impl::notifyListeners( Link Here
240
				}
237
				}
241
			}
238
			}
242
			if (nCount > 0)
239
			if (nCount > 0)
243
			{
240
				aNotifications.push_back( Listen2EventPair( aIt->first, aEvents));
244
				aEvents.realloc(nCount);
245
				aNotifications.
246
					push_back(std::make_pair< List::value_type::first_type,
247
							                  List::value_type::second_type >(
248
								  aIt->first, aEvents));
249
			}
250
		}
241
		}
251
	}
242
	}
252
	for (List::size_type i = 0; i < aNotifications.size(); ++i)
243
	for (NotificationList::size_type i = 0; i < aNotifications.size(); ++i)
253
		if (aNotifications[i].first.is())
244
		if (aNotifications[i].first.is())
254
			aNotifications[i].first->
245
			aNotifications[i].first->
255
				propertiesChange(aNotifications[i].second);
246
				propertiesChange(aNotifications[i].second);
(-)a/main/vcl/source/gdi/configsettings.cxx (-1 / +1 lines)
Lines 131-137 void SettingsConfigItem::getValues() Link Here
131
    m_aSettings.clear();
131
    m_aSettings.clear();
132
132
133
    Sequence< OUString > aNames( GetNodeNames( OUString() ) );
133
    Sequence< OUString > aNames( GetNodeNames( OUString() ) );
134
    m_aSettings.resize( aNames.getLength() );
134
    m_aSettings.rehash( aNames.getLength() );
135
135
136
    for( int j = 0; j < aNames.getLength(); j++ )
136
    for( int j = 0; j < aNames.getLength(); j++ )
137
    {
137
    {
(-)a/main/vcl/unx/generic/gdi/salgdi3.cxx (-1 / +1 lines)
Lines 131-137 void PspKernInfo::Initialize() const Link Here
131
        return;
131
        return;
132
132
133
    // feed psprint's kerning list into a lookup-friendly container
133
    // feed psprint's kerning list into a lookup-friendly container
134
    maUnicodeKernPairs.resize( rKernPairs.size() );
134
    maUnicodeKernPairs.rehash( rKernPairs.size() );
135
    PspKernPairs::const_iterator it = rKernPairs.begin();
135
    PspKernPairs::const_iterator it = rKernPairs.begin();
136
    for(; it != rKernPairs.end(); ++it )
136
    for(; it != rKernPairs.end(); ++it )
137
    {
137
    {
(-)a/main/vcl/unx/headless/svptext.cxx (-1 / +1 lines)
Lines 189-195 void PspKernInfo::Initialize() const Link Here
189
        return;
189
        return;
190
190
191
    // feed psprint's kerning list into a lookup-friendly container
191
    // feed psprint's kerning list into a lookup-friendly container
192
    maUnicodeKernPairs.resize( rKernPairs.size() );
192
    maUnicodeKernPairs.rehash( rKernPairs.size() );
193
    PspKernPairs::const_iterator it = rKernPairs.begin();
193
    PspKernPairs::const_iterator it = rKernPairs.begin();
194
    for(; it != rKernPairs.end(); ++it )
194
    for(; it != rKernPairs.end(); ++it )
195
    {
195
    {
(-)a/main/xmloff/source/transform/EventOASISTContext.cxx (-1 / +1 lines)
Lines 63-69 XMLTransformerOASISEventMap_Impl::XMLTransformerOASISEventMap_Impl( XMLTransform Link Here
63
	if( pInit )
63
	if( pInit )
64
	{
64
	{
65
		XMLTransformerOASISEventMap_Impl::key_type aKey;
65
		XMLTransformerOASISEventMap_Impl::key_type aKey;
66
		XMLTransformerOASISEventMap_Impl::data_type aData;
66
		XMLTransformerOASISEventMap_Impl::mapped_type aData;
67
		while( pInit->m_pOASISName )
67
		while( pInit->m_pOASISName )
68
		{
68
		{
69
			aKey.m_nPrefix = pInit->m_nOASISPrefix;
69
			aKey.m_nPrefix = pInit->m_nOASISPrefix;
(-)a/main/xmloff/source/transform/EventOOoTContext.cxx (-1 / +1 lines)
Lines 62-68 public: Link Here
62
void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
62
void XMLTransformerOOoEventMap_Impl::AddMap( XMLTransformerEventMapEntry *pInit )
63
{
63
{
64
	XMLTransformerOOoEventMap_Impl::key_type aKey;
64
	XMLTransformerOOoEventMap_Impl::key_type aKey;
65
	XMLTransformerOOoEventMap_Impl::data_type aData;
65
	XMLTransformerOOoEventMap_Impl::mapped_type aData;
66
	while( pInit->m_pOOoName )
66
	while( pInit->m_pOOoName )
67
	{
67
	{
68
		aKey = OUString::createFromAscii(pInit->m_pOOoName);
68
		aKey = OUString::createFromAscii(pInit->m_pOOoName);
(-)a/main/xmloff/source/transform/TransformerActions.cxx (-2 / +2 lines)
Lines 37-43 XMLTransformerActions::XMLTransformerActions( XMLTransformerActionInit *pInit ) Link Here
37
	if( pInit )
37
	if( pInit )
38
	{
38
	{
39
		XMLTransformerActions::key_type aKey;
39
		XMLTransformerActions::key_type aKey;
40
		XMLTransformerActions::data_type aData;
40
		XMLTransformerActions::mapped_type aData;
41
		while( pInit->m_nActionType != XML_TACTION_EOT )
41
		while( pInit->m_nActionType != XML_TACTION_EOT )
42
		{
42
		{
43
			aKey.m_nPrefix = pInit->m_nPrefix;
43
			aKey.m_nPrefix = pInit->m_nPrefix;
Lines 66-72 void XMLTransformerActions::Add( XMLTransformerActionInit *pInit ) Link Here
66
	if( pInit )
66
	if( pInit )
67
	{
67
	{
68
		XMLTransformerActions::key_type aKey;
68
		XMLTransformerActions::key_type aKey;
69
		XMLTransformerActions::data_type aData;
69
		XMLTransformerActions::mapped_type aData;
70
		while( pInit->m_nActionType != XML_TACTION_EOT )
70
		while( pInit->m_nActionType != XML_TACTION_EOT )
71
		{
71
		{
72
			aKey.m_nPrefix = pInit->m_nPrefix;
72
			aKey.m_nPrefix = pInit->m_nPrefix;

Return to issue 121585