[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 41 commits - accessibility/inc accessibility/source basic/inc basic/source boost/boost_1_44_0-gcc4.7.patch boost/makefile.mk configure.in dbaccess/source desktop/source editeng/source extensions/source forms/source hsqldb/makefile.mk hsqldb/patches jvmfwk/plugins libcmis/ExternalLib_libcmis.mk libcmis/libcmis-0001-virtualdtor.patch libcmis/makefile.mk lotuswordpro/source oox/source sal/qa sc/inc sc/source sd/source slideshow/source svtools/inc svtools/source svx/inc svx/source sw/source vcl/inc vcl/source vcl/unx vigra/makefile.mk vigra/vigra1.4.0-enumwarn.patch writerfilter/source xmlsecurity/source
Michael Stahl
mst at kemper.freedesktop.org
Fri May 18 07:52:04 PDT 2012
accessibility/inc/accessibility/helper/IComboListBoxHelper.hxx | 9
accessibility/source/helper/IComboListBoxHelper.cxx | 41
accessibility/source/helper/makefile.mk | 1
basic/inc/basic/basicmanagerrepository.hxx | 2
basic/inc/basic/sbxfac.hxx | 1
basic/source/sbx/sbxbase.cxx | 4
boost/boost_1_44_0-gcc4.7.patch | 49
boost/makefile.mk | 3
configure.in | 11
dbaccess/source/ui/dlg/adminpages.cxx | 3
dbaccess/source/ui/dlg/adminpages.hxx | 1
desktop/source/app/officeipcthread.cxx | 2
desktop/source/deployment/misc/dp_misc.cxx | 2
editeng/source/editeng/editdbg.cxx | 2
extensions/source/plugin/inc/plugin/unx/mediator.hxx | 2
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 2
forms/source/xforms/propertysetbase.cxx | 4
forms/source/xforms/propertysetbase.hxx | 1
hsqldb/makefile.mk | 18
hsqldb/patches/jdbc-4.1.patch | 267 ++++
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 75 -
libcmis/ExternalLib_libcmis.mk | 1
libcmis/libcmis-0001-virtualdtor.patch | 22
libcmis/makefile.mk | 2
lotuswordpro/source/filter/lwptblformula.cxx | 4
lotuswordpro/source/filter/lwptblformula.hxx | 1
oox/source/helper/propertymap.cxx | 30
sal/qa/osl/mutex/osl_Mutex.cxx | 2
sc/inc/dpcachetable.hxx | 1
sc/source/core/tool/interpr1.cxx | 2
sc/source/filter/xcl97/XclExpChangeTrack.cxx | 2
sc/source/filter/xml/xmlnexpi.hxx | 1
sc/source/ui/inc/checklistmenu.hxx | 1
sd/source/filter/eppt/pptx-epptooxml.cxx | 12
sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx | 4
sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx | 3
sd/source/ui/view/viewshe3.cxx | 3
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx | 4
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx | 1
svtools/inc/svtools/colrdlg.hxx | 1
svtools/inc/svtools/editbrowsebox.hxx | 4
svtools/inc/svtools/wallitem.hxx | 1
svtools/source/brwbox/editbrowsebox.cxx | 4
svtools/source/dialogs/colrdlg.cxx | 4
svtools/source/misc/wallitem.cxx | 4
svtools/source/toolpanel/paneltabbar.cxx | 5
svx/inc/svx/gridctrl.hxx | 3
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 573 +++++-----
sw/source/core/layout/dbg_lay.cxx | 1
sw/source/filter/ww1/w1class.cxx | 4
sw/source/filter/ww1/w1class.hxx | 1
vcl/inc/vcl/seleng.hxx | 2
vcl/source/window/seleng.cxx | 4
vcl/unx/generic/app/wmadaptor.cxx | 2
vcl/unx/generic/window/salframe.cxx | 2
vigra/makefile.mk | 7
vigra/vigra1.4.0-enumwarn.patch | 13
writerfilter/source/dmapper/ConversionHelper.cxx | 4
writerfilter/source/doctok/WW8BinTableImpl.hxx | 4
writerfilter/source/doctok/WW8ResourceModelImpl.cxx | 2
writerfilter/source/resourcemodel/resourcemodel.cxx | 2
xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 4
62 files changed, 867 insertions(+), 380 deletions(-)
New commits:
commit f7ff6d2f3e37d9f18e5ea99dd1985b3001cc499f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Jan 5 17:32:21 2012 +0100
gcc-trunk: fix: unable to find string literal operator 'operator FOO'
(cherry picked from commit 8f823b7d39154d2044e08174a858f8ef357a151a)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx
index 10a95c1..f4f34d6 100644
--- a/sal/qa/osl/mutex/osl_Mutex.cxx
+++ b/sal/qa/osl/mutex/osl_Mutex.cxx
@@ -754,7 +754,7 @@ namespace osl_ClearableGuard
TimeValue aTimeVal_after;
osl_getSystemTime( &aTimeVal_after );
sal_Int32 nSec = aTimeVal_after.Seconds - aTimeVal_befor.Seconds;
- printf("nSec is %"SAL_PRIdINT32"\n", nSec);
+ printf("nSec is %" SAL_PRIdINT32 "\n", nSec);
myThread.join();
commit fa3a3ba3e9c005a2ae550d8b19d3ff706a788d6d
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 18:48:34 2012 +0100
WaE: deleting object of abstract class type with non-virtual destructor
(cherry picked from commit 265f061458052a7691e9f012ebcb5ec3f4f0e871)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 6a0dd05..331d0e5 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -106,7 +106,7 @@ protected:
Link m_aNewMessageHdl;
public:
Mediator( int nSocket );
- ~Mediator();
+ virtual ~Mediator();
// mark mediator as invalid. No more messages will be processed,
// SendMessage, WaitForMessage, TransactMessage will return immediatly
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 0574084..47778e1 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -155,7 +155,7 @@ protected:
sal_uLong FillBuffer( char*&, const char*, sal_uLong, va_list );
public:
PluginConnector( int nSocket );
- ~PluginConnector();
+ virtual ~PluginConnector();
virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID );
MediatorMessage* Transact( const char*, sal_uLong, ... );
commit 48e7a68cf20e5a436f589502960ad960886d790a
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri May 18 15:16:21 2012 +0200
more -Wnon-virtual-dtor fixes
basically a small subset of 6e67c03dc0225fc66343546b14e902b9d238b1a3,
mangled so it applies
Change-Id: I6aadf6d80b3748229141bf1f723404947fc5021e
diff --git a/basic/inc/basic/basicmanagerrepository.hxx b/basic/inc/basic/basicmanagerrepository.hxx
index 0b25412..b6ca6a6 100644
--- a/basic/inc/basic/basicmanagerrepository.hxx
+++ b/basic/inc/basic/basicmanagerrepository.hxx
@@ -65,6 +65,8 @@ namespace basic
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxForDocument,
BasicManager& _rBasicManager
) = 0;
+
+ virtual ~BasicManagerCreationListener() {}
};
//====================================================================
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 2641f16..9656dbc 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -114,6 +114,9 @@ class FmGridListener
public:
virtual void selectionChanged() = 0;
virtual void columnChanged() = 0;
+
+protected:
+ virtual ~FmGridListener() {}
};
#define GRID_COLUMN_NOT_FOUND SAL_MAX_UINT16
diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx
index 7f5f122..c970a7c 100644
--- a/sw/source/core/layout/dbg_lay.cxx
+++ b/sw/source/core/layout/dbg_lay.cxx
@@ -196,6 +196,7 @@ protected:
public:
SwImplEnterLeave( const SwFrm* pF, sal_uLong nFunct, sal_uLong nAct, void* pPar )
: pFrm( pF ), nFunction( nFunct ), nAction( nAct ), pParam( pPar ) {}
+ virtual ~SwImplEnterLeave() {}
virtual void Enter(); // Ausgabe beim Eintritt
virtual void Leave(); // Ausgabe beim Verlassen
};
commit 343e1942d3c854439c43bbd24430f68067329e9e
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 17:51:50 2012 +0200
WaE: is abstract but has non-virtual destructor
(cherry picked from commit 470036efe4db4e9773825c1277a659f3b50c5b48)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 4a1458a..3f05ea8 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -60,6 +60,7 @@ public:
class Action
{
public:
+ virtual ~Action() {}
virtual void execute() = 0;
};
commit 8b0bb9207a695973b41ab1d438f0c21d8ad4e62f
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 11:14:27 2012 +0200
WaE: has virtual functions but non-virtual destructor
(cherry picked from commit 351e3d492778d3bb0f9a1fd758674c58c50c402d)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/inc/dpcachetable.hxx b/sc/inc/dpcachetable.hxx
index 695586f..5de697f 100644
--- a/sc/inc/dpcachetable.hxx
+++ b/sc/inc/dpcachetable.hxx
@@ -81,6 +81,7 @@ public:
class FilterBase
{
public:
+ virtual ~FilterBase() {}
/** returns true if the matching condition is met for a single cell
value, or false otherwise. */
virtual bool match( const ScDPItemData& rCellData ) const = 0;
commit 68aca396bdd04363ac98fc3e83df2403d803ae4f
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 16:19:59 2012 +0100
WaE: deleting object of abstract class type with non-virtual destructor
(cherry picked from commit e18a7b0e3846b940a7d6facfd9abc9d3fd355d94)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/forms/source/xforms/propertysetbase.cxx b/forms/source/xforms/propertysetbase.cxx
index 64c53bc..eefa921 100644
--- a/forms/source/xforms/propertysetbase.cxx
+++ b/forms/source/xforms/propertysetbase.cxx
@@ -49,6 +49,10 @@ using com::sun::star::lang::IllegalArgumentException;
using com::sun::star::beans::Property;
using com::sun::star::beans::XPropertySetInfo;
+PropertyAccessorBase::~PropertyAccessorBase()
+{
+}
+
oslInterlockedCount SAL_CALL PropertyAccessorBase::acquire()
{
return ++m_refCount;
diff --git a/forms/source/xforms/propertysetbase.hxx b/forms/source/xforms/propertysetbase.hxx
index 27556b1..9e885cc 100644
--- a/forms/source/xforms/propertysetbase.hxx
+++ b/forms/source/xforms/propertysetbase.hxx
@@ -60,6 +60,7 @@ private:
protected:
PropertyAccessorBase() : m_refCount( 0 ) { }
+ virtual ~PropertyAccessorBase();
public:
virtual oslInterlockedCount SAL_CALL acquire();
commit 4bb661f08fbc093100c3f160b2101deb8dd89a3a
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 17:49:47 2012 +0200
WaE: has virtual functions but non-virtual destructor
(cherry picked from commit 0a2a759a96a2c065066e44d56a0c6dc51c561bda)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
index 573448b..85a8cf7 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainerProviders.hxx
@@ -111,6 +111,7 @@ class PagePreviewProvider : public PreviewProvider
{
public:
PagePreviewProvider (void);
+ virtual ~PagePreviewProvider() {}
virtual Image operator () (int nWidth, SdPage* pPage, ::sd::PreviewRenderer& rRenderer);
virtual int GetCostIndex (void);
virtual bool NeedsPageObject (void);
@@ -164,6 +165,7 @@ class DefaultPageObjectProvider : public PageObjectProvider
{
public:
DefaultPageObjectProvider (void);
+ virtual ~DefaultPageObjectProvider() {}
virtual SdPage* operator () (SdDrawDocument* pDocument);
virtual int GetCostIndex (void);
virtual bool operator== (const PageObjectProvider& rProvider);
@@ -178,6 +180,7 @@ class ExistingPageProvider : public ::sd::toolpanel::controls::PageObjectProvide
{
public:
ExistingPageProvider (SdPage* pPage);
+ virtual ~ExistingPageProvider() {}
virtual SdPage* operator() (SdDrawDocument* pDocument);
virtual int GetCostIndex (void);
virtual bool operator== (const PageObjectProvider& rProvider);
commit 01380b898e88ffba786616269dd26bc9698da158
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 17:43:09 2012 +0200
WaE: virtual functions but non-virtual destructor
(cherry picked from commit 21c82e9e6d7ea8bd1a4d89f79f1761fa37a549fe)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
index f978c01..d1b67da 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCompressor.hxx
@@ -92,6 +92,7 @@ class NoBitmapCompression
{
class DummyReplacement;
public:
+ virtual ~NoBitmapCompression() {}
virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const;
virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const;
virtual bool IsLossless (void) const;
@@ -109,6 +110,7 @@ class CompressionByDeletion
: public BitmapCompressor
{
public:
+ virtual ~CompressionByDeletion() {}
virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const;
virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const;
virtual bool IsLossless (void) const;
@@ -128,6 +130,7 @@ class ResolutionReduction
class ResolutionReducedReplacement;
static const sal_Int32 mnWidth = 100;
public:
+ virtual ~ResolutionReduction() {}
virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rpBitmap) const;
/** Scale the replacement bitmap up to the original size.
*/
@@ -146,6 +149,7 @@ class PngCompression
{
class PngReplacement;
public:
+ virtual ~PngCompression() {}
virtual ::boost::shared_ptr<BitmapReplacement> Compress (const Bitmap& rBitmap) const;
virtual Bitmap Decompress (const BitmapReplacement& rBitmapData) const;
virtual bool IsLossless (void) const;
commit b07296420950180f72f501d91029b561fa00dba9
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 18:26:13 2012 +0100
WaE: deleting object of abstract class type with non-virtual destructor
(cherry picked from commit d5286b646247dda00d28967784da6a817be68f7d)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
index 8f10a85..88e2056 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.cxx
@@ -272,6 +272,10 @@ SceneObject::SceneObject()
{
}
+SceneObject::~SceneObject()
+{
+}
+
Iris::Iris()
: SceneObject ()
{
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
index 934ac12..9456588 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionImpl.hxx
@@ -176,6 +176,7 @@ class SceneObject
{
public:
SceneObject();
+ virtual ~SceneObject();
virtual void prepare() {};
virtual void display(double nTime, double SlideWidth, double SlideHeight, double DispWidth, double DispHeight);
commit 0a7efb7f94fe3dc8dbff1e82890147bdd46ea39a
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Mar 2 11:18:16 2012 +0200
WaE: abstract but has non-virtual destructor
(cherry picked from commit 99a579d00def43c6d8e30fd8da2644aa85bcbbc4)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx
index d480e78..bdcbec0 100644
--- a/sc/source/filter/xml/xmlnexpi.hxx
+++ b/sc/source/filter/xml/xmlnexpi.hxx
@@ -49,6 +49,7 @@ public:
class Inserter
{
public:
+ virtual ~Inserter() {}
virtual void insert(ScMyNamedExpression* pExp) = 0;
};
commit c0d4a647314febf112cd156e3a114ca5b0ba1c60
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 18:29:11 2012 +0100
WaE: deleting object of abstract class type with non-virtual destructor
(cherry picked from commit 986388e76b35ea7bea9e767155f87db68fc74c7f)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/filter/ww1/w1class.cxx b/sw/source/filter/ww1/w1class.cxx
index 3e5c3e6..890ff4c 100644
--- a/sw/source/filter/ww1/w1class.cxx
+++ b/sw/source/filter/ww1/w1class.cxx
@@ -477,6 +477,10 @@ sal_uInt16 Ww1SingleSprm::Size(sal_uInt8* /*pSprm*/)
return nCountBytes;
}
+Ww1SingleSprm::~Ww1SingleSprm()
+{
+}
+
sal_uInt16 Ww1SingleSprmTab::Size(sal_uInt8* pSprm) // Doc 24/25, Fastsave-Sprm
{
OSL_ENSURE(nCountBytes==0, "Ww1SingleSprmTab");
diff --git a/sw/source/filter/ww1/w1class.hxx b/sw/source/filter/ww1/w1class.hxx
index 8c253ed..9710b1b 100644
--- a/sw/source/filter/ww1/w1class.hxx
+++ b/sw/source/filter/ww1/w1class.hxx
@@ -385,6 +385,7 @@ public:
#endif
{
}
+ virtual ~Ww1SingleSprm();
};
class Ww1SingleSprmByteSized : public Ww1SingleSprm {
commit d2ba4593282ee3d7a168ba9bea4b913e2e8d4b0f
Author: Tor Lillqvist <tml at iki.fi>
Date: Thu Mar 1 08:15:35 2012 +0200
WaE: non-virtual destructor
(cherry picked from commit 944abe0d9fc0f28d99024f6b1850208048ca3004)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/writerfilter/source/doctok/WW8BinTableImpl.hxx b/writerfilter/source/doctok/WW8BinTableImpl.hxx
index fb9b710..5fdfd0c 100644
--- a/writerfilter/source/doctok/WW8BinTableImpl.hxx
+++ b/writerfilter/source/doctok/WW8BinTableImpl.hxx
@@ -61,6 +61,10 @@ public:
{
}
+ virtual ~PageNumber()
+ {
+ }
+
/// Return the page number
sal_uInt32 get() const { return mnPageNumber; }
diff --git a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
index cb3df83..9c33f52 100644
--- a/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
+++ b/writerfilter/source/doctok/WW8ResourceModelImpl.cxx
@@ -48,6 +48,8 @@ class WW8TableDataHandler : public TableDataHandler<string,
TablePropsPointer_t>
{
public:
+ virtual ~WW8TableDataHandler() {}
+
typedef boost::shared_ptr<WW8TableDataHandler> Pointer_t;
virtual void startTable(unsigned int nRows, unsigned int nDepth,
TablePropsPointer_t pProps);
diff --git a/writerfilter/source/resourcemodel/resourcemodel.cxx b/writerfilter/source/resourcemodel/resourcemodel.cxx
index bd230ad..c432880 100644
--- a/writerfilter/source/resourcemodel/resourcemodel.cxx
+++ b/writerfilter/source/resourcemodel/resourcemodel.cxx
@@ -105,6 +105,8 @@ class WW8TableDataHandler : public TableDataHandler<string,
TablePropsRef_t>
{
public:
+ virtual ~WW8TableDataHandler() {}
+
typedef boost::shared_ptr<WW8TableDataHandler> Pointer_t;
virtual void startTable(unsigned int nRows, unsigned int nDepth,
TablePropsRef_t pProps);
commit 2ed8748b0e7a7c4144a2f96b64b5c629520cbd52
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 17:13:26 2012 +0100
WaE: deleting object of abstract class type with non-virtual destructor
(cherry picked from commit 5f166e1d7f17619fd8790da31eff558b816df397)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index ae2032e..31e7d93 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -68,6 +68,9 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
+ ISaveValueWrapper::~ISaveValueWrapper()
+ {
+ }
//=========================================================================
//= OGenericAdministrationPage
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 51fd7f0..dd258de 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -47,6 +47,7 @@ namespace dbaui
class SAL_NO_VTABLE ISaveValueWrapper
{
public:
+ virtual ~ISaveValueWrapper() = 0;
virtual bool SaveValue() = 0;
virtual bool Disable() = 0;
};
commit cefc2430f8fed1715865eb55bf9d7c9014fa4466
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 18:04:13 2012 +0100
WaE: ordered comparison of pointer with integer zero
(cherry picked from commit 67334e0c9a57fbfb92d579f4eb27c7dc4a62e0df)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 7568618..e5e14bb 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -105,7 +105,7 @@ const OUString OfficePipeId::operator () ()
}
rtlDigest digest = rtl_digest_create( rtl_Digest_AlgorithmMD5 );
- if (digest <= 0) {
+ if (!digest) {
throw RuntimeException(
OUSTR("cannot get digest rtl_Digest_AlgorithmMD5!"), 0 );
}
commit 84ed82c66d879b7e4049017eabe0e8930593dabb
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 18:14:54 2012 +0100
WaE: deleting object of abstract class type with non-virtual destructor
(cherry picked from commit c94a2118bb498f7acc4326b73abfbab58cc09a66)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx
index 0647a1d..bdef6df 100644
--- a/lotuswordpro/source/filter/lwptblformula.cxx
+++ b/lotuswordpro/source/filter/lwptblformula.cxx
@@ -71,6 +71,10 @@
#include <rtl/ustrbuf.hxx>
#include <boost/scoped_array.hpp>
+LwpFormulaArg::~LwpFormulaArg()
+{
+}
+
//////////////////////////////////////////////////////////////////
LwpFormulaInfo::LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
: LwpCellList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx
index 648b926..ceaa419 100644
--- a/lotuswordpro/source/filter/lwptblformula.hxx
+++ b/lotuswordpro/source/filter/lwptblformula.hxx
@@ -109,6 +109,7 @@ class LwpTableLayout;
class LwpFormulaArg
{
public:
+ virtual ~LwpFormulaArg() = 0;
virtual rtl::OUString ToString(LwpTableLayout* pCellsMap)=0;
virtual String ToArgString(LwpTableLayout* pCellsMap){ return ToString(pCellsMap);}
};
commit 6ece1739798dc1344115b7f632f93a8bafb25ee5
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 16:47:30 2012 +0100
WaE: narrowing conversion from unsigned int to sal_Int32
(cherry picked from commit 69c049e528010d9fcf0ad764b5d03f438dd7c237)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 7923eb3..2977d6e 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -2108,9 +2108,9 @@ static const SvxMSDffTextRectangles mso_sptCircularArrowTextRect[] = // todo
static const SvxMSDffHandle mso_sptCircularArrowHandle[] =
{
{ MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
- 10800, 0x100, 10800, 10800, 10800, 10800, 0xff4c0000, 0x00b40000 },
+ 10800, 0x100, 10800, 10800, 10800, 10800, -0x7f4c0000, 0x00b40000 },
{ MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
- 0x102, 0x101, 10800, 10800, 0, 10800, 0xff4c0000, 0x00b40000 }
+ 0x102, 0x101, 10800, 10800, 0, 10800, -0x7f4c0000, 0x00b40000 }
};
static const mso_CustomShape msoCircularArrow =
{
commit 6b1520a89bd39f3115c9681d4b57bbbef7974aed
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 16:56:53 2012 +0100
WaE: deleting object of abstract class type with non-virtual destructor
(cherry picked from commit b293e58aa5e10e90081dac89826877c7d01c3adc)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/svtools/inc/svtools/colrdlg.hxx b/svtools/inc/svtools/colrdlg.hxx
index 09336e1..2c39576 100644
--- a/svtools/inc/svtools/colrdlg.hxx
+++ b/svtools/inc/svtools/colrdlg.hxx
@@ -49,6 +49,7 @@ class SVT_DLLPUBLIC SvColorDialog
{
public:
SvColorDialog( ::Window* pParent );
+ virtual ~SvColorDialog();
void SetColor( const Color& rColor );
const Color& GetColor() const;
diff --git a/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index fed70b9..7c553b1 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.cxx
@@ -54,7 +54,9 @@ SvColorDialog::SvColorDialog( Window* pWindow )
{
}
-// -----------------------------------------------------------------------
+SvColorDialog::~SvColorDialog()
+{
+}
void SvColorDialog::SetColor( const Color& rColor )
{
commit 487e9a13d8af860adfbcd893e09887b4c79ba742
Author: David Tardon <dtardon at redhat.com>
Date: Sun Jan 15 16:41:31 2012 +0100
WaE: narrowing conversion from unsigned int to sal_Int32
(cherry picked from commit 3d2253fb7ae4a9f8276160fac7b6596da4899316)
Signed-off-by: Michael Stahl <mstahl at redhat.com>
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index d8bb491..7923eb3 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -26,8 +26,13 @@
*
************************************************************************/
+#include <limits>
+
#include "svx/EnhancedCustomShapeGeometry.hxx"
#include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
+
+static const sal_Int32 MIN_INT32 = std::numeric_limits<sal_Int32>::min();
+
/*
static const SvxMSDffVertPair Vert[] =
{
@@ -58,7 +63,7 @@ static const mso_CustomShape mso =
(sal_Int32*)mso_sptDefault,
(SvxMSDffTextRectangles*)mso_sptTextRect, sizeof( mso_sptTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptVert, sizeof( mso_sptVert ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandles*)mso_sptHandles, sizeof( mso_sptHandles ) / sizeof( SvxMSDffHandles )
};
@@ -161,9 +166,9 @@ static const SvxMSDffVertPair mso_sptStandardGluePoints[] =
static const SvxMSDffHandle mso_sptArcHandle[] =
{
{ MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
- 10800, 0x100, 10800, 10800, 10800, 10800, 0x80000000, 0x7fffffff },
+ 10800, 0x100, 10800, 10800, 10800, 10800, MIN_INT32, 0x7fffffff },
{ MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
- 10800, 0x101, 10800, 10800, 10800, 10800, 0x80000000, 0x7fffffff }
+ 10800, 0x101, 10800, 10800, 10800, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoArc =
{
@@ -173,7 +178,7 @@ static const mso_CustomShape msoArc =
(sal_Int32*)mso_sptArcDefault,
NULL, 0,
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptArcHandle, sizeof( mso_sptArcHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -190,7 +195,7 @@ static const mso_CustomShape msoTextSimple =
NULL,
NULL, 0,
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // handles
};
@@ -207,7 +212,7 @@ static const mso_CustomShape msoRectangle =
NULL,
NULL, 0,
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // handles
};
@@ -242,7 +247,7 @@ static const SvxMSDffTextRectangles mso_sptRoundRectangleTextRect[] =
static const SvxMSDffHandle mso_sptRoundRectangleHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoRoundRectangle =
{
@@ -277,7 +282,7 @@ static const mso_CustomShape msoRightTriangle =
NULL,
(SvxMSDffTextRectangles*)mso_sptRightTriangleTextRect, sizeof( mso_sptRightTriangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptRightTriangleGluePoints, sizeof( mso_sptRightTriangleGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -306,7 +311,7 @@ static const mso_CustomShape msoEllipse =
NULL,
(SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -347,7 +352,7 @@ static const SvxMSDffVertPair mso_sptParallelogramGluePoints[] =
static const SvxMSDffHandle mso_sptParallelogramHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoParallelogram =
{
@@ -357,7 +362,7 @@ static const mso_CustomShape msoParallelogram =
(sal_Int32*)mso_sptDefault5400,
(SvxMSDffTextRectangles*)mso_sptParallelogramTextRect, sizeof( mso_sptParallelogramTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptParallelogramGluePoints, sizeof( mso_sptParallelogramGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptParallelogramHandle, sizeof( mso_sptParallelogramHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -378,7 +383,7 @@ static const mso_CustomShape msoDiamond =
NULL,
(SvxMSDffTextRectangles*)mso_sptDiamondTextRect, sizeof( mso_sptDiamondTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -412,7 +417,7 @@ static const SvxMSDffVertPair mso_sptTrapezoidGluePoints[] =
static const SvxMSDffHandle mso_sptTrapezoidHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 1, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 1, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoTrapezoid =
{
@@ -422,7 +427,7 @@ static const mso_CustomShape msoTrapezoid =
(sal_Int32*)mso_sptDefault5400,
(SvxMSDffTextRectangles*)mso_sptTrapezoidTextRect, sizeof( mso_sptTrapezoidTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptTrapezoidGluePoints, sizeof( mso_sptTrapezoidGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptTrapezoidHandle, sizeof( mso_sptTrapezoidHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -459,7 +464,7 @@ static const SvxMSDffTextRectangles mso_sptOctagonTextRect[] =
static const SvxMSDffHandle mso_sptOctagonHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoOctagon =
{
@@ -505,7 +510,7 @@ static const SvxMSDffVertPair mso_sptIsocelesTriangleGluePoints[] =
static const SvxMSDffHandle mso_sptIsocelesTriangleHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoIsocelesTriangle =
{
@@ -515,7 +520,7 @@ static const mso_CustomShape msoIsocelesTriangle =
(sal_Int32*)mso_sptDefault10800,
(SvxMSDffTextRectangles*)mso_sptIsocelesTriangleTextRect, sizeof( mso_sptIsocelesTriangleTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptIsocelesTriangleGluePoints, sizeof( mso_sptIsocelesTriangleGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptIsocelesTriangleHandle, sizeof( mso_sptIsocelesTriangleHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -544,7 +549,7 @@ static const SvxMSDffTextRectangles mso_sptHexagonTextRect[] =
static const SvxMSDffHandle mso_sptHexagonHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoHexagon =
{
@@ -554,7 +559,7 @@ static const mso_CustomShape msoHexagon =
(sal_Int32*)mso_sptDefault5400,
(SvxMSDffTextRectangles*)mso_sptHexagonTextRect, sizeof( mso_sptHexagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptHexagonHandle, sizeof( mso_sptHexagonHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -581,7 +586,7 @@ static const mso_CustomShape msoPentagon =
NULL,
(SvxMSDffTextRectangles*)mso_sptPentagonTextRect, sizeof( mso_sptPentagonTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptPentagonGluePoints, sizeof( mso_sptPentagonGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -606,7 +611,7 @@ static const SvxMSDffTextRectangles mso_sptPlusTextRect[] =
static const SvxMSDffHandle mso_sptPlusHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoPlus =
{
@@ -663,7 +668,7 @@ static const SvxMSDffVertPair mso_sptCanGluePoints[] =
static const SvxMSDffHandle mso_sptCanHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 7 + 3, 0x100, 44, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
+ 7 + 3, 0x100, 44, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
};
static const mso_CustomShape msoCan =
{
@@ -673,7 +678,7 @@ static const mso_CustomShape msoCan =
(sal_Int32*)mso_sptDefault5400,
(SvxMSDffTextRectangles*)mso_sptCanTextRect, sizeof( mso_sptCanTextRect ) / sizeof( SvxMSDffTextRectangles ),
88, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptCanGluePoints, sizeof( mso_sptCanGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptCanHandle, sizeof( mso_sptCanHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -715,7 +720,7 @@ static const mso_CustomShape msoArrow =
(sal_Int32*)mso_sptDefault16200and5400,
(SvxMSDffTextRectangles*)mso_sptArrowTextRect, sizeof( mso_sptArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptArrowHandle, sizeof( mso_sptArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -750,7 +755,7 @@ static const mso_CustomShape msoLeftArrow =
(sal_Int32*)mso_sptLeftArrowDefault,
(SvxMSDffTextRectangles*)mso_sptLeftArrowTextRect, sizeof( mso_sptLeftArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptLeftArrowHandle, sizeof( mso_sptLeftArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -781,7 +786,7 @@ static const mso_CustomShape msoDownArrow =
(sal_Int32*)mso_sptDefault16200and5400,
(SvxMSDffTextRectangles*)mso_sptDownArrowTextRect, sizeof( mso_sptDownArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptDownArrowHandle, sizeof( mso_sptDownArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -816,7 +821,7 @@ static const mso_CustomShape msoUpArrow =
(sal_Int32*)mso_sptUpArrowDefault,
(SvxMSDffTextRectangles*)mso_sptUpArrowTextRect, sizeof( mso_sptUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptUpArrowHandle, sizeof( mso_sptUpArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -865,7 +870,7 @@ static const mso_CustomShape msoLeftRightArrow =
(sal_Int32*)mso_sptLeftRightArrowDefault,
(SvxMSDffTextRectangles*)mso_sptLeftRightArrowTextRect, sizeof( mso_sptLeftRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptLeftRightArrowHandle, sizeof( mso_sptLeftRightArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -901,7 +906,7 @@ static const mso_CustomShape msoUpDownArrow =
(sal_Int32*)mso_sptUpDownArrowDefault,
(SvxMSDffTextRectangles*)mso_sptUpDownArrowTextRect, sizeof( mso_sptUpDownArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptUpDownArrowHandle, sizeof( mso_sptUpDownArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -941,7 +946,7 @@ static const SvxMSDffHandle mso_sptQuadArrowHandle[] =
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
0x101, 0x102, 10800, 10800, 0x100, 10800, 0, 0x100 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x100, 0, 10800, 10800, 0x102, 0x101, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0x102, 0x101, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoQuadArrow =
{
@@ -951,7 +956,7 @@ static const mso_CustomShape msoQuadArrow =
(sal_Int32*)mso_sptQuadArrowDefault,
(SvxMSDffTextRectangles*)mso_sptQuadArrowTextRect, sizeof( mso_sptQuadArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptQuadArrowHandle, sizeof( mso_sptQuadArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -990,7 +995,7 @@ static const SvxMSDffHandle mso_sptLeftRightUpArrowHandle[] =
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
0x101, 0x102, 10800, 10800, 0x100, 10800, 0, 0x100 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x100, 0, 10800, 10800, 0x102, 0x101, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0x102, 0x101, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoLeftRightUpArrow =
{
@@ -1000,7 +1005,7 @@ static const mso_CustomShape msoLeftRightUpArrow =
(sal_Int32*)mso_sptLeftRightUpArrowDefault,
(SvxMSDffTextRectangles*)mso_sptLeftRightUpArrowTextRect, sizeof( mso_sptLeftRightUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptLeftRightUpArrowHandle, sizeof( mso_sptLeftRightUpArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -1044,7 +1049,7 @@ static const mso_CustomShape msoBentArrow =
(sal_Int32*)mso_sptBentArrowDefault,
(SvxMSDffTextRectangles*)mso_sptBentArrowTextRect, sizeof( mso_sptBentArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptBentArrowHandle, sizeof( mso_sptBentArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -1075,7 +1080,7 @@ static const mso_CustomShape msoUturnArrow =
NULL,
(SvxMSDffTextRectangles*)mso_sptUturnArrowTextRect, sizeof( mso_sptUturnArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // handles
};
@@ -1117,7 +1122,7 @@ static const SvxMSDffHandle mso_sptLeftUpArrowHandle[] =
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
0x101, 0x102, 10800, 10800, 3 + 5, 21600, 0, 0x100 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x100, 0, 10800, 10800, 0x102, 3 + 9, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0x102, 3 + 9, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoLeftUpArrow =
{
@@ -1127,7 +1132,7 @@ static const mso_CustomShape msoLeftUpArrow =
(sal_Int32*)mso_sptLeftUpArrowDefault,
(SvxMSDffTextRectangles*)mso_sptLeftUpArrowTextRect, sizeof( mso_sptLeftUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptLeftUpArrowHandle, sizeof( mso_sptLeftUpArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -1170,7 +1175,7 @@ static const SvxMSDffHandle mso_sptBentUpArrowHandle[] =
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
0x101, 0x102, 10800, 10800, 3 + 5, 21600, 0, 0x100 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x100, 0, 10800, 10800, 0x102, 3 + 10, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0x102, 3 + 10, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoBentUpArrow =
{
@@ -1180,7 +1185,7 @@ static const mso_CustomShape msoBentUpArrow =
(sal_Int32*)mso_sptBentUpArrowDefault,
(SvxMSDffTextRectangles*)mso_sptBentUpArrowTextRect, sizeof( mso_sptBentUpArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptBentUpArrowHandle, sizeof( mso_sptBentUpArrowHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1288,7 +1293,7 @@ static const mso_CustomShape msoCurvedRightArrow =
(sal_Int32*)mso_sptCurvedRightDefault,
(SvxMSDffTextRectangles*)mso_sptCurvedRightTextRect, sizeof( mso_sptCurvedRightTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptCurvedRightGluePoints, sizeof( mso_sptCurvedRightGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptCurvedRightHandles, sizeof( mso_sptCurvedRightHandles ) / sizeof( SvxMSDffHandle )
};
@@ -1343,7 +1348,7 @@ static const mso_CustomShape msoCurvedDownArrow =
(sal_Int32*)mso_sptCurvedRightDefault,
(SvxMSDffTextRectangles*)mso_sptCurvedDownTextRect, sizeof( mso_sptCurvedDownTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptCurvedDownGluePoints, sizeof( mso_sptCurvedDownGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptCurvedDownHandles, sizeof( mso_sptCurvedDownHandles ) / sizeof( SvxMSDffHandle )
};
@@ -1449,7 +1454,7 @@ static const mso_CustomShape msoCurvedUpArrow =
(sal_Int32*)mso_sptCurvedUpDefault,
(SvxMSDffTextRectangles*)mso_sptCurvedUpTextRect, sizeof( mso_sptCurvedUpTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptCurvedUpGluePoints, sizeof( mso_sptCurvedUpGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptCurvedUpHandles, sizeof( mso_sptCurvedUpHandles ) / sizeof( SvxMSDffHandle )
};
@@ -1502,7 +1507,7 @@ static const mso_CustomShape msoCurvedLeftArrow =
(sal_Int32*)mso_sptCurvedUpDefault,
(SvxMSDffTextRectangles*)mso_sptCurvedLeftTextRect, sizeof( mso_sptCurvedLeftTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptCurvedLeftGluePoints, sizeof( mso_sptCurvedLeftGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptCurvedLeftHandles, sizeof( mso_sptCurvedLeftHandles ) / sizeof( SvxMSDffHandle )
};
@@ -1546,7 +1551,7 @@ static const mso_CustomShape msoStripedRightArrow =
(sal_Int32*)mso_sptDefault16200and5400,
(SvxMSDffTextRectangles*)mso_sptStripedRightArrowTextRect, sizeof( mso_sptStripedRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptStripedRightArrowHandle, sizeof( mso_sptStripedRightArrowHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1582,7 +1587,7 @@ static const mso_CustomShape msoNotchedRightArrow =
(sal_Int32*)mso_sptDefault16200and5400,
(SvxMSDffTextRectangles*)mso_sptNotchedRightArrowTextRect, sizeof( mso_sptNotchedRightArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptNotchedRightArrowHandle, sizeof( mso_sptNotchedRightArrowHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1611,7 +1616,7 @@ static const SvxMSDffTextRectangles mso_sptHomePlateTextRect[] = // todo
static const SvxMSDffHandle mso_sptHomePlateHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoHomePlate =
{
@@ -1621,7 +1626,7 @@ static const mso_CustomShape msoHomePlate =
(sal_Int32*)mso_sptHomePlateDefault,
(SvxMSDffTextRectangles*)mso_sptHomePlateTextRect, sizeof( mso_sptHomePlateTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptHomePlateHandle, sizeof( mso_sptHomePlateHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1651,7 +1656,7 @@ static const SvxMSDffTextRectangles mso_sptChevronTextRect[] = // todo
static const SvxMSDffHandle mso_sptChevronHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 0, 21600, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 21600, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoChevron =
{
@@ -1661,7 +1666,7 @@ static const mso_CustomShape msoChevron =
(sal_Int32*)mso_sptChevronDefault,
(SvxMSDffTextRectangles*)mso_sptChevronTextRect, sizeof( mso_sptChevronTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptChevronHandle, sizeof( mso_sptChevronHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1696,11 +1701,11 @@ static const SvxMSDffTextRectangles mso_sptRightArrowCalloutTextRect[] =
static const SvxMSDffHandle mso_sptRightArrowCalloutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x100, 0, 10800, 10800, 0, 0x102, 0x80000000, 0x7fffffff },
+ 0x100, 0, 10800, 10800, 0, 0x102, MIN_INT32, 0x7fffffff },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
0x102, 0x103, 10800, 10800, 0x100, 21600, 0x101, 10800 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
- 1, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x103 }
+ 1, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 }
};
static const mso_CustomShape msoRightArrowCallout =
{
@@ -1710,7 +1715,7 @@ static const mso_CustomShape msoRightArrowCallout =
(sal_Int32*)mso_sptRightArrowCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptRightArrowCalloutTextRect, sizeof( mso_sptRightArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptRightArrowCalloutHandle, sizeof( mso_sptRightArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1745,11 +1750,11 @@ static const SvxMSDffTextRectangles mso_sptLeftArrowCalloutTextRect[] =
static const SvxMSDffHandle mso_sptLeftArrowCalloutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
- 0x100, 0, 10800, 10800, 0x102, 21600, 0x80000000, 0x7fffffff },
+ 0x100, 0, 10800, 10800, 0x102, 21600, MIN_INT32, 0x7fffffff },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
0x102, 0x103, 10800, 10800, 0, 0x100, 0x101, 10800 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
- 0, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x103 }
+ 0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 }
};
static const mso_CustomShape msoLeftArrowCallout =
{
@@ -1759,7 +1764,7 @@ static const mso_CustomShape msoLeftArrowCallout =
(sal_Int32*)mso_sptLeftArrowCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptLeftArrowCalloutTextRect, sizeof( mso_sptLeftArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptLeftArrowCalloutHandle, sizeof( mso_sptLeftArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1794,11 +1799,11 @@ static const SvxMSDffTextRectangles mso_sptUpArrowCalloutTextRect[] =
static const SvxMSDffHandle mso_sptUpArrowCalloutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0x102, 21600 },
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 21600 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
0x103, 0x102, 10800, 10800, 0x101, 10800, 0, 0x100 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x101, 0, 10800, 10800, 0, 0x103, 0x80000000, 0x7fffffff }
+ 0x101, 0, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoUpArrowCallout =
{
@@ -1808,7 +1813,7 @@ static const mso_CustomShape msoUpArrowCallout =
(sal_Int32*)mso_sptUpArrowCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptUpArrowCalloutTextRect, sizeof( mso_sptUpArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptUpArrowCalloutHandle, sizeof( mso_sptUpArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1843,11 +1848,11 @@ static const SvxMSDffTextRectangles mso_sptDownArrowCalloutTextRect[] =
static const SvxMSDffHandle mso_sptDownArrowCalloutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x102 },
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x102 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
0x103, 0x102, 10800, 10800, 0x101, 10800, 0x100, 21600 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x101, 1, 10800, 10800, 0, 0x103, 0x80000000, 0x7fffffff }
+ 0x101, 1, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoDownArrowCallout =
{
@@ -1857,7 +1862,7 @@ static const mso_CustomShape msoDownArrowCallout =
(sal_Int32*)mso_sptDownArrowCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptDownArrowCalloutTextRect, sizeof( mso_sptDownArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptDownArrowCalloutHandle, sizeof( mso_sptDownArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1896,11 +1901,11 @@ static const SvxMSDffTextRectangles mso_sptLeftRightArrowCalloutTextRect[] =
static const SvxMSDffHandle mso_sptLeftRightArrowCalloutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
- 0x100, 0, 10800, 10800, 0x102, 10800, 0x80000000, 0x7fffffff },
+ 0x100, 0, 10800, 10800, 0x102, 10800, MIN_INT32, 0x7fffffff },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
0x102, 0x103, 10800, 10800, 0, 0x100, 0x101, 10800 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
- 0, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 0x103 }
+ 0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 0x103 }
};
static const mso_CustomShape msoLeftRightArrowCallout =
{
@@ -1910,7 +1915,7 @@ static const mso_CustomShape msoLeftRightArrowCallout =
(sal_Int32*)mso_sptLeftRightArrowCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptLeftRightArrowCalloutTextRect, sizeof( mso_sptLeftRightArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptLeftRightArrowCalloutHandle, sizeof( mso_sptLeftRightArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
};
@@ -1949,11 +1954,11 @@ static const SvxMSDffTextRectangles mso_sptUpDownArrowCalloutTextRect[] =
static const SvxMSDffHandle mso_sptUpDownArrowCalloutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0x102, 10800 },
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 10800 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
0x103, 0x102, 10800, 10800, 0x101, 10800, 0, 0x100 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MAX_IS_SPECIAL,
- 0x101, 0, 10800, 10800, 0, 0x103, 0x80000000, 0x7fffffff }
+ 0x101, 0, 10800, 10800, 0, 0x103, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoUpDownArrowCallout =
{
@@ -1963,7 +1968,7 @@ static const mso_CustomShape msoUpDownArrowCallout =
(sal_Int32*)mso_sptUpDownArrowCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptUpDownArrowCalloutTextRect, sizeof( mso_sptUpDownArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptUpDownArrowCalloutHandle, sizeof( mso_sptUpDownArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
};
@@ -2005,9 +2010,9 @@ static const SvxMSDffTextRectangles mso_sptQuadArrowCalloutTextRect[] =
static const SvxMSDffHandle mso_sptQuadArrowCalloutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_Y_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0x102, 0x101 },
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0x102, 0x101 },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL,
- 0x101, 0, 10800, 10800, 0x100, 10800, 0x80000000, 0x7fffffff },
+ 0x101, 0, 10800, 10800, 0x100, 10800, MIN_INT32, 0x7fffffff },
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_RANGE_X_MIN_IS_SPECIAL | MSDFF_HANDLE_FLAGS_RANGE_Y_MAX_IS_SPECIAL,
0x103, 0x102, 10800, 10800, 0x101, 10800, 0, 0x100 }
};
@@ -2019,7 +2024,7 @@ static const mso_CustomShape msoQuadArrowCallout =
(sal_Int32*)mso_sptQuadArrowCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptQuadArrowCalloutTextRect, sizeof( mso_sptQuadArrowCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptQuadArrowCalloutHandle, sizeof( mso_sptQuadArrowCalloutHandle ) / sizeof( SvxMSDffHandle )
};
@@ -2115,7 +2120,7 @@ static const mso_CustomShape msoCircularArrow =
(sal_Int32*)mso_sptCircularArrowDefault,
(SvxMSDffTextRectangles*)mso_sptCircularArrowTextRect, sizeof( mso_sptCircularArrowTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptCircularArrowHandle, sizeof( mso_sptCircularArrowHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -2155,7 +2160,7 @@ static const SvxMSDffTextRectangles mso_sptCubeTextRect[] =
static const SvxMSDffHandle mso_sptCubeHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
};
static const SvxMSDffVertPair mso_sptCubeGluePoints[] =
{
@@ -2204,7 +2209,7 @@ static const SvxMSDffTextRectangles mso_sptBevelTextRect[] =
static const SvxMSDffHandle mso_sptBevelHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoBevel =
{
@@ -2256,7 +2261,7 @@ static const SvxMSDffTextRectangles mso_sptFoldedCornerTextRect[] =
static const SvxMSDffHandle mso_sptFoldedCornerHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 1, 10800, 10800, 10800, 21600, 0x80000000, 0x7fffffff }
+ 0x100, 1, 10800, 10800, 10800, 21600, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoFoldedCorner =
{
@@ -2266,7 +2271,7 @@ static const mso_CustomShape msoFoldedCorner =
(sal_Int32*)mso_sptFoldedCornerDefault,
(SvxMSDffTextRectangles*)mso_sptFoldedCornerTextRect, sizeof( mso_sptFoldedCornerTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptFoldedCornerHandle, sizeof( mso_sptFoldedCornerHandle ) / sizeof( SvxMSDffHandle )
};
@@ -2300,7 +2305,7 @@ static const SvxMSDffTextRectangles mso_sptActionButtonBlankTextRect[] =
static const SvxMSDffHandle mso_sptButtonHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0x100, 0, 10800, 10800, 0, 5400, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 5400, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoActionButtonBlank =
{
@@ -3111,7 +3116,7 @@ static const sal_Int32 mso_sptSmileyFaceDefault[] =
static const SvxMSDffHandle mso_sptSmileyHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 15510, 17520 }
+ 10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 15510, 17520 }
};
static const mso_CustomShape msoSmileyFace =
{
@@ -3121,7 +3126,7 @@ static const mso_CustomShape msoSmileyFace =
(sal_Int32*)mso_sptSmileyFaceDefault,
(SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptSmileyHandle, sizeof( mso_sptSmileyHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3143,7 +3148,7 @@ static const SvxMSDffCalculationData mso_sptDonutCalc[] =
static const SvxMSDffHandle mso_sptDonutHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 10800, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 10800, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoDonut =
{
@@ -3153,7 +3158,7 @@ static const mso_CustomShape msoDonut =
(sal_Int32*)mso_sptDefault5400,
(SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptDonutHandle, sizeof( mso_sptDonutHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3192,7 +3197,7 @@ static const SvxMSDffCalculationData mso_sptNoSmokingCalc[] =
static const SvxMSDffHandle mso_sptNoSmokingHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 10800, 10800, 10800, 0, 7200, 0x80000000, 0x7fffffff }
+ 0x100, 10800, 10800, 10800, 0, 7200, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoNoSmoking =
{
@@ -3202,7 +3207,7 @@ static const mso_CustomShape msoNoSmoking =
(sal_Int32*)mso_sptDefault2700,
(SvxMSDffTextRectangles*)mso_sptEllipseTextRect, sizeof( mso_sptEllipseTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptNoSmokingHandle, sizeof( mso_sptNoSmokingHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3235,7 +3240,7 @@ static const SvxMSDffCalculationData mso_sptBlockArcCalc[] =
static const SvxMSDffHandle mso_sptBlockArcHandle[] =
{
{ MSDFF_HANDLE_FLAGS_POLAR | MSDFF_HANDLE_FLAGS_RADIUS_RANGE,
- 0x101, 0x100, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x101, 0x100, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoBlockArc =
{
@@ -3245,7 +3250,7 @@ static const mso_CustomShape msoBlockArc =
(sal_Int32*)mso_sptBlockArcDefault,
NULL, 0,
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptBlockArcHandle, sizeof( mso_sptBlockArcHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3309,7 +3314,7 @@ static const mso_CustomShape msoHeart =
NULL,
(SvxMSDffTextRectangles*)mso_sptHeartTextRect, sizeof( mso_sptHeartTextRect ) / sizeof( SvxMSDffTextRectangles ),
21615, 21602,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptHeartGluePoints, sizeof( mso_sptHeartGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -3337,7 +3342,7 @@ static const mso_CustomShape msoLightningBold =
NULL,
(SvxMSDffTextRectangles*)mso_sptLightningBoldTextRect, sizeof( mso_sptLightningBoldTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptLightningBoldGluePoints, sizeof( mso_sptLightningBoldGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -3431,7 +3436,7 @@ static const SvxMSDffTextRectangles mso_sptSunTextRect[] =
static const SvxMSDffHandle mso_sptSunHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 10800, 10800, 10800, 2700, 10125, 0x80000000, 0x7fffffff }
+ 0x100, 10800, 10800, 10800, 2700, 10125, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoSun =
{
@@ -3441,7 +3446,7 @@ static const mso_CustomShape msoSun =
(sal_Int32*)mso_sptDefault5400,
(SvxMSDffTextRectangles*)mso_sptSunTextRect, sizeof( mso_sptSunTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptSunHandle, sizeof( mso_sptSunHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3483,7 +3488,7 @@ static const SvxMSDffVertPair mso_sptMoonGluePoints[] =
static const SvxMSDffHandle mso_sptMoonHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 10800, 10800, 10800, 0, 18900, 0x80000000, 0x7fffffff }
+ 0x100, 10800, 10800, 10800, 0, 18900, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoMoon =
{
@@ -3493,7 +3498,7 @@ static const mso_CustomShape msoMoon =
(sal_Int32*)mso_sptDefault10800,
(SvxMSDffTextRectangles*)mso_sptMoonTextRect, sizeof( mso_sptMoonTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptMoonGluePoints, sizeof( mso_sptMoonGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptMoonHandle, sizeof( mso_sptMoonHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3536,7 +3541,7 @@ static const SvxMSDffTextRectangles mso_sptBracketPairTextRect[] =
static const SvxMSDffHandle mso_sptBracketPairHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoBracketPair =
{
@@ -3546,7 +3551,7 @@ static const mso_CustomShape msoBracketPair =
(sal_Int32*)mso_sptDefault3700,
(SvxMSDffTextRectangles*)mso_sptBracketPairTextRect, sizeof( mso_sptBracketPairTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 10800, 0x80000000,
+ 10800, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptBracketPairHandle, sizeof( mso_sptBracketPairHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3562,7 +3567,7 @@ static const SvxMSDffTextRectangles mso_sptPlaqueTextRect[] =
static const SvxMSDffHandle mso_sptPlaqueHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0x100, 0, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoPlaque =
{
@@ -3614,7 +3619,7 @@ static const SvxMSDffTextRectangles mso_sptBracePairTextRect[] =
static const SvxMSDffHandle mso_sptBracePairHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE | MSDFF_HANDLE_FLAGS_SWITCHED,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 }
};
static const mso_CustomShape msoBracePair =
{
@@ -3624,7 +3629,7 @@ static const mso_CustomShape msoBracePair =
(sal_Int32*)mso_sptDefault1800,
(SvxMSDffTextRectangles*)mso_sptBracePairTextRect, sizeof( mso_sptBracePairTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 10800, 0x80000000,
+ 10800, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptBracePairHandle, sizeof( mso_sptBracePairHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3657,7 +3662,7 @@ static const SvxMSDffVertPair mso_sptLeftBracketGluePoints[] =
static const SvxMSDffHandle mso_sptLeftBracketHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
};
static const mso_CustomShape msoLeftBracket =
{
@@ -3667,7 +3672,7 @@ static const mso_CustomShape msoLeftBracket =
(sal_Int32*)mso_sptDefault1800,
(SvxMSDffTextRectangles*)mso_sptLeftBracketTextRect, sizeof( mso_sptLeftBracketTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, sizeof( mso_sptLeftBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptLeftBracketHandle, sizeof( mso_sptLeftBracketHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3687,7 +3692,7 @@ static const SvxMSDffVertPair mso_sptRightBracketGluePoints[] =
static const SvxMSDffHandle mso_sptRightBracketHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 1, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
+ 1, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
};
static const mso_CustomShape msoRightBracket =
{
@@ -3697,7 +3702,7 @@ static const mso_CustomShape msoRightBracket =
(sal_Int32*)mso_sptDefault1800,
(SvxMSDffTextRectangles*)mso_sptRightBracketTextRect, sizeof( mso_sptRightBracketTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptRightBracketGluePoints, sizeof( mso_sptRightBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptRightBracketHandle, sizeof( mso_sptRightBracketHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3741,9 +3746,9 @@ static const SvxMSDffTextRectangles mso_sptLeftBraceTextRect[] =
static const SvxMSDffHandle mso_sptLeftBraceHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 },
+ 10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 },
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
+ 0, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
};
static const mso_CustomShape msoLeftBrace = // adj value0 0 -> 5400
{ // adj value1 0 -> 21600
@@ -3753,7 +3758,7 @@ static const mso_CustomShape msoLeftBrace = // adj value0 0 -> 5400
(sal_Int32*)mso_sptBraceDefault,
(SvxMSDffTextRectangles*)mso_sptLeftBraceTextRect, sizeof( mso_sptLeftBraceTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptLeftBracketGluePoints, sizeof( mso_sptLeftBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptLeftBraceHandle, sizeof( mso_sptLeftBraceHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3774,9 +3779,9 @@ static const SvxMSDffTextRectangles mso_sptRightBraceTextRect[] =
static const SvxMSDffHandle mso_sptRightBraceHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 },
+ 10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 },
{ MSDFF_HANDLE_FLAGS_RANGE,
- 1, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
+ 1, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
};
static const mso_CustomShape msoRightBrace = // adj value0 0 -> 5400
{ // adj value1 0 -> 21600
@@ -3786,7 +3791,7 @@ static const mso_CustomShape msoRightBrace = // adj value0 0 -> 5400
(sal_Int32*)mso_sptBraceDefault,
(SvxMSDffTextRectangles*)mso_sptRightBraceTextRect, sizeof( mso_sptRightBraceTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptRightBracketGluePoints, sizeof( mso_sptRightBracketGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptRightBraceHandle, sizeof( mso_sptRightBraceHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3816,7 +3821,7 @@ static const mso_CustomShape msoIrregularSeal1 =
NULL,
(SvxMSDffTextRectangles*)mso_sptIrregularSeal1TextRect, sizeof( mso_sptIrregularSeal1TextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptIrregularSeal1GluePoints, sizeof( mso_sptIrregularSeal1GluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -3848,7 +3853,7 @@ static const mso_CustomShape msoIrregularSeal2 =
NULL,
(SvxMSDffTextRectangles*)mso_sptIrregularSeal2TextRect, sizeof( mso_sptIrregularSeal2TextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptIrregularSeal2GluePoints, sizeof( mso_sptIrregularSeal2GluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -3874,7 +3879,7 @@ static const SvxMSDffTextRectangles mso_sptSeal4TextRect[] =
static const SvxMSDffHandle mso_sptSealHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 10800, 10800, 10800, 0, 10800, 0x80000000, 0x7fffffff }
+ 0x100, 10800, 10800, 10800, 0, 10800, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoSeal4 =
{
@@ -3884,7 +3889,7 @@ static const mso_CustomShape msoSeal4 =
(sal_Int32*)mso_sptDefault8100,
(SvxMSDffTextRectangles*)mso_sptSeal4TextRect, sizeof( mso_sptSeal4TextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -3907,7 +3912,7 @@ static const mso_CustomShape msoStar =
NULL,
(SvxMSDffTextRectangles*)mso_sptStarTextRect, sizeof( mso_sptStarTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // handles
};
@@ -4036,7 +4041,7 @@ static const mso_CustomShape msoSeal8 =
(sal_Int32*)mso_sptDefault2500,
(SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -4132,7 +4137,7 @@ static const mso_CustomShape msoSeal16 =
(sal_Int32*)mso_sptDefault2500,
(SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -4160,7 +4165,7 @@ static const mso_CustomShape msoSeal24 =
(sal_Int32*)mso_sptDefault2500,
(SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -4328,7 +4333,7 @@ static const mso_CustomShape msoSeal32 =
(sal_Int32*)mso_sptDefault2500,
(SvxMSDffTextRectangles*)mso_sptSealTextRect, sizeof( mso_sptSealTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptSealHandle, sizeof( mso_sptSealHandle ) / sizeof( SvxMSDffHandle )
};
@@ -4413,9 +4418,9 @@ static const SvxMSDffTextRectangles mso_sptRibbon2TextRect[] =
static const SvxMSDffHandle mso_sptRibbon2Handle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 2700, 8100, 0x80000000, 0x7fffffff },
+ 0x100, 0, 10800, 10800, 2700, 8100, MIN_INT32, 0x7fffffff },
{ MSDFF_HANDLE_FLAGS_RANGE,
- 10800, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 14400, 21600 }
+ 10800, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 14400, 21600 }
};
static const mso_CustomShape msoRibbon2 =
{
@@ -4425,7 +4430,7 @@ static const mso_CustomShape msoRibbon2 =
(sal_Int32*)mso_sptRibbon2Default,
(SvxMSDffTextRectangles*)mso_sptRibbon2TextRect, sizeof( mso_sptRibbon2TextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptRibbon2Handle, sizeof( mso_sptRibbon2Handle ) / sizeof( SvxMSDffHandle )
};
@@ -4494,9 +4499,9 @@ static const SvxMSDffVertPair mso_sptRibbonGluePoints[] =
static const SvxMSDffHandle mso_sptRibbonHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 2700, 8100, 0x80000000, 0x7fffffff },
+ 0x100, 0, 10800, 10800, 2700, 8100, MIN_INT32, 0x7fffffff },
{ MSDFF_HANDLE_FLAGS_RANGE,
- 10800, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0, 7200 }
+ 10800, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 7200 }
};
static const mso_CustomShape msoRibbon =
{
@@ -4506,7 +4511,7 @@ static const mso_CustomShape msoRibbon =
(sal_Int32*)mso_sptRibbonDefault,
(SvxMSDffTextRectangles*)mso_sptRibbonTextRect, sizeof( mso_sptRibbonTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptRibbonGluePoints, sizeof( mso_sptRibbonGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptRibbonHandle, sizeof( mso_sptRibbonHandle ) / sizeof( SvxMSDffHandle )
};
@@ -4562,7 +4567,7 @@ static const SvxMSDffTextRectangles mso_sptScrollTextRect[] =
static const SvxMSDffHandle mso_sptVerticalScrollHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 5400 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 5400 }
};
static const mso_CustomShape msoVerticalScroll =
{
@@ -4608,7 +4613,7 @@ static const sal_uInt16 mso_sptHorizontalScrollSegm[] =
static const SvxMSDffHandle mso_sptHorizontalScrollHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 0, 10800, 10800, 0, 5400, 0x80000000, 0x7fffffff }
+ 0x100, 0, 10800, 10800, 0, 5400, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoHorizontalScroll =
{
@@ -4635,7 +4640,7 @@ static const mso_CustomShape msoFlowChartProcess =
NULL,
NULL, 0,
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4672,7 +4677,7 @@ static const mso_CustomShape msoFlowChartAlternateProcess =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartAlternateProcessTextRect, sizeof( mso_sptFlowChartAlternateProcessTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4693,7 +4698,7 @@ static const mso_CustomShape msoFlowChartDecision =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartDecisionTextRect, sizeof( mso_sptFlowChartDecisionTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4718,7 +4723,7 @@ static const mso_CustomShape msoFlowChartInputOutput =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartInputOutputTextRect, sizeof( mso_sptFlowChartInputOutputTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartInputOutputGluePoints, sizeof( mso_sptFlowChartInputOutputGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4749,7 +4754,7 @@ static const mso_CustomShape msoFlowChartPredefinedProcess =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartPredefinedProcessTextRect, sizeof( mso_sptFlowChartPredefinedProcessTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // handles
};
@@ -4780,7 +4785,7 @@ static const mso_CustomShape msoFlowChartInternalStorage =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartInternalStorageTextRect, sizeof( mso_sptFlowChartInternalStorageTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // handles
};
@@ -4811,7 +4816,7 @@ static const mso_CustomShape msoFlowChartDocument =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartDocumentTextRect, sizeof( mso_sptFlowChartDocumentTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartDocumentGluePoints, sizeof( mso_sptFlowChartDocumentGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4850,7 +4855,7 @@ static const mso_CustomShape msoFlowChartMultidocument =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartMultidocumentTextRect, sizeof( mso_sptFlowChartMultidocumentTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartMultidocumentGluePoints, sizeof( mso_sptFlowChartMultidocumentGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4876,7 +4881,7 @@ static const mso_CustomShape msoFlowChartTerminator =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartTerminatorTextRect, sizeof( mso_sptFlowChartTerminatorTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4898,7 +4903,7 @@ static const mso_CustomShape msoFlowChartPreparation =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartPreparationTextRect, sizeof( mso_sptFlowChartPreparationTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4923,7 +4928,7 @@ static const mso_CustomShape msoFlowChartManualInput =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartManualInputTextRect, sizeof( mso_sptFlowChartManualInputTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartManualInputGluePoints, sizeof( mso_sptFlowChartManualInputGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4948,7 +4953,7 @@ static const mso_CustomShape msoFlowChartManualOperation =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartManualOperationTextRect, sizeof( mso_sptFlowChartManualOperationTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartManualOperationGluePoints, sizeof( mso_sptFlowChartManualOperationGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4973,7 +4978,7 @@ static const mso_CustomShape msoFlowChartConnector =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartConnectorTextRect, sizeof( mso_sptFlowChartConnectorTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -4995,7 +5000,7 @@ static const mso_CustomShape msoFlowChartOffpageConnector =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartOffpageConnectorTextRect, sizeof( mso_sptFlowChartOffpageConnectorTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5017,7 +5022,7 @@ static const mso_CustomShape msoFlowChartPunchedCard =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartPunchedCardTextRect, sizeof( mso_sptFlowChartPunchedCardTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5055,7 +5060,7 @@ static const mso_CustomShape msoFlowChartPunchedTape =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartPunchedTapeTextRect, sizeof( mso_sptFlowChartPunchedTapeTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartPunchedTapeGluePoints, sizeof( mso_sptFlowChartPunchedTapeGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5088,7 +5093,7 @@ static const mso_CustomShape msoFlowChartSummingJunction =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartSummingJunctionTextRect, sizeof( mso_sptFlowChartSummingJunctionTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5119,7 +5124,7 @@ static const mso_CustomShape msoFlowChartOr =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartOrTextRect, sizeof( mso_sptFlowChartOrTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptEllipseGluePoints, sizeof( mso_sptEllipseGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5144,7 +5149,7 @@ static const mso_CustomShape msoFlowChartCollate =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartCollateTextRect, sizeof( mso_sptFlowChartCollateTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartCollateGluePoints, sizeof( mso_sptFlowChartCollateGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5172,7 +5177,7 @@ static const mso_CustomShape msoFlowChartSort =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartSortTextRect, sizeof( mso_sptFlowChartSortTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // handles
};
@@ -5197,7 +5202,7 @@ static const mso_CustomShape msoFlowChartExtract =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartExtractTextRect, sizeof( mso_sptFlowChartExtractTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, sizeof( mso_sptFlowChartExtractGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5218,7 +5223,7 @@ static const mso_CustomShape msoFlowChartMerge =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartMergeTextRect, sizeof( mso_sptFlowChartMergeTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartExtractGluePoints, sizeof( mso_sptFlowChartExtractGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5248,7 +5253,7 @@ static const mso_CustomShape msoFlowChartOnlineStorage =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartOnlineStorageTextRect, sizeof( mso_sptFlowChartOnlineStorageTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartOnlineStorageGluePoints, sizeof( mso_sptFlowChartOnlineStorageGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5274,7 +5279,7 @@ static const mso_CustomShape msoFlowChartDelay =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartDelayTextRect, sizeof( mso_sptFlowChartDelayTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5303,7 +5308,7 @@ static const mso_CustomShape msoFlowChartMagneticTape =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartMagneticTapeTextRect, sizeof( mso_sptFlowChartMagneticTapeTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5336,7 +5341,7 @@ static const mso_CustomShape msoFlowChartMagneticDisk =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDiskTextRect, sizeof( mso_sptFlowChartMagneticDiskTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartMagneticDiskGluePoints, sizeof( mso_sptFlowChartMagneticDiskGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5369,7 +5374,7 @@ static const mso_CustomShape msoFlowChartMagneticDrum =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartMagneticDrumTextRect, sizeof( mso_sptFlowChartMagneticDrumTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptFlowChartMagneticDrumGluePoints, sizeof( mso_sptFlowChartMagneticDrumGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5395,7 +5400,7 @@ static const mso_CustomShape msoFlowChartDisplay =
NULL,
(SvxMSDffTextRectangles*)mso_sptFlowChartDisplayTextRect, sizeof( mso_sptFlowChartDisplayTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptStandardGluePoints, sizeof( mso_sptStandardGluePoints ) / sizeof( SvxMSDffVertPair ),
NULL, 0 // handles
};
@@ -5477,7 +5482,7 @@ static const SvxMSDffHandle mso_sptCalloutHandle[] =
{
{
0,
- 0x100, 0x101, 10800, 10800, 0x80000000, 0x7fffffff, 0x80000000, 0x7fffffff
+ 0x100, 0x101, 10800, 10800, MIN_INT32, 0x7fffffff, MIN_INT32, 0x7fffffff
}
};
static const mso_CustomShape msoWedgeRectCallout =
@@ -5488,7 +5493,7 @@ static const mso_CustomShape msoWedgeRectCallout =
(sal_Int32*)mso_sptWedgeRectCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptWedgeRectCalloutTextRect, sizeof( mso_sptWedgeRectCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptWedgeRectCalloutGluePoints, sizeof( mso_sptWedgeRectCalloutGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -5524,7 +5529,7 @@ static const mso_CustomShape msoWedgeRRectCallout =
(sal_Int32*)mso_sptWedgeRectCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptWedgeRRectCalloutTextRect, sizeof( mso_sptWedgeRRectCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -5548,7 +5553,7 @@ static const SvxMSDffHandle mso_sptBalloonHandle[] =
{
{
MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 1, 10800, 10800, 0, 8990, 0x80000000, 0x7fffffff
+ 0x100, 1, 10800, 10800, 0, 8990, MIN_INT32, 0x7fffffff
}
};
static const SvxMSDffTextRectangles mso_sptBalloonTextRect[] =
@@ -5563,7 +5568,7 @@ static const mso_CustomShape msoBalloon =
(sal_Int32*)mso_sptWedgeRectCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptBalloonTextRect, sizeof( mso_sptBalloonTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptBalloonHandle, sizeof( mso_sptBalloonHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -5622,7 +5627,7 @@ static const mso_CustomShape msoWedgeEllipseCallout =
(sal_Int32*)mso_sptWedgeEllipseCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptWedgeEllipseCalloutTextRect, sizeof( mso_sptWedgeEllipseCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptWedgeEllipseCalloutGluePoints, sizeof( mso_sptWedgeEllipseCalloutGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -5727,7 +5732,7 @@ static const mso_CustomShape msoCloudCallout =
(sal_Int32*)mso_sptCloudCalloutDefault,
(SvxMSDffTextRectangles*)mso_sptCloudCalloutTextRect, sizeof( mso_sptCloudCalloutTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptCalloutHandle, sizeof( mso_sptCalloutHandle ) / sizeof( SvxMSDffHandle ) // handles
};
@@ -5785,9 +5790,9 @@ static const sal_uInt16 mso_sptWaveSegm[] =
static const SvxMSDffHandle mso_sptWaveHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 4460 },
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 4460 },
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x101, 21600, 10800, 10800, 8640, 12960, 0x80000000, 0x7fffffff }
+ 0x101, 21600, 10800, 10800, 8640, 12960, MIN_INT32, 0x7fffffff }
};
static const sal_Int32 mso_sptWaveDefault[] =
{
@@ -5805,7 +5810,7 @@ static const mso_CustomShape msoWave =
(sal_Int32*)mso_sptWaveDefault,
(SvxMSDffTextRectangles*)mso_sptWaveTextRect, sizeof( mso_sptWaveTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptWaveGluePoints, sizeof( mso_sptWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptWaveHandle, sizeof( mso_sptWaveHandle ) / sizeof( SvxMSDffHandle )
};
@@ -5867,9 +5872,9 @@ static const sal_uInt16 mso_sptDoubleWaveSegm[] =
static const SvxMSDffHandle mso_sptDoubleWaveHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 2230 },
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 2230 },
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x101, 21600, 10800, 10800, 8640, 12960, 0x80000000, 0x7fffffff }
+ 0x101, 21600, 10800, 10800, 8640, 12960, MIN_INT32, 0x7fffffff }
};
static const sal_Int32 mso_sptDoubleWaveDefault[] =
{
@@ -5887,7 +5892,7 @@ static const mso_CustomShape msoDoubleWave =
(sal_Int32*)mso_sptDoubleWaveDefault,
(SvxMSDffTextRectangles*)mso_sptDoubleWaveTextRect, sizeof( mso_sptDoubleWaveTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
(SvxMSDffVertPair*)mso_sptDoubleWaveGluePoints, sizeof( mso_sptDoubleWaveGluePoints ) / sizeof( SvxMSDffVertPair ),
(SvxMSDffHandle*)mso_sptDoubleWaveHandle, sizeof( mso_sptDoubleWaveHandle ) / sizeof( SvxMSDffHandle )
};
@@ -5985,7 +5990,7 @@ static const mso_CustomShape msoFontWork =
NULL,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
NULL, 0 // Handles
};
@@ -6013,7 +6018,7 @@ static const sal_uInt16 mso_sptTextPlainTextSegm[] =
static const SvxMSDffHandle mso_sptTextPlainTextHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0x100, 21600, 10800, 10800, 6629, 14971, 0x80000000, 0x7fffffff }
+ 0x100, 21600, 10800, 10800, 6629, 14971, MIN_INT32, 0x7fffffff }
};
static const mso_CustomShape msoTextPlainText =
{
@@ -6023,7 +6028,7 @@ static const mso_CustomShape msoTextPlainText =
(sal_Int32*)mso_sptDefault10800,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextPlainTextHandle, sizeof( mso_sptTextPlainTextHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6050,7 +6055,7 @@ static const sal_Int32 mso_sptTextStopDefault[] =
static const SvxMSDffHandle mso_sptTextStopHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 3080, 10800 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 3080, 10800 }
};
static const mso_CustomShape msoTextStop =
{
@@ -6060,7 +6065,7 @@ static const mso_CustomShape msoTextStop =
(sal_Int32*)mso_sptTextStopDefault,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextStopHandle, sizeof( mso_sptTextStopHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6081,7 +6086,7 @@ static const sal_uInt16 mso_sptTextTriangleSegm[] =
static const SvxMSDffHandle mso_sptTextTriangleHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 21600 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 21600 }
};
static const mso_CustomShape msoTextTriangle =
{
@@ -6091,7 +6096,7 @@ static const mso_CustomShape msoTextTriangle =
(sal_Int32*)mso_sptDefault10800,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextTriangleHandle, sizeof( mso_sptTextTriangleHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6112,7 +6117,7 @@ static const mso_CustomShape msoTextTriangleInverted =
(sal_Int32*)mso_sptDefault10800,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextTriangleHandle, sizeof( mso_sptTextTriangleHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6134,7 +6139,7 @@ static const sal_uInt16 mso_sptTextChevronSegm[] =
static const SvxMSDffHandle mso_sptTextChevronHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
};
static const mso_CustomShape msoTextChevron =
{
@@ -6144,7 +6149,7 @@ static const mso_CustomShape msoTextChevron =
(sal_Int32*)mso_sptDefault5400,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextChevronHandle, sizeof( mso_sptTextChevronHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6166,7 +6171,7 @@ static const sal_uInt16 mso_sptTextChevronInvertedSegm[] =
static const SvxMSDffHandle mso_sptTextChevronInvertedHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 0, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
+ 0, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 10800, 21600 }
};
static const mso_CustomShape msoTextChevronInverted =
{
@@ -6176,7 +6181,7 @@ static const mso_CustomShape msoTextChevronInverted =
(sal_Int32*)mso_sptDefault16200,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextChevronInvertedHandle, sizeof( mso_sptTextChevronInvertedHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6199,7 +6204,7 @@ static const sal_uInt16 mso_sptTextRingOutsideSegm[] =
static const SvxMSDffHandle mso_sptTextRingOutsideHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 10800, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 10800, 21600 }
+ 10800, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 10800, 21600 }
};
static const mso_CustomShape msoTextRingOutside =
{
@@ -6209,7 +6214,7 @@ static const mso_CustomShape msoTextRingOutside =
(sal_Int32*)mso_sptDefault16200,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextRingOutsideHandle, sizeof( mso_sptTextRingOutsideHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6231,7 +6236,7 @@ static const sal_uInt16 mso_sptTextFadeSegm[] =
static const SvxMSDffHandle mso_sptTextFadeRightHandle[] =
{
{ MSDFF_HANDLE_FLAGS_RANGE,
- 21600, 0x100, 10800, 10800, 0x80000000, 0x7fffffff, 0, 10800 }
+ 21600, 0x100, 10800, 10800, MIN_INT32, 0x7fffffff, 0, 10800 }
};
static const mso_CustomShape msoTextFadeRight =
{
@@ -6241,7 +6246,7 @@ static const mso_CustomShape msoTextFadeRight =
(sal_Int32*)mso_sptDefault7200,
(SvxMSDffTextRectangles*)mso_sptFontWorkTextRect, sizeof( mso_sptFontWorkTextRect ) / sizeof( SvxMSDffTextRectangles ),
21600, 21600,
- 0x80000000, 0x80000000,
+ MIN_INT32, MIN_INT32,
NULL, 0,
(SvxMSDffHandle*)mso_sptTextFadeRightHandle, sizeof( mso_sptTextFadeRightHandle ) / sizeof( SvxMSDffHandle )
};
@@ -6253,7 +6258,7 @@ static const SvxMSDffVertPair mso_sptTextFadeLeftVert[] =
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list