[ooo-build-commit] 2 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Mon Aug 17 05:19:16 PDT 2009
patches/dev300/apply | 18 +++-
patches/dev300/svx-visibility.diff | 152 +++++++++----------------------------
2 files changed, 52 insertions(+), 118 deletions(-)
New commits:
commit 8ea8b9c223a0e75c697abe731785bc5324598d48
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 17 15:18:00 2009 +0300
Adapt svx-visibility.diff for dev300-m54
* patches/dev300/svx-visibility.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/svx-visibility.diff b/patches/dev300/svx-visibility.diff
index b14aa7d..e19b064 100644
--- a/patches/dev300/svx-visibility.diff
+++ b/patches/dev300/svx-visibility.diff
@@ -1,6 +1,5 @@
-diff -u -r svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfchim.hxx
---- svx/inc/svx/sdtfchim.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/sdtfchim.hxx 2009-05-18 07:49:35.000000000 +0200
+--- svx/inc/svx/sdtfchim.hxx
++++ svx/inc/svx/sdtfchim.hxx
@@ -32,28 +32,28 @@
#include <svx/svddef.hxx>
@@ -11,9 +10,8 @@ diff -u -r svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfchim.hxx
public:
TYPEINFO();
-- SVX_DLLPUBLIC SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE );
+ SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE );
- SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
-+ SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE );
+ SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
- virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation,
@@ -41,22 +39,13 @@ diff -u -r svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfchim.hxx
#endif
};
-diff -u -r svx/inc/svx/xflbckit.hxx svx/inc/svx/xflbckit.hxx
---- svx/inc/svx/xflbckit.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/xflbckit.hxx 2009-05-18 07:14:52.000000000 +0200
-@@ -41,19 +41,19 @@
- |*
- \************************************************************************/
-
--class XFillBackgroundItem : public SfxBoolItem
-+class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
- {
- public:
+--- svx/inc/svx/xflbckit.hxx
++++ svx/inc/svx/xflbckit.hxx
+@@ -41,13 +41,13 @@
TYPEINFO();
-- SVX_DLLPUBLIC XFillBackgroundItem( BOOL bFill = FALSE );
+ XFillBackgroundItem( BOOL bFill = FALSE );
- XFillBackgroundItem( SvStream& rIn );
-+ XFillBackgroundItem( BOOL bFill = FALSE );
+ SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
@@ -70,21 +59,13 @@ diff -u -r svx/inc/svx/xflbckit.hxx svx/inc/svx/xflbckit.hxx
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
-diff -u -r svx/inc/svx/xflbmpit.hxx svx/inc/svx/xflbmpit.hxx
---- svx/inc/svx/xflbmpit.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/xflbmpit.hxx 2009-05-18 07:22:26.000000000 +0200
-@@ -39,23 +39,23 @@
- |*
- \************************************************************************/
-
--class XFillBmpPosItem : public SfxEnumItem
-+class SVX_DLLPUBLIC XFillBmpPosItem : public SfxEnumItem
- {
+--- svx/inc/svx/xflbmpit.hxx
++++ svx/inc/svx/xflbmpit.hxx
+@@ -39,18 +39,18 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpPosItem( RECT_POINT eRP = RP_MM );
+ XFillBmpPosItem( RECT_POINT eRP = RP_MM );
- XFillBmpPosItem( SvStream& rIn );
-+ XFillBmpPosItem( RECT_POINT eRP = RP_MM );
+ SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -105,21 +86,13 @@ diff -u -r svx/inc/svx/xflbmpit.hxx svx/inc/svx/xflbmpit.hxx
};
-diff -u -r svx/inc/svx/xflbmsli.hxx svx/inc/svx/xflbmsli.hxx
---- svx/inc/svx/xflbmsli.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/xflbmsli.hxx 2009-05-18 07:09:51.000000000 +0200
-@@ -39,17 +39,17 @@
- |*
- \************************************************************************/
-
--class XFillBmpSizeLogItem : public SfxBoolItem
-+class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
- {
+--- svx/inc/svx/xflbmsli.hxx
++++ svx/inc/svx/xflbmsli.hxx
+@@ -39,12 +39,12 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpSizeLogItem( BOOL bLog = TRUE );
+ XFillBmpSizeLogItem( BOOL bLog = TRUE );
- XFillBmpSizeLogItem( SvStream& rIn );
-+ XFillBmpSizeLogItem( BOOL bLog = TRUE );
+ SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -132,21 +105,13 @@ diff -u -r svx/inc/svx/xflbmsli.hxx svx/inc/svx/xflbmsli.hxx
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
-diff -u -r svx/inc/svx/xflbmsxy.hxx svx/inc/svx/xflbmsxy.hxx
---- svx/inc/svx/xflbmsxy.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/xflbmsxy.hxx 2009-05-18 07:30:46.000000000 +0200
-@@ -39,17 +39,17 @@
- |*
- \************************************************************************/
-
--class XFillBmpSizeXItem : public SfxMetricItem
-+class SVX_DLLPUBLIC XFillBmpSizeXItem : public SfxMetricItem
- {
+--- svx/inc/svx/xflbmsxy.hxx
++++ svx/inc/svx/xflbmsxy.hxx
+@@ -39,12 +39,12 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpSizeXItem( long nSizeX = 0 );
+ XFillBmpSizeXItem( long nSizeX = 0 );
- XFillBmpSizeXItem( SvStream& rIn );
-+ XFillBmpSizeXItem( long nSizeX = 0 );
+ SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -168,18 +133,11 @@ diff -u -r svx/inc/svx/xflbmsxy.hxx svx/inc/svx/xflbmsxy.hxx
};
/*************************************************************************
-@@ -66,17 +66,17 @@
- |*
- \************************************************************************/
-
--class XFillBmpSizeYItem : public SfxMetricItem
-+class SVX_DLLPUBLIC XFillBmpSizeYItem : public SfxMetricItem
- {
+@@ -66,12 +66,12 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpSizeYItem( long nSizeY = 0 );
+ XFillBmpSizeYItem( long nSizeY = 0 );
- XFillBmpSizeYItem( SvStream& rIn );
-+ XFillBmpSizeYItem( long nSizeY = 0 );
+ SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -201,21 +159,13 @@ diff -u -r svx/inc/svx/xflbmsxy.hxx svx/inc/svx/xflbmsxy.hxx
};
#endif
-diff -u -r svx/inc/svx/xflboxy.hxx svx/inc/svx/xflboxy.hxx
---- svx/inc/svx/xflboxy.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/xflboxy.hxx 2009-05-18 07:33:05.000000000 +0200
-@@ -39,17 +39,17 @@
- |*
- \************************************************************************/
-
--class XFillBmpPosOffsetXItem : public SfxUInt16Item
-+class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item
- {
+--- svx/inc/svx/xflboxy.hxx
++++ svx/inc/svx/xflboxy.hxx
+@@ -39,12 +39,12 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 );
+ XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 );
- XFillBmpPosOffsetXItem( SvStream& rIn );
-+ XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 );
+ SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -228,18 +178,11 @@ diff -u -r svx/inc/svx/xflboxy.hxx svx/inc/svx/xflboxy.hxx
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
-@@ -62,17 +62,17 @@
- |*
- \************************************************************************/
-
--class XFillBmpPosOffsetYItem : public SfxUInt16Item
-+class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
- {
+@@ -62,12 +62,12 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 );
+ XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 );
- XFillBmpPosOffsetYItem( SvStream& rIn );
-+ XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 );
+ SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -252,21 +195,13 @@ diff -u -r svx/inc/svx/xflboxy.hxx svx/inc/svx/xflboxy.hxx
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
-diff -u -r svx/inc/svx/xflbtoxy.hxx svx/inc/svx/xflbtoxy.hxx
---- svx/inc/svx/xflbtoxy.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/xflbtoxy.hxx 2009-05-18 07:36:45.000000000 +0200
-@@ -39,17 +39,17 @@
- |*
- \************************************************************************/
-
--class XFillBmpTileOffsetXItem : public SfxUInt16Item
-+class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item
- {
+--- svx/inc/svx/xflbtoxy.hxx
++++ svx/inc/svx/xflbtoxy.hxx
+@@ -39,12 +39,12 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpTileOffsetXItem( USHORT nOffX = 0 );
+ XFillBmpTileOffsetXItem( USHORT nOffX = 0 );
- XFillBmpTileOffsetXItem( SvStream& rIn );
-+ XFillBmpTileOffsetXItem( USHORT nOffX = 0 );
+ SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -279,18 +214,11 @@ diff -u -r svx/inc/svx/xflbtoxy.hxx svx/inc/svx/xflbtoxy.hxx
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
-@@ -62,17 +62,17 @@
- |*
- \************************************************************************/
-
--class XFillBmpTileOffsetYItem : public SfxUInt16Item
-+class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
- {
+@@ -62,12 +62,12 @@
public:
TYPEINFO();
-- SVX_DLLPUBLIC XFillBmpTileOffsetYItem( USHORT nOffX = 0 );
+ XFillBmpTileOffsetYItem( USHORT nOffX = 0 );
- XFillBmpTileOffsetYItem( SvStream& rIn );
-+ XFillBmpTileOffsetYItem( USHORT nOffX = 0 );
+ SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
@@ -303,9 +231,8 @@ diff -u -r svx/inc/svx/xflbtoxy.hxx svx/inc/svx/xflbtoxy.hxx
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
-diff -u -r svx/inc/svx/xsflclit.hxx svx/inc/svx/xsflclit.hxx
---- svx/inc/svx/xsflclit.hxx 2009-05-18 07:01:34.000000000 +0200
-+++ svx/inc/svx/xsflclit.hxx 2009-05-18 07:47:38.000000000 +0200
+--- svx/inc/svx/xsflclit.hxx
++++ svx/inc/svx/xsflclit.hxx
@@ -36,24 +36,24 @@
//------------------------------
// class XSecondaryFillColorItem
@@ -316,12 +243,11 @@ diff -u -r svx/inc/svx/xsflclit.hxx svx/inc/svx/xsflclit.hxx
public:
TYPEINFO();
- XSecondaryFillColorItem() {}
-- XSecondaryFillColorItem(long nIndex, const Color& rTheColor);
-- SVX_DLLPUBLIC XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
-- XSecondaryFillColorItem(SvStream& rIn);
+- XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
+ SVX_DLLPRIVATE XSecondaryFillColorItem() {}
-+ SVX_DLLPRIVATE XSecondaryFillColorItem(long nIndex, const Color& rTheColor);
-+ XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
++ 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;
commit 0905ff40d6eaf1bf700a545139795f94207a9c0e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Mon Aug 17 15:17:32 2009 +0300
Bypass more patches
* patches/dev300/apply: Bypass more patches that don't apply.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8921379..5113437 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3040,15 +3040,23 @@ pptx-gfx-layout-fix.diff, thorsten
# Make the xlsx export and import work at the same time
# (converts the xlsx export to a UNO filter)
-xlsx-shared-import-and-export.diff
-xlsx-arabic-export-crash.diff, n#497419, janneke
+# FIXME: 2009-08-17: These don't apply either. Can't find file to patch etc. --tml
+# xlsx-shared-import-and-export.diff
+
+# xlsx-arabic-export-crash.diff, n#497419, janneke
+
xlsx-export-notes-avoid-dereferencing-0-svx.diff, n#497417, janneke
-xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
-xlsx-export-simple-autofilter.diff, n#497559, janneke
+
+# FIXME: 2009-08-17: These don't apply either. Can't find file to patch etc. --tml
+# xlsx-export-set-xml-2007-flavour.diff, n#502090, janneke
+# xlsx-export-simple-autofilter.diff, n#497559, janneke
+
# hack to ignore writerfilter when odf-converter is present
odf-converter-ignore-writerfilter.diff, n#348471, n#502173, jholesov
-xlsx-export-skip-auto-format.diff, n#497560, janneke
+
+# 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
More information about the ooo-build-commit
mailing list