[ooo-build-commit] patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Sep 7 06:51:01 PDT 2009
patches/dev300/apply | 3
patches/dev300/svx-visibility.diff | 268 -------------------------------------
2 files changed, 271 deletions(-)
New commits:
commit f4b43c5a734128c3a4ec13ab7006b18f8b66175c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Sep 7 16:45:35 2009 +0300
svx-visibility.diff is upstream in dev300-m57
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 0b9f1fe..54dd7be 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3087,9 +3087,6 @@ odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
# FIXME: 2009-08-17: These don't apply either. Can't find file to patch etc. --tml
# xlsx-export-skip-auto-format.diff, n#497560, janneke
-# fixes visibility to make it work with some compilers
-svx-visibility.diff, fridrich
-
# the smart art import work
unoxml-fast-sax-serializable.diff, thorsten
# FIXME: similar fix already in dev300_m50
diff --git a/patches/dev300/svx-visibility.diff b/patches/dev300/svx-visibility.diff
deleted file mode 100644
index e19b064..0000000
--- a/patches/dev300/svx-visibility.diff
+++ /dev/null
@@ -1,268 +0,0 @@
---- svx/inc/svx/sdtfchim.hxx
-+++ svx/inc/svx/sdtfchim.hxx
-@@ -32,28 +32,28 @@
-
- #include <svx/svddef.hxx>
-
--class SdrTextFixedCellHeightItem : public SfxBoolItem
-+class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
- {
- public:
-
- TYPEINFO();
- SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE );
-- SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
-+ SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
-
-- virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation,
- SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric,
- String &rText, const IntlWrapper * = 0) const;
-
-- virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const;
-- virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const;
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
-- virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const;
-+ SVX_DLLPRIVATE virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
-+ SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
-
-- virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-- virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
-+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
-
- #ifdef SDR_ISPOOLABLE
-- virtual int IsPoolable() const;
-+ SVX_DLLPRIVATE virtual int IsPoolable() const;
- #endif
- };
-
---- svx/inc/svx/xflbckit.hxx
-+++ svx/inc/svx/xflbckit.hxx
-@@ -41,13 +41,13 @@
- TYPEINFO();
-
- XFillBackgroundItem( BOOL bFill = FALSE );
-- XFillBackgroundItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
-
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
---- svx/inc/svx/xflbmpit.hxx
-+++ svx/inc/svx/xflbmpit.hxx
-@@ -39,18 +39,18 @@
- public:
- TYPEINFO();
- XFillBmpPosItem( RECT_POINT eRP = RP_MM );
-- XFillBmpPosItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-
-- virtual USHORT GetValueCount() const;
-- RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); }
-+ SVX_DLLPRIVATE virtual USHORT GetValueCount() const;
-+ SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); }
- };
-
-
---- svx/inc/svx/xflbmsli.hxx
-+++ svx/inc/svx/xflbmsli.hxx
-@@ -39,12 +39,12 @@
- public:
- TYPEINFO();
- XFillBmpSizeLogItem( BOOL bLog = TRUE );
-- XFillBmpSizeLogItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
---- svx/inc/svx/xflbmsxy.hxx
-+++ svx/inc/svx/xflbmsxy.hxx
-@@ -39,12 +39,12 @@
- public:
- TYPEINFO();
- XFillBmpSizeXItem( long nSizeX = 0 );
-- XFillBmpSizeXItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-@@ -57,7 +57,7 @@
- // Dieses Item nimmt sowohl metrische als auch
- // Prozentwerte ( sind negativ ) auf; das muessen
- // wir hier beruecksichtigen
-- virtual FASTBOOL HasMetrics() const;
-+ SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const;
- };
-
- /*************************************************************************
-@@ -66,12 +66,12 @@
- public:
- TYPEINFO();
- XFillBmpSizeYItem( long nSizeY = 0 );
-- XFillBmpSizeYItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-@@ -84,7 +84,7 @@
- // Dieses Item nimmt sowohl metrische als auch
- // Prozentwerte ( sind negativ ) auf; das muessen
- // wir hier beruecksichtigen
-- virtual FASTBOOL HasMetrics() const;
-+ SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const;
- };
-
- #endif
---- svx/inc/svx/xflboxy.hxx
-+++ svx/inc/svx/xflboxy.hxx
-@@ -39,12 +39,12 @@
- public:
- TYPEINFO();
- XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 );
-- XFillBmpPosOffsetXItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-@@ -62,12 +62,12 @@
- public:
- TYPEINFO();
- XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 );
-- XFillBmpPosOffsetYItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
---- svx/inc/svx/xflbtoxy.hxx
-+++ svx/inc/svx/xflbtoxy.hxx
-@@ -39,12 +39,12 @@
- public:
- TYPEINFO();
- XFillBmpTileOffsetXItem( USHORT nOffX = 0 );
-- XFillBmpTileOffsetXItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-@@ -62,12 +62,12 @@
- public:
- TYPEINFO();
- XFillBmpTileOffsetYItem( USHORT nOffX = 0 );
-- XFillBmpTileOffsetYItem( SvStream& rIn );
-+ SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn );
-
-- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
---- svx/inc/svx/xsflclit.hxx
-+++ svx/inc/svx/xsflclit.hxx
-@@ -36,24 +36,24 @@
- //------------------------------
- // class XSecondaryFillColorItem
- //------------------------------
--class XSecondaryFillColorItem : public XColorItem
-+class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
- {
- public:
- TYPEINFO();
-- XSecondaryFillColorItem() {}
-- XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
-+ SVX_DLLPRIVATE XSecondaryFillColorItem() {}
-+ SVX_DLLPRIVATE XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
- XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
-- XSecondaryFillColorItem(SvStream& rIn);
-+ SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
-
-- virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
-+ SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
-
-- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-+ SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- String &rText, const IntlWrapper * = 0 ) const;
-
-- virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
-+ SVX_DLLPRIVATE virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
-
- };
-
More information about the ooo-build-commit
mailing list