openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1409876 - in /incubator/ooo/branches/alg/aw080/main: connectivity/source/drivers/dbase/ desktop/source/app/ desktop/source/migration/services/ desktop/source/splash/ extensions/source/scanner/ filter/inc/filter/msfilter/ filter/source/msfi...
Date Thu, 15 Nov 2012 16:46:22 GMT
Author: alg
Date: Thu Nov 15 16:46:12 2012
New Revision: 1409876

URL: http://svn.apache.org/viewvc?rev=1409876&view=rev
Log:
Adaptions to unxlngx6 build

Modified:
    incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/DIndex.cxx
    incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/dindexnode.cxx
    incubator/ooo/branches/alg/aw080/main/desktop/source/app/officeipcthread.cxx
    incubator/ooo/branches/alg/aw080/main/desktop/source/migration/services/wordbookmigration.cxx
    incubator/ooo/branches/alg/aw080/main/desktop/source/splash/services_spl.cxx
    incubator/ooo/branches/alg/aw080/main/extensions/source/scanner/grid.cxx
    incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx
    incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/dffpropset.cxx
    incubator/ooo/branches/alg/aw080/main/framework/source/uielement/spinfieldtoolbarcontroller.cxx
    incubator/ooo/branches/alg/aw080/main/idl/source/prj/svidl.cxx
    incubator/ooo/branches/alg/aw080/main/l10ntools/inc/export.hxx
    incubator/ooo/branches/alg/aw080/main/padmin/source/cmddlg.cxx
    incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/column3.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markarr.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markdata.cxx
    incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
    incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/zoomlist.cxx
    incubator/ooo/branches/alg/aw080/main/sot/source/sdstor/ucbstorage.cxx
    incubator/ooo/branches/alg/aw080/main/svtools/bmpmaker/bmp.cxx
    incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer.cxx
    incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer2.cxx
    incubator/ooo/branches/alg/aw080/main/svx/Library_svx.mk
    incubator/ooo/branches/alg/aw080/main/svx/Library_svxcore.mk
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/EnhancedCustomShape2d.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdrobjectfactory.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoattr.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoprov.hxx
    incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx
    incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/dialog/rlrcitem.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedxv.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdhdl.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxat.cxx
    incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/tableshape.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoCore.hxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoDraw.hxx
    incubator/ooo/branches/alg/aw080/main/sw/source/core/text/txtfly.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par4.cxx
    incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8struc.hxx
    incubator/ooo/branches/alg/aw080/main/tools/source/generic/poly2.cxx
    incubator/ooo/branches/alg/aw080/main/unotools/source/ucbhelper/ucblockbytes.cxx
    incubator/ooo/branches/alg/aw080/main/vcl/source/control/field2.cxx
    incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx
    incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/jobset.cxx
    incubator/ooo/branches/alg/aw080/main/vcl/source/window/winproc.cxx
    incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/jobdata.cxx
    incubator/ooo/branches/alg/aw080/main/xmloff/source/draw/ximpshap.cxx

Modified: incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/DIndex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/DIndex.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/DIndex.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/DIndex.cxx Thu Nov 15 16:46:12 2012
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
 #include "dbase/DIndex.hxx"
@@ -46,6 +44,7 @@
 #include <comphelper/types.hxx>
 #include "resource/dbase_res.hrc"
 #include <unotools/sharedunocomponent.hxx>
+#include <memory.h>
 
 using namespace ::comphelper;
 // -------------------------------------------------------------------------

Modified: incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/dindexnode.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/dindexnode.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/dindexnode.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/connectivity/source/drivers/dbase/dindexnode.cxx Thu Nov 15 16:46:12 2012
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
 #include "dbase/dindexnode.hxx"
@@ -29,9 +27,8 @@
 #include "dbase/DIndex.hxx"
 #include <tools/debug.hxx>
 #include "diagnose_ex.h"
-
 #include <algorithm>
-
+#include <memory.h>
 
 using namespace connectivity;
 using namespace connectivity::dbase;

Modified: incubator/ooo/branches/alg/aw080/main/desktop/source/app/officeipcthread.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/desktop/source/app/officeipcthread.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/desktop/source/app/officeipcthread.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/desktop/source/app/officeipcthread.cxx Thu Nov 15 16:46:12 2012
@@ -47,6 +47,7 @@
 #include "osl/file.hxx"
 #include "rtl/process.h"
 #include "tools/getprocessworkingdir.hxx"
+#include <string.h>
 
 using namespace vos;
 using namespace rtl;

Modified: incubator/ooo/branches/alg/aw080/main/desktop/source/migration/services/wordbookmigration.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/desktop/source/migration/services/wordbookmigration.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/desktop/source/migration/services/wordbookmigration.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/desktop/source/migration/services/wordbookmigration.cxx Thu Nov 15 16:46:12 2012
@@ -27,6 +27,7 @@
 #include <tools/urlobj.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/ucbstreamhelper.hxx>
+#include <string.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;

Modified: incubator/ooo/branches/alg/aw080/main/desktop/source/splash/services_spl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/desktop/source/splash/services_spl.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/desktop/source/splash/services_spl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/desktop/source/splash/services_spl.cxx Thu Nov 15 16:46:12 2012
@@ -29,6 +29,7 @@
 #include <uno/environment.h>
 #include <cppuhelper/factory.hxx>
 #include <unotools/configmgr.hxx>
+#include <string.h>
 
 #include "splash.hxx"
 #include "firststart.hxx"

Modified: incubator/ooo/branches/alg/aw080/main/extensions/source/scanner/grid.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/extensions/source/scanner/grid.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/extensions/source/scanner/grid.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/extensions/source/scanner/grid.cxx Thu Nov 15 16:46:12 2012
@@ -31,9 +31,8 @@
 #include <cmath>
 #undef _USE_MATH_DEFINES
 
+#include <memory.h>
 #include <grid.hxx>
-
-// for ::std::sort
 #include <algorithm>
 
 ResId SaneResId( sal_uInt32 );

Modified: incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/inc/filter/msfilter/escherex.hxx Thu Nov 15 16:46:12 2012
@@ -1157,7 +1157,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyC
 {
 		EscherGraphicProvider*	pGraphicProvider;
 		SvStream*				pPicOutStrm;
-        basegfx::B2DRange*      mpObjectRange;
+        basegfx::B2DRange*      mpObjectRange; // TTTT: think about making this a member to be able to hand over a const&
 		EscherPropSortStruct*	pSortStruct;
 
 		sal_uInt32				nSortCount;

Modified: incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/dffpropset.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/dffpropset.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/dffpropset.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/filter/source/msfilter/dffpropset.cxx Thu Nov 15 16:46:12 2012
@@ -25,6 +25,7 @@
 
 #include <filter/msfilter/dffpropset.hxx> 
 #include <rtl/ustrbuf.hxx>
+#include <memory.h>
 
 static const DffPropSetEntry mso_PropSetDefaults[] = { 
 

Modified: incubator/ooo/branches/alg/aw080/main/framework/source/uielement/spinfieldtoolbarcontroller.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/framework/source/uielement/spinfieldtoolbarcontroller.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/framework/source/uielement/spinfieldtoolbarcontroller.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/framework/source/uielement/spinfieldtoolbarcontroller.cxx Thu Nov 15 16:46:12 2012
@@ -19,13 +19,12 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_framework.hxx"
 
 #include <stdio.h>
 #include <wchar.h>
+#include <string.h>
 
 #ifndef __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX
 #include "uielement/spinfieldtoolbarcontroller.hxx"

Modified: incubator/ooo/branches/alg/aw080/main/idl/source/prj/svidl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/idl/source/prj/svidl.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/idl/source/prj/svidl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/idl/source/prj/svidl.cxx Thu Nov 15 16:46:12 2012
@@ -31,6 +31,7 @@
 #include <command.hxx>
 #include <tools/fsys.hxx>
 #include <tools/string.hxx>
+#include <memory.h>
 
 #define BR 0x8000
 sal_Bool FileMove_Impl( const String & rFile1, const String & rFile2, sal_Bool bImmerVerschieben )

Modified: incubator/ooo/branches/alg/aw080/main/l10ntools/inc/export.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/l10ntools/inc/export.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/l10ntools/inc/export.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/l10ntools/inc/export.hxx Thu Nov 15 16:46:12 2012
@@ -38,6 +38,7 @@
 #include <tools/fsys.hxx>
 #include <osl/file.hxx>
 #include <osl/file.h>
+#include <string.h>
 
 #include <hash_map> /* std::hashmap*/
 #include <iterator> /* std::iterator*/

Modified: incubator/ooo/branches/alg/aw080/main/padmin/source/cmddlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/padmin/source/cmddlg.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/padmin/source/cmddlg.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/padmin/source/cmddlg.cxx Thu Nov 15 16:46:12 2012
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 #include <stdio.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
@@ -31,6 +29,7 @@
 #include <padialog.hxx>
 #include <helper.hxx>
 #include <prtsetup.hxx>
+#include <string.h>
 
 using namespace psp;
 using namespace rtl;

Modified: incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/reportdesign/source/core/sdr/RptPage.cxx Thu Nov 15 16:46:12 2012
@@ -129,7 +129,7 @@ void OReportPage::removeSdrObject(const 
     }
 }
 // -----------------------------------------------------------------------------
-SdrObject* OReportPage::RemoveObjectFromSdrObjList(sal_uLong nObjNum)
+SdrObject* OReportPage::RemoveObjectFromSdrObjList(sal_uInt32 nObjNum)
 {
     SdrObject* pObj = SdrPage::RemoveObjectFromSdrObjList(nObjNum);
     if (getSpecialMode())
@@ -229,7 +229,7 @@ void OReportPage::resetSpecialMode()
     m_bSpecialInsertMode = false;
 }
 // -----------------------------------------------------------------------------
-void OReportPage::InsertObjectToSdrObjList(SdrObject& rObj, sal_uLong nPos)
+void OReportPage::InsertObjectToSdrObjList(SdrObject& rObj, sal_uInt32 nPos)
 {
     SdrPage::InsertObjectToSdrObjList(rObj, nPos);
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/column3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/column3.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/column3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/column3.cxx Thu Nov 15 16:46:12 2012
@@ -56,6 +56,8 @@
 #include "dpglobal.hxx"
 #include <dptablecache.hxx>
 #include <com/sun/star/i18n/LocaleDataItem.hpp>
+#include <memory.h>
+
 using ::com::sun::star::i18n::LocaleDataItem;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx Thu Nov 15 16:46:12 2012
@@ -26,8 +26,8 @@
 
 #include "compressedarray.hxx"
 #include "address.hxx"
-
 #include <algorithm>
+#include <memory.h>
 
 template< typename A, typename D >
 ScCompressedArray<A,D>::ScCompressedArray( A nMaxAccessP, const D& rValue,

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markarr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markarr.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markarr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markarr.cxx Thu Nov 15 16:46:12 2012
@@ -29,10 +29,10 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <tools/debug.hxx>
-
 #include "markarr.hxx"
 #include "global.hxx"
 #include "address.hxx"
+#include <memory.h>
 
 // STATIC DATA -----------------------------------------------------------
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markdata.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markdata.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markdata.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/markdata.cxx Thu Nov 15 16:46:12 2012
@@ -29,10 +29,10 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include <tools/debug.hxx>
-
 #include "markdata.hxx"
 #include "markarr.hxx"
 #include "rangelst.hxx"
+#include <memory.h>
 
 // STATIC DATA -----------------------------------------------------------
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx Thu Nov 15 16:46:12 2012
@@ -402,7 +402,8 @@ XclExpOcxControlObj::XclExpOcxControlObj
     // fill DFF property set
     mrEscherEx.OpenContainer( ESCHER_SpContainer );
     mrEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVESPT | SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_OLESHAPE );
-    EscherPropertyContainer aPropOpt( mrEscherEx.GetGraphicProvider(), mrEscherEx.QueryPictureStream(), basegfx::B2DRange());
+    basegfx::B2DRange aEmptyRange;
+    EscherPropertyContainer aPropOpt( mrEscherEx.GetGraphicProvider(), mrEscherEx.QueryPictureStream(), aEmptyRange);
     aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape,    0x00080008 );   // bool field
     aPropOpt.AddOpt( ESCHER_Prop_lineColor,         0x08000040 );
     aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash,   0x00080000 );   // bool field

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/core/drawdoc2.cxx Thu Nov 15 16:46:12 2012
@@ -918,7 +918,7 @@ bool SdDrawDocument::MovePages(sal_uInt3
 					bSomethingHappened = sal_True;
 				}
 			}
-			aPageList.Remove((sal_uInt32)0);
+			aPageList.Remove((sal_uIntPtr)0);
 			nTargetPage = pPage->GetPageNumber();
 		}
 	}

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/eppt.cxx Thu Nov 15 16:46:12 2012
@@ -682,7 +682,7 @@ sal_Bool PPTWriter::ImplCreateDocument()
                         nFlags |= 1;
                 }
 
-                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"§()&
+                if ( ImplGetPropertyValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsEndless" ) ) ) ) // muesste eigendlich heissen IsNotEndless !=)"�()&
                 {
                     sal_Bool bBool = sal_False;
                     mAny >>= bBool;
@@ -1710,10 +1710,11 @@ void PPTWriter::ImplWriteBackground( ::c
     mpPptEscherEx->AddShape( ESCHER_ShpInst_Rectangle, 0xc00 );                     // Flags: Connector | Background | HasSpt
 
     // #121183# Use real PageSize in 100th mm
+    basegfx::B2DRange aPageRange(0.0, 0.0, maPageSize.Width(), maPageSize.Height());
     EscherPropertyContainer aPropOpt(
         mpPptEscherEx->GetGraphicProvider(), 
         mpPicStrm, 
-        basegfx::B2DRange(0.0, 0.0, maPageSize.Width(), maPageSize.Height()));
+        aPageRange);
 
     aPropOpt.AddOpt( ESCHER_Prop_fillType, ESCHER_FillSolid );
     ::com::sun::star::drawing::FillStyle aFS( ::com::sun::star::drawing::FillStyle_NONE );

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/filter/eppt/epptso.cxx Thu Nov 15 16:46:12 2012
@@ -1553,7 +1553,8 @@ void PPTWriter::ImplWritePortions( SvStr
 				{
 					case ::com::sun::star::drawing::FillStyle_GRADIENT :
 					{
-                        EscherPropertyContainer aPropOpt(mpPptEscherEx->GetGraphicProvider(), mpPicStrm, basegfx::B2DRange(0.0, 0.0, 28000.0, 21000.0));
+					    basegfx::B2DRange aPageRange(0.0, 0.0, 28000.0, 21000.0);
+                        EscherPropertyContainer aPropOpt(mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aPageRange);
 						
                         aPropOpt.CreateGradientProperties( mXPropSet );
 						aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor );
@@ -1575,7 +1576,8 @@ void PPTWriter::ImplWritePortions( SvStr
 						{
 							case ::com::sun::star::drawing::FillStyle_GRADIENT :
 							{
-                                EscherPropertyContainer aPropOpt(mpPptEscherEx->GetGraphicProvider(), mpPicStrm, basegfx::B2DRange(0.0, 0.0, 28000.0, 21000.0));
+							    basegfx::B2DRange aPageRange(0.0, 0.0, 28000.0, 21000.0);
+                                EscherPropertyContainer aPropOpt(mpPptEscherEx->GetGraphicProvider(), mpPicStrm, aPageRange);
 								
                                 aPropOpt.CreateGradientProperties( mXBackgroundPropSet );
 								aPropOpt.GetOpt( ESCHER_Prop_fillColor, nBackgroundColor );

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.cxx Thu Nov 15 16:46:12 2012
@@ -25,11 +25,11 @@
 #include "precompiled_sd.hxx"
 
 #include "SlsBitmapCompressor.hxx"
-
 #include <tools/stream.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
+#include <memory.h>
 
 namespace sd { namespace slidesorter { namespace cache {
 

Modified: incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/zoomlist.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/zoomlist.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/zoomlist.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sd/source/ui/view/zoomlist.cxx Thu Nov 15 16:46:12 2012
@@ -89,7 +89,7 @@ void ZoomList::InsertZoomRange(const bas
 	if (nRangeCount >= MAX_ENTRYS)
 	{
 		delete ((basegfx::B2DRange*) GetObject(0));
-		Remove((sal_uInt32) 0);
+		Remove((sal_uIntPtr) 0);
 	}
 	else if (nRangeCount == 0)
 	{

Modified: incubator/ooo/branches/alg/aw080/main/sot/source/sdstor/ucbstorage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sot/source/sdstor/ucbstorage.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sot/source/sdstor/ucbstorage.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sot/source/sdstor/ucbstorage.cxx Thu Nov 15 16:46:12 2012
@@ -68,6 +68,7 @@
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
 #include "sot/clsids.hxx"
+#include <memory.h>
 
 #include "unostorageholder.hxx"
 

Modified: incubator/ooo/branches/alg/aw080/main/svtools/bmpmaker/bmp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/bmpmaker/bmp.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/bmpmaker/bmp.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/bmpmaker/bmp.cxx Thu Nov 15 16:46:12 2012
@@ -19,27 +19,21 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 
-#ifndef INCLUDED_RTL_MATH_HXX
 #include <rtl/math.hxx>
-#endif
-
 #include <math.h>
 #include <stdio.h>
 #include <signal.h>
 #include <vector>
 using namespace std;
-
 #include <vcl/svapp.hxx>
-
 #include "svl/solar.hrc"
 #include <svtools/filedlg.hxx>
 #include "bmpcore.hxx"
 #include "bmp.hrc"
+#include <memory.h>
 
 // ----------
 // - BmpApp -

Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer.cxx Thu Nov 15 16:46:12 2012
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #ifdef WNT
@@ -53,7 +51,6 @@
 #include <comphelper/processfactory.hxx>
 #include <sot/filelist.hxx>
 #include <cppuhelper/implbase1.hxx>
-
 #include <comphelper/seqstream.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XFlushableClipboard.hpp>
@@ -68,6 +65,7 @@
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>
 #include <cstdio>
+#include <memory.h>
 
 // --------------
 // - Namespaces -

Modified: incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer2.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svtools/source/misc/transfer2.cxx Thu Nov 15 16:46:12 2012
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svtools.hxx"
 #include <vos/mutex.hxx>
@@ -40,6 +38,7 @@
 #include <svtools/inetimg.hxx>
 #include <svtools/imap.hxx>
 #include <svtools/transfer.hxx>
+#include <memory.h>
 
 // --------------
 // - Namespaces -

Modified: incubator/ooo/branches/alg/aw080/main/svx/Library_svx.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/Library_svx.mk?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/Library_svx.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/Library_svx.mk Thu Nov 15 16:46:12 2012
@@ -180,7 +180,6 @@ $(eval $(call gb_Library_add_exception_o
     svx/source/smarttags/SmartTagMgr \
     svx/source/table/accessiblecell \
     svx/source/table/accessibletableshape \
-    svx/source/table/celleditsource \
     svx/source/table/tabledesign \
     svx/source/table/tablertfexporter \
     svx/source/table/tablertfimporter \

Modified: incubator/ooo/branches/alg/aw080/main/svx/Library_svxcore.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/Library_svxcore.mk?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/Library_svxcore.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/Library_svxcore.mk Thu Nov 15 16:46:12 2012
@@ -367,6 +367,7 @@ $(eval $(call gb_Library_add_exception_o
 	svx/source/svdraw/svdsob \
 	svx/source/svdraw/sdrselection \
     svx/source/table/cell \
+    svx/source/table/celleditsource \
     svx/source/table/cellcursor \
     svx/source/table/cellrange \
     svx/source/table/propertyset \

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/EnhancedCustomShape2d.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/EnhancedCustomShape2d.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/EnhancedCustomShape2d.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/EnhancedCustomShape2d.hxx Thu Nov 15 16:46:12 2012
@@ -79,7 +79,7 @@ class EnhancedCustomShape2d : public Sfx
 {
 private:
 		SdrObject*					pCustomShapeObj;
-		MSO_SPT						eSpType;
+		MSO_SPT						meSpType;
 
 		sal_Int32					nCoordLeft;
 		sal_Int32					nCoordTop;

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdrobjectfactory.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdrobjectfactory.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdrobjectfactory.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/sdrobjectfactory.hxx Thu Nov 15 16:46:12 2012
@@ -56,10 +56,10 @@ public:
     {
     }
 
-    const sal_uInt16 getIdent() const { return mnIdent; }
+    sal_uInt16 getIdent() const { return mnIdent; }
     void setIdent(const sal_uInt16 nNew) { mnIdent = nNew; }
 
-    const sal_uInt32 getInvent() const { return mnInvent; }
+    sal_uInt32 getInvent() const { return mnInvent; }
     void setInvent(const sal_uInt32 nNew) { mnInvent = nNew; }
     
     const SdrPathObjType& getSdrPathObjType() const { return maSdrPathObjType; }
@@ -68,7 +68,7 @@ public:
     const SdrCircleObjType& getSdrCircleObjType() const { return maSdrCircleObjType; }
     void setSdrCircleObjType(const SdrCircleObjType& rNew) { maSdrCircleObjType = rNew; }
 
-    const bool getFreehandMode() const { return mbFreehandMode; }
+    bool getFreehandMode() const { return mbFreehandMode; }
     void setFreehandMode(const bool bNew) { mbFreehandMode = bNew; }
 };
 

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdedtv.hxx Thu Nov 15 16:46:12 2012
@@ -396,7 +396,7 @@ public:
 	// Folgende Methode wird gerufen, wenn z.B. durch ToTop, ToBtm, ... die
 	// Reihenfolgen der Objekte geaendert wurde. Der Aufruf erfolgt dann nach
 	// jedem SdrObjList::SetNavigationPosition(nOldPos,nNewPos);
-	virtual void ObjOrderChanged(SdrObject* pObj, sal_uIntPtr nOldPos, sal_uIntPtr nNewPos);
+	virtual void ObjOrderChanged(SdrObject* pObj, sal_uInt32 nOldPos, sal_uInt32 nNewPos);
 
 	// Falls ein oder mehrere Objekte des Types SdrGrafObj oder SdrOle2Obj
 	// markiert sind und diese in der Lage sind ein StarView-Metafile zu

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdmodel.hxx Thu Nov 15 16:46:12 2012
@@ -142,7 +142,7 @@ public:
         SdrHintKind eSdrHintKind = HINT_OBJCHG_RESIZE);
 
     // data read access
-    const SdrHintKind GetSdrHintKind() const { return meSdrHint; }
+    SdrHintKind GetSdrHintKind() const { return meSdrHint; }
     const SdrPage* GetSdrHintPage() const { return mpSdrPage; }
     const SdrObject* GetSdrHintObject() const { return mpSdrObject; }
 };

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoattr.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoattr.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoattr.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdoattr.hxx Thu Nov 15 16:46:12 2012
@@ -30,7 +30,7 @@
 #include <svx/xlnasit.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdattr.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/svdobj.hxx Thu Nov 15 16:46:12 2012
@@ -44,7 +44,6 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/svdpool.hxx>
 #include <boost/utility.hpp>
-#include <svx/unoprov.hxx>
 
 //////////////////////////////////////////////////////////////////////////////
 // predefines

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unopage.hxx Thu Nov 15 16:46:12 2012
@@ -45,6 +45,7 @@
 #include <comphelper/servicehelper.hxx>
 
 #include <svx/unoprov.hxx>
+#include <svx/unoshape.hxx>
 
 class SdrPage;
 class SdrModel;

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoprov.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoprov.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoprov.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoprov.hxx Thu Nov 15 16:46:12 2012
@@ -85,14 +85,14 @@ public:
 ***********************************************************************/
 
 extern SvxUnoPropertyMapProvider aSvxMapProvider;
-#define E3D_INVENTOR_FLAG			(0x80000000)
+//#define E3D_INVENTOR_FLAG			(0x80000000)
 
 // object creation info creator
-class rtl::OUString;
-enum SvxShapeKind;
-SvxShapeKind getSvxShapeKindFromTypeName(const rtl::OUString&);
-std::vector< rtl::OUString > getAllSvxShapeTypeNames();
-bool getNameForSvxShapeType(rtl::OUString&, SvxShapeKind);
+//class rtl::OUString;
+//enum SvxShapeKind;
+//SvxShapeKind getSvxShapeKindFromTypeName(const rtl::OUString&);
+//std::vector< rtl::OUString > getAllSvxShapeTypeNames();
+//bool getNameForSvxShapeType(rtl::OUString&, SvxShapeKind);
 
 /***********************************************************************
 * class SvxPropertySetInfoPool                                         *

Modified: incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/inc/svx/unoshape.hxx Thu Nov 15 16:46:12 2012
@@ -142,6 +142,9 @@ enum SvxShapeKind
 // converter
 SvxShapeKind SVX_DLLPUBLIC SdrObjectCreatorInventorToSvxShapeKind(sal_uInt16 nIdent, sal_uInt32 nInvent);
 void SvxShapeKindToSdrObjectCreatorInventor(SvxShapeKind aSvxShapeKind, sal_uInt16& nIdent, sal_uInt32& nInvent);
+SvxShapeKind getSvxShapeKindFromTypeName(const rtl::OUString&);
+std::vector< rtl::OUString > getAllSvxShapeTypeNames();
+bool getNameForSvxShapeType(rtl::OUString&, SvxShapeKind);
 
 class SVX_DLLPUBLIC SvxShape : public SvxShape_UnoImplHelper,
                  public SfxListener,

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShape2d.cxx Thu Nov 15 16:46:12 2012
@@ -598,7 +598,7 @@ sal_Bool EnhancedCustomShape2d::ConvertS
 const sal_Int32* EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomShapeGeometryItem& rGeometryItem )
 {
 	const sal_Int32* pDefData = NULL;
-	const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType );
+	const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( meSpType );
 	if ( pDefCustomShape )
 		pDefData = pDefCustomShape->pDefData;
 
@@ -707,7 +707,7 @@ EnhancedCustomShape2d::~EnhancedCustomSh
 EnhancedCustomShape2d::EnhancedCustomShape2d( SdrObject* pAObj ) :
 	SfxItemSet			( pAObj->GetMergedItemSet() ),
 	pCustomShapeObj		( pAObj	),
-	eSpType				( mso_sptNil ),
+	meSpType			( mso_sptNil ),
 	nCoordLeft			( 0 ),
 	nCoordTop			( 0 ),
 	nCoordWidth			( 21600 ),
@@ -751,7 +751,7 @@ EnhancedCustomShape2d::EnhancedCustomSha
 	Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
 	if ( pAny )
 		*pAny >>= sShapeType;
-	eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType );
+	meSpType = EnhancedCustomShapeTypeNames::Get( sShapeType );
 
 //	pAny = rGeometryItem.GetPropertyValueByName( sMirroredX );
 //	if ( pAny )
@@ -768,7 +768,7 @@ EnhancedCustomShape2d::EnhancedCustomSha
 // 		nRotateAngle = sdr::legacy::GetRotateAngle(*pCustomShapeObj);
 
 	/*const sal_Int32* pDefData =*/ ApplyShapeAttributes( rGeometryItem );
-	switch( eSpType )
+	switch( meSpType )
 	{
 		case mso_sptCan :						nColorData = 0x20400000; break;
 		case mso_sptCube :						nColorData = 0x302e0000; break;
@@ -2123,7 +2123,7 @@ SdrObject* EnhancedCustomShape2d::Create
 	sal_uInt16 nSegmentInd = 0;
 
 	std::vector< SdrPathObj* > vObjectList;
-	sal_Bool bSortFilledObjectsToBack = SortFilledObjectsToBackByDefault( eSpType );
+	sal_Bool bSortFilledObjectsToBack = SortFilledObjectsToBackByDefault( meSpType );
 
 	while( nSegmentInd <= seqSegments.getLength() )
 	{
@@ -2193,7 +2193,7 @@ SdrObject* EnhancedCustomShape2d::Create
 
 			// #i88870# correct line arrows for callouts
 			if ( nLineObjectCount )
-				CorrectCalloutArrows( eSpType, nLineObjectCount, vObjectList );
+				CorrectCalloutArrows( meSpType, nLineObjectCount, vObjectList );
 
 			// sort objects so that filled ones are in front. Necessary
 			// for some strange objects
@@ -2254,7 +2254,7 @@ SdrObject* EnhancedCustomShape2d::Create
 {
 	SdrObject* pRet = NULL;
 
-	if ( eSpType == mso_sptRectangle )
+	if ( meSpType == mso_sptRectangle )
 	{
 		pRet = new SdrRectObj(
 			pCustomShapeObj->getSdrModelFromSdrObject(),

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx Thu Nov 15 16:46:12 2012
@@ -26,6 +26,7 @@
 #include "svx/EnhancedCustomShapeTypeNames.hxx"
 #include <osl/mutex.hxx>
 #include <hash_map>
+#include <string.h>
 
 struct TCheck
 {

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/dialog/rlrcitem.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/dialog/rlrcitem.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/dialog/rlrcitem.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/dialog/rlrcitem.cxx Thu Nov 15 16:46:12 2012
@@ -72,14 +72,14 @@ void SvxRulerItem::StateChanged( sal_uIn
         case SID_ATTR_LONG_LRSPACE:
 		{
 			const SvxLongLRSpaceItem *pItem = dynamic_cast< const SvxLongLRSpaceItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxLRSpaceItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxLRSpaceItem erwartet");
 			rRuler.UpdateFrame(pItem);
 			break;
 		}
         case SID_ATTR_LONG_ULSPACE:
 		{
 			const SvxLongULSpaceItem *pItem = dynamic_cast< const SvxLongULSpaceItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxULSpaceItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxULSpaceItem erwartet");
 			rRuler.UpdateFrame(pItem);
 			break;
 		}
@@ -87,7 +87,7 @@ void SvxRulerItem::StateChanged( sal_uIn
         case SID_ATTR_TABSTOP:
 		{
 			const SvxTabStopItem *pItem = dynamic_cast< const SvxTabStopItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxTabStopItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxTabStopItem erwartet");
 			rRuler.Update(pItem);
 			break;
 		}
@@ -95,7 +95,7 @@ void SvxRulerItem::StateChanged( sal_uIn
         case SID_ATTR_PARA_LRSPACE:
 		{
 			const SvxLRSpaceItem *pItem = dynamic_cast< const SvxLRSpaceItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxLRSpaceItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxLRSpaceItem erwartet");
 			rRuler.UpdatePara(pItem);
 			break;
 		}
@@ -105,7 +105,7 @@ void SvxRulerItem::StateChanged( sal_uIn
 		case SID_RULER_ROWS_VERTICAL:
 		{
 			const SvxColumnItem *pItem = dynamic_cast< const SvxColumnItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxColumnItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxColumnItem erwartet");
 #ifdef DBG_UTIL
 			if(pItem)
 			{
@@ -124,35 +124,35 @@ void SvxRulerItem::StateChanged( sal_uIn
 		case SID_RULER_PAGE_POS:
 		{	// Position Seite, Seitenbreite
 			const SvxPagePosSizeItem *pItem = dynamic_cast< const SvxPagePosSizeItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxPagePosSizeItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxPagePosSizeItem erwartet");
 			rRuler.Update(pItem);
 			break;
 		}
 		case SID_RULER_OBJECT:
 		{	// Object-Selektion
 			const SvxObjectItem *pItem = dynamic_cast< const SvxObjectItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxObjectItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxObjectItem erwartet");
 			rRuler.Update(pItem);
 			break;
 		}
 		case SID_RULER_PROTECT:
 		{
 			const SvxProtectItem *pItem = dynamic_cast< const SvxProtectItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxProtectItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxProtectItem erwartet");
 			rRuler.Update(pItem);
 			break;
 		}
         case SID_RULER_BORDER_DISTANCE:
         {
             const SvxLRSpaceItem *pItem = dynamic_cast< const SvxLRSpaceItem* >( pState);
-			OSL_ENSURE(pState ? pItem : true, "SvxLRSpaceItem erwartet");
+			OSL_ENSURE(pState ? 0 != pItem : true, "SvxLRSpaceItem erwartet");
             rRuler.UpdateParaBorder(pItem);
         }
         break;
         case SID_RULER_TEXT_RIGHT_TO_LEFT :
         {
             const SfxBoolItem *pItem = dynamic_cast< const SfxBoolItem* >( pState);
-            OSL_ENSURE(pState ? pItem : true, "SfxBoolItem erwartet");
+            OSL_ENSURE(pState ? 0 != pItem : true, "SfxBoolItem erwartet");
             rRuler.UpdateTextRTL(pItem);
         }
         break;

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedxv.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedxv.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedxv.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdedxv.cxx Thu Nov 15 16:46:12 2012
@@ -772,7 +772,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
             // alten Cursor merken
             if(GetTextEditOutliner()->GetViewCount())
 			{
-                OutlinerView* pTmpOLV = GetTextEditOutliner()->RemoveView(sal_uInt32(0));
+                OutlinerView* pTmpOLV = GetTextEditOutliner()->RemoveView(sal_uLong(0));
 
 				if(pTmpOLV && pTmpOLV != pGivenOutlinerView)
 				{
@@ -1016,7 +1016,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEn
             }
             else
             {
-                OSL_ENSURE(false, "´Got UndoManager back in SdrEndTextEdit which is NOT the expected document UndoManager (!)");
+                OSL_ENSURE(false, "�Got UndoManager back in SdrEndTextEdit which is NOT the expected document UndoManager (!)");
                 delete pOriginal;
             }
         }

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdhdl.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdhdl.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdhdl.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdhdl.cxx Thu Nov 15 16:46:12 2012
@@ -1429,7 +1429,7 @@ namespace
 						// #48763#
 						if(eKind1 == eKind2)
 						{
-							return (sal_Int32)pA < (sal_Int32)pB; // Notloesung, um immer die gleiche Sortierung zu haben
+							return pA < pB; // Notloesung, um immer die gleiche Sortierung zu haben
 						}
 						else
 						{
@@ -1443,7 +1443,7 @@ namespace
 				}
 				else 
 				{
-					return (sal_Int32)pObj1 < (sal_Int32)pObj2;
+					return pObj1 < pObj2;
 		    	}
 		    }
 			else 

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdobj.cxx Thu Nov 15 16:46:12 2012
@@ -2501,7 +2501,7 @@ SvxShape* SdrObject::getSvxShape() const
     //#113608#, make sure mpSvxShape is always synchronized with maWeakUnoShape
     if ( mpSvxShape && !xShape.is() )
     {
-        const_cast< SvxShape* >(mpSvxShape) = NULL;
+        const_cast< SdrObject* >(this)->mpSvxShape = NULL;
     }
 
 	return mpSvxShape;

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxat.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxat.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxat.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/svdraw/svdotxat.cxx Thu Nov 15 16:46:12 2012
@@ -458,8 +458,8 @@ void SdrTextObj::ResizeTextAttributes(co
     if (pOutlinerParaObject!=0 && xFact.IsValid() && yFact.IsValid())
 	{
 		Fraction n100(100,1);
-		sal_Int32 nX=sal_Int32(xFact*n100);
-		sal_Int32 nY=sal_Int32(yFact*n100);
+		sal_Int32 nX=long(xFact*n100);
+		sal_Int32 nY=long(yFact*n100);
 	
         if (nX<0) 
             nX=-nX;

Modified: incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/tableshape.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/tableshape.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/tableshape.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/svx/source/unodraw/tableshape.cxx Thu Nov 15 16:46:12 2012
@@ -33,7 +33,6 @@
 ///////////////////////////////////////////////////////////////////////
 
 using ::rtl::OUString;
-
 using namespace ::osl;
 using namespace ::cppu;
 using namespace ::sdr::table;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoCore.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoCore.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoCore.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoCore.hxx Thu Nov 15 16:46:12 2012
@@ -25,9 +25,8 @@
 #define SW_UNDOCORE_HXX
 
 #include <undobj.hxx>
-
 #include <calbck.hxx>
-
+#include <svx/svdobj.hxx>
 
 class SfxItemSet;
 class SwFmtColl;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoDraw.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoDraw.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoDraw.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/inc/UndoDraw.hxx Thu Nov 15 16:46:12 2012
@@ -25,9 +25,8 @@
 #define SW_UNDO_DRAW_HXX
 
 #include <undobj.hxx>
-
 #include <svx/svdundo.hxx>
-
+#include <svx/svdobj.hxx>
 
 struct SwUndoGroupObjImpl;
 class SdrMark;

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/core/text/txtfly.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/core/text/txtfly.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/core/text/txtfly.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/core/text/txtfly.cxx Thu Nov 15 16:46:12 2012
@@ -76,6 +76,7 @@
 #include <editeng/lspcitem.hxx>
 #include <svx/svdoedge.hxx>
 #include <drawinglayer/processor2d/contourextractor2d.hxx>
+#include <svx/sdr/contact/viewcontact.hxx>
 #include "doc.hxx"
 
 #ifdef DBG_UTIL

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par4.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8par4.cxx Thu Nov 15 16:46:12 2012
@@ -49,7 +49,6 @@
 #include <mdiexp.hxx>           // Progress
 #include <redline.hxx>
 #include <fltshell.hxx>
-#include <unodraw.hxx>
 #include <shellio.hxx>
 #include <ndole.hxx>
 #include <svtools/filter.hxx>

Modified: incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8struc.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8struc.hxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8struc.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sw/source/filter/ww8/ww8struc.hxx Thu Nov 15 16:46:12 2012
@@ -29,6 +29,7 @@
 #include <osl/endian.h>
 #include <tools/string.hxx>
 #include <sal/config.h>
+#include <memory.h>
 
 #if defined  OSL_BIGENDIAN || SAL_TYPES_ALIGNMENT4 > 2 || defined UNX
 #   define __WW8_NEEDS_COPY

Modified: incubator/ooo/branches/alg/aw080/main/tools/source/generic/poly2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/tools/source/generic/poly2.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/tools/source/generic/poly2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/tools/source/generic/poly2.cxx Thu Nov 15 16:46:12 2012
@@ -40,6 +40,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <memory.h>
 
 // ---------------
 // - PolyPolygon -

Modified: incubator/ooo/branches/alg/aw080/main/unotools/source/ucbhelper/ucblockbytes.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/unotools/source/ucbhelper/ucblockbytes.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/unotools/source/ucbhelper/ucblockbytes.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/unotools/source/ucbhelper/ucblockbytes.cxx Thu Nov 15 16:46:12 2012
@@ -65,6 +65,7 @@
 
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/content.hxx>
+#include <memory.h>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/control/field2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/control/field2.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/control/field2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/control/field2.cxx Thu Nov 15 16:46:12 2012
@@ -24,28 +24,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 #include <tools/debug.hxx>
-
 #include <tools/rc.h>
-
 #include <vcl/svapp.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
 #include <vcl/unohelp.hxx>
-
 #include <svdata.hxx>
-
 #include <i18npool/mslangid.hxx>
-
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/i18n/KCharacterType.hpp>
-
-
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/misccfg.hxx>
+#include <memory.h>
 
 using namespace ::com::sun::star;
 

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/gfxlink.cxx Thu Nov 15 16:46:12 2012
@@ -35,6 +35,7 @@
 #include <vcl/gfxlink.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <memory.h>
 
 // -----------
 // - GfxLink -

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/jobset.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/jobset.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/jobset.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/gdi/jobset.cxx Thu Nov 15 16:46:12 2012
@@ -19,19 +19,14 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-
 #include <rtl/alloc.h>
-
 #include <vcl/jobset.hxx>
-
 #include <jobset.h>
+#include <memory.h>
 
 // =======================================================================
 

Modified: incubator/ooo/branches/alg/aw080/main/vcl/source/window/winproc.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/source/window/winproc.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/source/window/winproc.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/source/window/winproc.cxx Thu Nov 15 16:46:12 2012
@@ -19,15 +19,11 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
 #include <tools/debug.hxx>
-
 #include <unotools/localedatawrapper.hxx>
-
 #include <vcl/i18nhelp.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/timer.hxx>
@@ -54,6 +50,7 @@
 #include <brdwin.hxx>
 #include <salgdi.hxx>
 #include <dndlcon.hxx>
+#include <memory.h>
 
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>

Modified: incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/jobdata.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/jobdata.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/jobdata.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/vcl/unx/generic/printer/jobdata.cxx Thu Nov 15 16:46:12 2012
@@ -26,10 +26,9 @@
 
 #include "vcl/jobdata.hxx"
 #include "vcl/printerinfomanager.hxx"
-
 #include "tools/stream.hxx"
-
 #include "sal/alloca.h"
+#include <memory.h>
 
 using namespace psp;
 using namespace rtl;

Modified: incubator/ooo/branches/alg/aw080/main/xmloff/source/draw/ximpshap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/xmloff/source/draw/ximpshap.cxx?rev=1409876&r1=1409875&r2=1409876&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/xmloff/source/draw/ximpshap.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/xmloff/source/draw/ximpshap.cxx Thu Nov 15 16:46:12 2012
@@ -83,6 +83,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
+#include <memory.h>
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;



Mime
View raw message