rpms/openoffice.org/F-7 openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch, NONE, 1.1 openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch, NONE, 1.1 openoffice.org-2.3.0.ooo74751.bean.mawt.patch, NONE, 1.1 openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch, NONE, 1.1 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch, NONE, 1.1 openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz, NONE, 1.1 openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch, NONE, 1.1 openoffice.org-2.3.0.ooo80735.cppu.map.patch, NONE, 1.1 openoffice.org-2.3.0.ooo80967.ucb.neon27.patch, NONE, 1.1 openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch, NONE, 1.1 openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch, NONE, 1.1 openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch, NONE, 1.1 openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch, NONE, 1.1 openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch, NONE, 1.1 workspace.npower7.patch, NONE, 1.1 workspace.unifysound01.patch, NONE, 1.1 openoffice.org-1.9.114.rh161886.rpath.desktop.patch, 1.5, 1.6 openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.5, 1.6 openoffice.org-1.9.129.ooo54603.fontconfig.patch, 1.16, 1.17 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.19, 1.20 openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch, 1.1, 1.2 openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.14, 1.15 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.34, 1.35 openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch, 1.1, 1.2 openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch, 1.1, 1.2 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.2, 1.3 openoffice.org-2.2.0.rh232389.tango.patch, 1.4, 1.5 openoffice.org-simple-crash_report.sh, 1.4, 1.5 openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch, 1.12, 1.13 openoffice.org.spec, 1.1191, 1.1192 pseudoworkspace.valgrind1.patch, 1.18, 1.19 sources, 1.240, 1.241 workspace.configrefactor01.patch, 1.2, 1.3 workspace.fpicker6.patch, 1.3, 1.4 workspace.tl37.patch, 1.2, 1.3
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Oct 10 16:12:05 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25508
Modified Files:
openoffice.org-1.9.114.rh161886.rpath.desktop.patch
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
openoffice.org-1.9.129.ooo54603.fontconfig.patch
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org-2.2.0.rh232389.tango.patch
openoffice.org-simple-crash_report.sh
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
openoffice.org.spec pseudoworkspace.valgrind1.patch sources
workspace.configrefactor01.patch workspace.fpicker6.patch
workspace.tl37.patch
Added Files:
openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
openoffice.org-2.3.0.ooo74751.bean.mawt.patch
openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
openoffice.org-2.3.0.ooo80735.cppu.map.patch
openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch
workspace.npower7.patch workspace.unifysound01.patch
Log Message:
next version
openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch:
--- NEW FILE openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch ---
Index: bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.62.2.3
diff -u -r1.62.2.3 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm 24 Jan 2007 16:34:05 -0000 1.62.2.3
+++ openoffice.org/solenv/bin/modules/installer/globals.pm 27 Feb 2007 17:25:53 -0000
@@ -224,7 +224,7 @@
$nopatchfilecollector = "";
$unomaxservices = 25;
- $javamaxservices = 15;
+ $javamaxservices = 1;
$one_cab_file = 0;
$fix_number_of_cab_files = 1;
openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch:
--- NEW FILE openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch ---
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.229
diff -u -r1.229 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx 3 Jul 2007 14:05:45 -0000 1.229
+++ openoffice.org/vcl/source/gdi/outdev3.cxx 24 Jul 2007 12:18:54 -0000
@@ -7155,6 +7155,7 @@
aFontInfo.SetPitch( rData.mePitch );
aFontInfo.SetWeight( rData.meWeight );
aFontInfo.SetItalic( rData.meItalic );
+ aFontInfo.SetWidthType( rData.meWidthType );
if( rData.IsScalable() )
aFontInfo.mpImplMetric->mnMiscFlags |= ImplFontMetric::SCALABLE_FLAG;
if( rData.mbDevice )
openoffice.org-2.3.0.ooo74751.bean.mawt.patch:
--- NEW FILE openoffice.org-2.3.0.ooo74751.bean.mawt.patch ---
--- openoffice.org.orig/config_office/set_soenv.in 3 Aug 2007 13:09:48 -0000 1.156
+++ openoffice.org/config_office/set_soenv.in 29 Aug 2007 09:22:29 -0000
@@ -428,6 +428,7 @@
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
+ $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
}
elsif ($platform =~ m/^sparc/)
openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch:
--- NEW FILE openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch ---
Index: ./source/customshapes/EnhancedCustomShapeFunctionParser.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx,v
retrieving revision 1.10
diff -u -r1.10 EnhancedCustomShapeFunctionParser.cxx
--- openoffice.org.orig/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 24 Oct 2006 13:42:15 -0000 1.10
+++ openoffice.org/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx 6 Sep 2007 08:10:27 -0000
@@ -1201,7 +1201,7 @@
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
aEnd,
- aExpressionGrammer,
+ aExpressionGrammer >> ::boost::spirit::end_p,
::boost::spirit::space_p ) );
OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
Index: source/engine/smilfunctionparser.cxx
===================================================================
RCS file: /cvs/graphics/slideshow/source/engine/smilfunctionparser.cxx,v
retrieving revision 1.7
diff -u -r1.7 smilfunctionparser.cxx
--- openoffice.org.orig/slideshow/source/engine/smilfunctionparser.cxx 17 Jul 2007 14:41:21 -0000 1.7
+++ openoffice.org/slideshow/source/engine/smilfunctionparser.cxx 6 Sep 2007 10:48:58 -0000
@@ -579,7 +579,7 @@
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
aEnd,
- aExpressionGrammer,
+ aExpressionGrammer >> ::boost::spirit::end_p,
::boost::spirit::space_p ) );
OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
@@ -625,7 +625,7 @@
const ::boost::spirit::parse_info<StringIteratorT> aParseInfo(
::boost::spirit::parse( aStart,
aEnd,
- aExpressionGrammer,
+ aExpressionGrammer >> ::boost::spirit::end_p,
::boost::spirit::space_p ) );
OSL_DEBUG_ONLY(::std::cout.flush()); // needed to keep stdout and cout in sync
openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch:
--- NEW FILE openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch ---
diff -ruN sd.orig/inc/pres.hxx sd/inc/pres.hxx
--- openoffice.org.orig/sd/inc/pres.hxx 2006-12-12 17:23:42.000000000 +0100
+++ openoffice.org/sd/inc/pres.hxx 2007-07-24 14:27:46.000000000 +0200
@@ -82,6 +82,7 @@
AUTOLAYOUT_TEXTOVEROBJ,
AUTOLAYOUT_4OBJ,
AUTOLAYOUT_ONLY_TITLE,
+ AUTOLAYOUT_ONLY_TEXT,
AUTOLAYOUT_NONE,
AUTOLAYOUT_NOTES,
AUTOLAYOUT_HANDOUT1,
diff -ruN sd.orig/source/core/sdpage.cxx sd/source/core/sdpage.cxx
--- openoffice.org.orig/sd/source/core/sdpage.cxx 2006-12-12 17:33:13.000000000 +0100
+++ openoffice.org/sd/source/core/sdpage.cxx 2007-07-26 14:53:24.000000000 +0200
@@ -1244,6 +1244,7 @@
LayoutDescriptor( 6, PRESOBJ_TITLE, PRESOBJ_OBJECT, PRESOBJ_OBJECT, // AUTOLAYOUT_4OBJ
PRESOBJ_OBJECT, PRESOBJ_OBJECT ),
LayoutDescriptor( 0, PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TITLE
+ LayoutDescriptor( 10, PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TEXT
LayoutDescriptor( 0, PRESOBJ_NONE ), // AUTOLAYOUT_NONE
LayoutDescriptor( 0, PRESOBJ_PAGE, PRESOBJ_NOTES ), // AUTOLAYOUT_NOTES
LayoutDescriptor( 0 ), // AUTOLAYOUT_HANDOUT1
@@ -1436,6 +1437,13 @@
rRectangle[1].SetSize( aSize );
break;
}
+ case 10: // onlytext
+ {
+ Size aSize( rRectangle[0].GetSize().Width(), rRectangle[1].BottomLeft().Y() - rRectangle[0].TopLeft().Y() );
+ rRectangle[0].SetSize( aSize );
+ rRectangle[0].SetPos( aTitlePos);
+ break;
+ }
}
}
diff -ruN sd.orig/source/ui/app/res_bmp.src sd/source/ui/app/res_bmp.src
--- openoffice.org.orig/sd/source/ui/app/res_bmp.src 2005-09-23 14:28:54.000000000 +0200
+++ openoffice.org/sd/source/ui/app/res_bmp.src 2007-07-27 14:55:46.000000000 +0200
@@ -322,6 +322,14 @@
{
File = "foil24_h.bmp" ;
};
+Bitmap BMP_FOIL_25
+{
+ File = "foil25.bmp" ;
+};
+Bitmap BMP_FOIL_25_H
+{
+ File = "foil25_h.bmp" ;
+};
Bitmap BMP_FOILH_01
{
File = "foilh01.bmp" ;
diff -ruN sd.orig/source/ui/app/strings.src sd/source/ui/app/strings.src
--- openoffice.org.orig/sd/source/ui/app/strings.src 2006-10-06 12:37:22.000000000 +0200
+++ openoffice.org/sd/source/ui/app/strings.src 2007-07-27 15:12:40.000000000 +0200
@@ -544,6 +544,10 @@
Text [ de ] = "Nur Titel" ;
Text [ en-US ] = "Title Only" ;
};
+String STR_AUTOLAYOUT_ONLY_TEXT
+{
+ Text [ en-US ] = "Centered Text" ;
+};
String STR_AUTOLAYOUT_TITLE
{
Text [ de ] = "Titelfolie" ;
diff -ruN sd.orig/source/ui/inc/res_bmp.hrc sd/source/ui/inc/res_bmp.hrc
--- openoffice.org.orig/sd/source/ui/inc/res_bmp.hrc 2005-09-09 07:51:35.000000000 +0200
+++ openoffice.org/sd/source/ui/inc/res_bmp.hrc 2007-07-27 15:15:48.000000000 +0200
@@ -111,6 +111,7 @@
#define BMP_FOIL_18 RID_APP_START+28
#define BMP_FOIL_19 RID_APP_START+29
#define BMP_FOIL_20 RID_APP_START+30
+#define BMP_FOIL_25 RID_APP_START+41
#define BMP_FOILH_01 RID_APP_START+31
#define BMP_FOILH_02 RID_APP_START+32
#define BMP_FOILH_03 RID_APP_START+33
@@ -289,6 +290,7 @@
#define BMP_FOIL_22_H RID_SD_START+204
#define BMP_FOIL_23_H RID_SD_START+205
#define BMP_FOIL_24_H RID_SD_START+206
+#define BMP_FOIL_25_H RID_SD_START+333
#define BMP_FOILH_01_H RID_SD_START+207
#define BMP_FOILH_02_H RID_SD_START+208
#define BMP_FOILH_03_H RID_SD_START+209
diff -ruN sd.orig/source/ui/inc/strings.hrc sd/source/ui/inc/strings.hrc
--- openoffice.org.orig/sd/source/ui/inc/strings.hrc 2006-07-05 23:53:36.000000000 +0200
+++ openoffice.org/sd/source/ui/inc/strings.hrc 2007-07-27 15:13:52.000000000 +0200
@@ -295,6 +295,7 @@
#define STR_AUTOLAYOUT_HANDOUT4 (RID_APP_START+234)
#define STR_AUTOLAYOUT_HANDOUT6 (RID_APP_START+235)
#define STR_AUTOLAYOUT_NOTES (RID_APP_START+236)
+#define STR_AUTOLAYOUT_ONLY_TEXT (RID_APP_START+237)
#define STR_TRANSFORM (RID_APP_START+240)
diff -ruN sd.orig/source/ui/toolpanel/LayoutMenu.cxx sd/source/ui/toolpanel/LayoutMenu.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/LayoutMenu.cxx 2006-12-12 19:40:07.000000000 +0100
+++ openoffice.org/sd/source/ui/toolpanel/LayoutMenu.cxx 2007-07-27 15:13:02.000000000 +0200
@@ -185,6 +185,8 @@
AUTOLAYOUT_2TEXT},
{BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,
AUTOLAYOUT_ONLY_TITLE},
+ {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,
+ AUTOLAYOUT_ONLY_TEXT},
{BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,
AUTOLAYOUT_OBJ},
{BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,
--- NEW FILE openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz ---
‹
jþ/NA*â3¨SÌÿF&ˆüodÌÿæ¦æÆ£ùŸ €ùŸ—Atò¥¿Œ@¡…°üïÈuXA€õBÄžíUE»5:R.Oy´äýzŸ°Ê’·]ÞùHŽÊ.9£ðäg®¦ªÞÊf×*÷—kºª|½÷üøuå×]Z~Ÿ®Û”³Ûzq”𷯓¯ˆ"ƒ«S7Pß}ñJ¬¥Åßï÷v™þ½¢»¬›Óª|ïÖ©óÊ+W_¨ T¼?~Õ³îf¥"«ü·^’3W|:
‹“éGÁ(£`Œ‚Q0
FÁ(£`Œ‚Q0
FÁ(£`Œ‚Q0
FÁ(£`Œ‚Q0¬
openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch:
--- NEW FILE openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch ---
Index: ViewsWindow.cxx
===================================================================
RCS file: /cvs/dba/reportdesign/source/ui/report/ViewsWindow.cxx,v
retrieving revision 1.4
diff -u -r1.4 ViewsWindow.cxx
--- openoffice.org.orig/reportdesign/source/ui/report/ViewsWindow.cxx 3 Aug 2007 12:46:04 -0000 1.4
+++ openoffice.org/reportdesign/source/ui/report/ViewsWindow.cxx 15 Aug 2007 18:40:58 -0000
@@ -866,7 +866,7 @@
const SdrMark* pM = pView->GetSdrMarkByIndex(i);
SdrObject* pObj = pM->GetMarkedSdrObj();
Rectangle aObjRect(_bBoundRects ? pObj->GetCurrentBoundRect() : pObj->GetSnapRect());
- _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::data_type(pObj,pView)));
+ _rSortRectangles.insert(TRectangleMap::value_type(aObjRect,TRectangleMap::mapped_type(pObj,pView)));
}
}
}
openoffice.org-2.3.0.ooo80735.cppu.map.patch:
--- NEW FILE openoffice.org-2.3.0.ooo80735.cppu.map.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/udk/cppu/util/makefile.mk,v
retrieving revision 1.11
diff -u -r1.11 makefile.mk
--- openoffice.org.orig/cppu/util/makefile.mk 18 Jul 2007 12:34:25 -0000 1.11
+++ openoffice.org/cppu/util/makefile.mk 16 Aug 2007 13:57:48 -0000
@@ -82,11 +82,7 @@
.IF "$(GUI)$(COM)"=="WNTGCC"
SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map
.ELSE
-.IF "$(CPUNAME)" == "X86_64"
-SHL2VERSIONMAP:=$(SHL2TARGET).$(CPUNAME).map
-.ELSE
SHL2VERSIONMAP:=$(SHL2TARGET).map
-.ENDIF # "$(CPUNAME)" == "X86_64"
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
SHL2DEF := $(MISC)$/$(SHL2TARGET).def
SHL2IMPLIB := i$(SHL2TARGET)
Index: uno_purpenvhelpergcc3.map
===================================================================
RCS file: /cvs/udk/cppu/util/uno_purpenvhelpergcc3.map,v
retrieving revision 1.2
diff -u -r1.2 uno_purpenvhelpergcc3.map
--- openoffice.org.orig/cppu/util/uno_purpenvhelpergcc3.map 9 May 2007 13:51:39 -0000 1.2
+++ openoffice.org/cppu/util/uno_purpenvhelpergcc3.map 16 Aug 2007 13:57:48 -0000
@@ -1,6 +1,6 @@
UDK_3_0_0 {
global:
- _ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameterlPK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
+ _ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_;
_ZN4cppu6helper7purpenv29Environment_initWithEnterableEP16_uno_EnvironmentPNS_9EnterableE;
local:
openoffice.org-2.3.0.ooo80967.ucb.neon27.patch:
--- NEW FILE openoffice.org-2.3.0.ooo80967.ucb.neon27.patch ---
Index: source/ucp/webdav/NeonSession.cxx
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/NeonSession.cxx,v
retrieving revision 1.49
diff -u -r1.49 NeonSession.cxx
--- openoffice.org.orig/ucb/source/ucp/webdav/NeonSession.cxx 18 Jul 2007 07:55:41 -0000 1.49
+++ openoffice.org/ucb/source/ucp/webdav/NeonSession.cxx 23 Aug 2007 09:48:56 -0000
@@ -364,32 +364,6 @@
}
// -------------------------------------------------------------------
-extern "C" void NeonSession_ProgressNotify( void *,
- off_t,
- off_t )
-{
- // progress: bytes read so far
- // total: total bytes to read, -1 -> total count not known
-}
-
-// -------------------------------------------------------------------
-extern "C" void NeonSession_StatusNotify( void *,
- ne_conn_status,
- const char * )
-{
-#if 0
- typedef enum {
- ne_conn_namelookup, /* lookup up hostname (info = hostname) */
- ne_conn_connecting, /* connecting to host (info = hostname) */
- ne_conn_connected, /* connected to host (info = hostname) */
- ne_conn_secure /* connection now secure (info = crypto level) */
- } ne_conn_status;
-#endif
-
- // info: hostname
-}
-
-// -------------------------------------------------------------------
extern "C" void NeonSession_PreSendRequest( ne_request * req,
void * userdata,
ne_buffer * headers )
@@ -578,13 +552,6 @@
NeonUri::makeConnectionEndPointString(
m_aHostName, m_nPort ) );
- // Set a progress callback for the session.
- ne_set_progress( m_pHttpSession, NeonSession_ProgressNotify, this );
-
- // Set a status notification callback for the session, to report
- // connection status.
- ne_set_status( m_pHttpSession, NeonSession_StatusNotify, this );
-
// Add hooks (i.e. for adding additional headers to the request)
#if 0
diff -ru config_office/configure.in config_office/configure.in
--- openoffice.org.orig/config_office/configure.in 2007-08-23 11:49:35.000000000 +0100
+++ openoffice.org/config_office/configure.in 2007-08-23 11:50:28.000000000 +0100
@@ -4019,8 +4019,7 @@
if test -n "$with_system_neon" -o -n "$with_system_libs" && \
test "$with_system_neon" != "no"; then
AC_MSG_RESULT([external])
- PKG_CHECK_MODULES(NEON, neon >= 0.26.0)
- PKG_CHECK_MODULES(NEON, neon < 0.27.0, , AC_MSG_ERROR([you need neon 0.26.x for system-neon]))
+ PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for system-neon]))
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1"
SYSTEM_NEON=YES
openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch:
--- NEW FILE openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch ---
Index: util/makefile.mk
===================================================================
RCS file: /cvs/dba/reportdesign/util/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/reportdesign/util/makefile.mk 2 Aug 2007 14:42:41 -0000 1.3
+++ openoffice.org/reportdesign/util/makefile.mk 29 Aug 2007 11:09:22 -0000
@@ -192,7 +192,7 @@
.ENDIF
-SHL3DEPN=
+SHL3DEPN=$(SHL1TARGETN)
SHL3LIBS=$(LIB3TARGET)
SHL3IMPLIB= i$(SHL3TARGET)
SHL3VERSIONMAP=rptui.map
openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch:
--- NEW FILE openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch ---
Index: inc/com/sun/star/uno/Any.h
===================================================================
RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Any.h,v
retrieving revision 1.12
diff -u -r1.12 Any.h
--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Any.h 10 Jan 2006 15:52:55 -0000 1.12
+++ openoffice.org/cppu/inc/com/sun/star/uno/Any.h 6 Sep 2007 11:00:18 -0000
@@ -70,7 +70,7 @@
return true if the any contains an assignable value (no data loss), e.g. the any contains a
short and you >>= it into a long variable.
*/
-class Any : public uno_Any
+class CPPU_GCC_DLLPUBLIC_EXPORT Any : public uno_Any
{
public:
// these are here to force memory de/allocation to sal lib.
Index: inc/com/sun/star/uno/Type.h
===================================================================
RCS file: /cvs/udk/cppu/inc/com/sun/star/uno/Type.h,v
retrieving revision 1.15
diff -u -r1.15 Type.h
--- openoffice.org.orig/cppu/inc/com/sun/star/uno/Type.h 9 Mar 2006 10:44:42 -0000 1.15
+++ openoffice.org/cppu/inc/com/sun/star/uno/Type.h 6 Sep 2007 11:00:18 -0000
@@ -79,7 +78,7 @@
@see typelib_TypeDescriptionReference
*/
-class Type
+class CPPU_GCC_DLLPUBLIC_EXPORT Type
{
/** the C typelib reference pointer
@internal
Index: source/parser/cpp/cx_c_std.cxx
===================================================================
RCS file: /cvs/tools/autodoc/source/parser/cpp/cx_c_std.cxx,v
retrieving revision 1.6
diff -u -r1.6 cx_c_std.cxx
--- openoffice.org.orig/autodoc/source/parser/cpp/cx_c_std.cxx 16 Sep 2006 16:59:23 -0000 1.6
+++ openoffice.org/autodoc/source/parser/cpp/cx_c_std.cxx 3 Oct 2007 07:33:16 -0000
@@ -511,6 +511,7 @@
aStateMachine.AddToken("__cdecl", 0, A_nBezDefStatus, finIgnore);
aStateMachine.AddToken("__stdcall", 0, A_nBezDefStatus, finIgnore);
aStateMachine.AddToken("__fastcall",0, A_nBezDefStatus, finIgnore);
+ aStateMachine.AddToken("CPPU_GCC_DLLPUBLIC_EXPORT",0, A_nBezDefStatus, finIgnore);
aStateMachine.AddToken("/**/", 0, A_nOperatorDefStatus,finIgnore);
// Context changers
openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch:
--- NEW FILE openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch ---
Index: source/uno/treecontrolpeer.cxx
===================================================================
RCS file: /cvs/util/svtools/source/uno/treecontrolpeer.cxx,v
retrieving revision 1.4
diff -u -r1.4 treecontrolpeer.cxx
--- openoffice.org.orig/svtools/source/uno/treecontrolpeer.cxx 2 Jul 2007 09:29:44 -0000 1.4
+++ openoffice.org/svtools/source/uno/treecontrolpeer.cxx 6 Sep 2007 11:22:59 -0000
@@ -284,7 +284,7 @@
// --------------------------------------------------------------------
-UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uInt32 nPos /* = LIST_APPEND */ )
+UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, ULONG nPos /* = LIST_APPEND */ )
{
UnoTreeListEntry* pEntry = 0;
if( mpTreeImpl )
Index: source/uno/treecontrolpeer.hxx
===================================================================
RCS file: /cvs/util/svtools/source/uno/treecontrolpeer.hxx,v
retrieving revision 1.2
diff -u -r1.2 treecontrolpeer.hxx
--- openoffice.org.orig/svtools/source/uno/treecontrolpeer.hxx 27 Jun 2007 12:18:50 -0000 1.2
+++ openoffice.org/svtools/source/uno/treecontrolpeer.hxx 6 Sep 2007 11:22:59 -0000
@@ -138,7 +138,7 @@
void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel );
void addNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry );
- UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uInt32 nPos = LIST_APPEND );
+ UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, ULONG nPos = LIST_APPEND );
bool updateEntry( UnoTreeListEntry* pEntry );
void updateTree( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive );
openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch:
--- NEW FILE openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch ---
Index: sc/source/filter/xml/xmlexprt.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/xml/xmlexprt.cxx,v
retrieving revision 1.207
diff -u -p -r1.207 xmlexprt.cxx
--- openoffice.org/sc/source/filter/xml/xmlexprt.cxx 6 Jul 2007 12:40:24 -0000 1.207
+++ openoffice.org.orig/sc/source/filter/xml/xmlexprt.cxx 23 Sep 2007 09:09:02 -0000
@@ -3545,13 +3572,13 @@ void ScXMLExport::GetViewSettings(uno::S
Rectangle aRect(pEmbeddedObj->GetVisArea());
sal_uInt16 i(0);
pProps[i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaTop"));
- pProps[i].Value <<= aRect.getY();
+ pProps[i].Value <<= static_cast<sal_Int32>(aRect.getY());
pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaLeft"));
- pProps[i].Value <<= aRect.getX();
+ pProps[i].Value <<= static_cast<sal_Int32>(aRect.getX());
pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaWidth"));
- pProps[i].Value <<= aRect.getWidth();
+ pProps[i].Value <<= static_cast<sal_Int32>(aRect.getWidth());
pProps[++i].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VisibleAreaHeight"));
- pProps[i].Value <<= aRect.getHeight();
+ pProps[i].Value <<= static_cast<sal_Int32>(aRect.getHeight());
}
}
}
Index: sc/source/ui/view/viewdata.cxx
===================================================================
RCS file: /cvs/sc/sc/source/ui/view/viewdata.cxx,v
retrieving revision 1.59
diff -u -p -r1.59 viewdata.cxx
--- openoffice.org.orig/sc/source/ui/view/viewdata.cxx 10 May 2007 17:03:57 -0000 1.59
+++ openoffice.org/sc/source/ui/view/viewdata.cxx 23 Sep 2007 09:10:00 -0000
@@ -185,12 +150,12 @@ void ScViewDataTable::WriteUserDataSeque
if (eHSplitMode == SC_SPLIT_FIX)
pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosX);
else
- pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= nHSplitPos;
+ pSettings[SC_HORIZONTAL_SPLIT_POSITION].Value <<= sal_Int32(nHSplitPos);
pSettings[SC_VERTICAL_SPLIT_POSITION].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_VERTICALSPLITPOSITION));
if (eVSplitMode == SC_SPLIT_FIX)
pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nFixPosY);
else
- pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= nVSplitPos;
+ pSettings[SC_VERTICAL_SPLIT_POSITION].Value <<= sal_Int32(nVSplitPos);
pSettings[SC_ACTIVE_SPLIT_RANGE].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ACTIVESPLITRANGE));
pSettings[SC_ACTIVE_SPLIT_RANGE].Value <<= sal_Int16(eWhichActive);
pSettings[SC_POSITION_LEFT].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_POSITIONLEFT));
openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch:
--- NEW FILE openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch ---
Index: makefile.mk
===================================================================
RCS file: /cvs/external/libtextcat/makefile.mk,v
retrieving revision 1.2
diff -u -r1.2 makefile.mk
--- openoffice.org.orig/libtextcat/makefile.mk 21 Jun 2007 16:09:52 -0000 1.2
+++ openoffice.org/libtextcat/makefile.mk 10 Oct 2007 08:34:24 -0000
@@ -58,6 +58,17 @@
src$/libtextcat.map
.IF "$(GUI)"=="UNX"
+
+.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
+libtextcat_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+libtextcat_LDFLAGS+=-Wl,-R'$$$$ORIGIN'
+.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+
+LDFLAGS:=$(libtextcat_LDFLAGS)
+.EXPORT: LDFLAGS
+
#CONFIGURE_DIR=$(BUILD_DIR)
#relative to CONFIGURE_DIR
workspace.npower7.patch:
--- NEW FILE workspace.npower7.patch ---
Index: sc/sc/source/ui/vba/vbahelper.hxx
diff -u sc/sc/source/ui/vba/vbahelper.hxx:1.2 sc/sc/source/ui/vba/vbahelper.hxx:1.2.2.1
--- sc/sc/source/ui/vba/vbahelper.hxx:1.2 Wed Apr 25 09:07:33 2007
+++ sc/sc/source/ui/vba/vbahelper.hxx Thu May 3 04:16:34 2007
@@ -38,8 +38,8 @@
#include <com/sun/star/frame/XModel.hpp>
#include <docsh.hxx>
-#define css com::sun::star
-#define oo org::openoffice
+namespace css = ::com::sun::star;
+
namespace org
{
namespace openoffice
@@ -69,6 +69,8 @@
}
}
+namespace oo = org::openoffice;
+
#ifdef DEBUG
# define SC_VBA_FIXME(a) OSL_TRACE( a )
# define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
Index: util/makefile.mk
===================================================================
RCS file: /cvs/sc/sc/util/makefile.mk,v
retrieving revision 1.41
diff -u -r1.41 makefile.mk
--- openoffice.org.orig/sc/util/makefile.mk 22 May 2007 20:15:40 -0000 1.41
+++ openoffice.org/sc/util/makefile.mk 15 Aug 2007 15:10:15 -0000
@@ -277,6 +277,7 @@
$(SVTOOLLIB) \
$(SVLLIB) \
$(ISCLIB) \
+ $(VCLLIB)
SHL9DEPN=$(SHL1TARGETN) $(SHL8TARGETN)
workspace.unifysound01.patch:
--- NEW FILE workspace.unifysound01.patch ---
Index: source/framework/makefile.mk
===================================================================
RCS file: /cvs/graphics/avmedia/source/framework/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/avmedia/source/framework/makefile.mk 6 Feb 2007 13:32:06 -0000 1.3
+++ openoffice.org/avmedia/source/framework/makefile.mk 8 Aug 2007 09:13:09 -0000
@@ -54,7 +54,11 @@
$(SLO)$/mediamisc.obj \
$(SLO)$/mediacontrol.obj \
$(SLO)$/mediatoolbox.obj \
- $(SLO)$/mediaplayer.obj
+ $(SLO)$/mediaplayer.obj \
+ $(SLO)$/soundhandler.obj
+
+EXCEPTIONSFILES = \
+ $(SLO)$/soundhandler.obj
# --- Targets ----------------------------------
--- /dev/null 2007-08-08 09:28:55.295802468 +0100
+++ openoffice.org/avmedia/source/framework/soundhandler.xml 2007-08-07 10:58:46.000000000 +0100
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+
+ <module-name> avmedia </module-name>
+
+ <component-description>
+ <author> Andreas Schluens </author>
+ <name> com.sun.star.comp.framework.SoundHandler </name>
+ <description>
+ Implements a handler service to detect and/or play audio files.
+ supported formats: wav/au
+ </description>
+ <loader-name> com.sun.star.loader.SharedLibrary </loader-name>
+ <language> c++ </language>
+ <status value="final"/>
+ <supported-service> com.sun.star.frame.ContentHandler </supported-service>
+ </component-description>
+
+ <project-build-dependency> cppu </project-build-dependency>
+ <project-build-dependency> cppuhelper </project-build-dependency>
+ <project-build-dependency> vos </project-build-dependency>
+ <project-build-dependency> sal </project-build-dependency>
+ <project-build-dependency> tools </project-build-dependency>
+ <project-build-dependency> svtools </project-build-dependency>
+ <project-build-dependency> toolkit </project-build-dependency>
+ <project-build-dependency> sv </project-build-dependency>
+ <project-build-dependency> comphelper </project-build-dependency>
+ <project-build-dependency> unotools </project-build-dependency>
+ <project-build-dependency> ucbhelper </project-build-dependency>
+ <project-build-dependency> svl </project-build-dependency>
+ <project-build-dependency> sot </project-build-dependency>
+
+ <runtime-module-dependency> cppu2 </runtime-module-dependency>
+ <runtime-module-dependency> cppuhelper </runtime-module-dependency>
+ <runtime-module-dependency> vos2$(COM) </runtime-module-dependency>
+ <runtime-module-dependency> sal2 </runtime-module-dependency>
+ <runtime-module-dependency> tl </runtime-module-dependency>
+ <runtime-module-dependency> svt </runtime-module-dependency>
+ <runtime-module-dependency> svl </runtime-module-dependency>
+ <runtime-module-dependency> tk </runtime-module-dependency>
+ <runtime-module-dependency> sv </runtime-module-dependency>
+ <runtime-module-dependency> comphelp2 </runtime-module-dependency>
+ <runtime-module-dependency> utl </runtime-module-dependency>
+ <runtime-module-dependency> ucb </runtime-module-dependency>
+ <runtime-module-dependency> sot </runtime-module-dependency>
+
+</module-description>
--- /dev/null 2007-08-08 09:28:55.295802468 +0100
+++ openoffice.org/avmedia/source/framework/soundhandler.hxx 2007-08-07 16:48:43.000000000 +0100
@@ -0,0 +1,215 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile$
+ *
+ * $Revision$
+ *
+ * last change: $Author$ $Date$
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ * GNU Lesser General Public License Version 2.1
+ * =============================================
+ * Copyright 2005 by Sun Microsystems, Inc.
+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ ************************************************************************/
+
+#ifndef __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+#define __FRAMEWORK_HANDLER_SOUNDHANDLER_HXX_
+
+#include <vcl/timer.hxx>
+#include <tools/link.hxx>
+
+//_________________________________________________________________________________________________________________
+// interface includes
+//_________________________________________________________________________________________________________________
+
+#ifndef _COM_SUN_STAR_LANG_XTYPEPROVIDER_HPP_
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_FRAME_XNOTIFYINGDISPATCH_HPP_
+#include <com/sun/star/frame/XNotifyingDispatch.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_
+#include <com/sun/star/frame/XStatusListener.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
+#include <com/sun/star/frame/XFrame.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_DOCUMENT_XEXTENDEDFILTERDETECTION_HPP_
+#include <com/sun/star/document/XExtendedFilterDetection.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HPP_
+#include <com/sun/star/media/XPlayer.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
+#include <com/sun/star/beans/PropertyValue.hpp>
+#endif
+
+#ifndef _COM_SUN_STAR_UTIL_URL_HPP_
+#include <com/sun/star/util/URL.hpp>
+#endif
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
+
+//_________________________________________________________________________________________________________________
+// other includes
+//_________________________________________________________________________________________________________________
+
+#ifndef _CPPUHELPER_WEAK_HXX_
+#include <cppuhelper/weak.hxx>
+#endif
+
+namespace css = ::com::sun::star;
+
+//_________________________________________________________________________________________________________________
+// namespace
+//_________________________________________________________________________________________________________________
+
+namespace avmedia{
+
+//_________________________________________________________________________________________________________________
+// exported const
+//_________________________________________________________________________________________________________________
+
+//_________________________________________________________________________________________________________________
+// exported definitions
+//_________________________________________________________________________________________________________________
+
+struct MyThreadHelpBase
+{
+ public:
+ mutable ::osl::Mutex m_aLock;
+};
+
+
+/*-************************************************************************************************************//**
+ @short handler to detect and play sounds ("wav" and "au" only!)
+ @descr Register this implementation as a content handler to detect and/or play wav- and au-sounds.
+ It doesn't depend from the target platform. But one instance of this class
+ can play one sound at the same time only. Means every new dispatch request will stop the
+ might still running one. So we support one operation/one URL/one listener at the same time
+ only.
+
+ @devstatus ready
[...2405 lines suppressed...]
-
// release (possibly open) OpenGL context
X11SalOpenGL::Release();
@@ -323,9 +317,3 @@
{
return new X11SalOpenGL( pGraphics );
}
-
-SalSound* X11SalInstance::CreateSalSound()
-{
- return new X11SalSound();
-}
-
Index: inc/galctrl.hxx
===================================================================
RCS file: /cvs/graphics/svx/inc/galctrl.hxx,v
retrieving revision 1.6
diff -u -r1.6 galctrl.hxx
--- openoffice.org.orig/svx/inc/galctrl.hxx 12 Oct 2006 11:43:24 -0000 1.6
+++ openoffice.org/svx/inc/galctrl.hxx 9 Aug 2007 07:09:57 -0000
@@ -74,7 +74,6 @@
GraphicObject aGraphicObj;
Rectangle aPreviewRect;
- Sound aSound;
GalleryTheme* mpTheme;
SVX_DLLPRIVATE BOOL ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
@@ -96,7 +95,6 @@
SVX_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
DECL_LINK( MenuSelectHdl, Menu* );
- DECL_LINK( SoundEndHdl, Sound* );
public:
Index: source/gallery2/galctrl.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/gallery2/galctrl.cxx,v
retrieving revision 1.25
diff -u -r1.25 galctrl.cxx
--- openoffice.org.orig/svx/source/gallery2/galctrl.cxx 27 Jun 2007 18:19:59 -0000 1.25
+++ openoffice.org/svx/source/gallery2/galctrl.cxx 9 Aug 2007 07:27:34 -0000
@@ -67,7 +67,6 @@
{
SetHelpId( HID_GALLERY_WINDOW );
InitSettings();
- aSound.SetNotifyHdl( LINK( this, GalleryPreview, SoundEndHdl ) );
}
// ------------------------------------------------------------------------
@@ -80,7 +79,6 @@
{
SetHelpId( HID_GALLERY_PREVIEW );
InitSettings();
- aSound.SetNotifyHdl( LINK( this, GalleryPreview, SoundEndHdl ) );
}
// ------------------------------------------------------------------------
@@ -281,12 +279,6 @@
// ------------------------------------------------------------------------
-IMPL_LINK( GalleryPreview, SoundEndHdl, Sound*, EMPTYARG )
-{
- aSound.SetSoundName( String() );
- return 0L;
-}
-
// -------------------
// - GalleryIconView -
// -------------------
diff -ru scp2.orig/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
--- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp 2007-08-10 11:39:33.000000000 +0100
+++ openoffice.org/scp2/source/ooo/file_library_ooo.scp 2007-08-10 11:40:08.000000000 +0100
@@ -2113,7 +2113,7 @@
#endif
// AVMedia
-STD_LIB_FILE_PATCH( gid_File_Lib_AVMedia, avmedia )
+STD_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMedia, avmedia )
#ifdef GSTREAMER
SPECIAL_UNO_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
diff -ru vcl.orig/unx/headless/svpdummies.cxx vcl/unx/headless/svpdummies.cxx
--- openoffice.org.orig/vcl/unx/headless/svpdummies.cxx 2007-08-15 11:15:22.000000000 +0100
+++ openoffice.org/vcl/unx/headless/svpdummies.cxx 2007-08-15 11:16:02.000000000 +0100
@@ -46,44 +46,6 @@
void SvpSalOpenGL::StartScene( SalGraphics* ) {}
void SvpSalOpenGL::StopScene() {}
-// SalSound
-SvpSalSound::~SvpSalSound() {}
-bool SvpSalSound::IsValid() { return true; }
-bool SvpSalSound::Init( const String&, ULONG& rSoundLen )
-{
- rSoundLen = 0;
- return true;
-}
-void SvpSalSound::Play( ULONG, ULONG, bool bLoop )
-{
- m_bPlaying = true;
- m_bLooping = bLoop;
-}
-void SvpSalSound::Stop()
-{
- m_bPlaying = m_bLooping = false;
-}
-void SvpSalSound::Pause()
-{
- m_bPaused = true;
-}
-void SvpSalSound::Continue()
-{
- m_bPaused = false;
-}
-bool SvpSalSound::IsLoopMode() const
-{
- return m_bLooping;
-}
-bool SvpSalSound::IsPlaying() const
-{
- return m_bPlaying;
-}
-bool SvpSalSound::IsPaused() const
-{
- return m_bPaused;
-}
-
// SalObject
SvpSalObject::SvpSalObject()
{
diff -ru vcl.orig/unx/headless/svpdummies.hxx vcl/unx/headless/svpdummies.hxx
--- openoffice.org.orig/vcl/unx/headless/svpdummies.hxx 2007-08-15 11:15:22.000000000 +0100
+++ openoffice.org/vcl/unx/headless/svpdummies.hxx 2007-08-15 11:16:26.000000000 +0100
@@ -36,7 +36,6 @@
#ifndef _SVP_SVPDUMMIES_HXX
#include <vcl/salogl.hxx>
-#include <vcl/salsound.hxx>
#include <vcl/salobj.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/salimestatus.hxx>
@@ -59,28 +58,6 @@
virtual void StopScene();
};
-class SvpSalSound : public SalSound
-{
- bool m_bPlaying;
- bool m_bLooping;
- bool m_bPaused;
-public:
- SvpSalSound() : m_bPlaying( false ), m_bLooping( false ), m_bPaused( false ) {}
- virtual ~SvpSalSound();
-
- // overload all pure virtual methods
- virtual bool IsValid();
- virtual bool Init( const String& rSoundName,
- ULONG& rSoundLen );
- virtual void Play( ULONG nStartTime, ULONG nPlayTime, bool bLoop );
- virtual void Stop();
- virtual void Pause();
- virtual void Continue();
- virtual bool IsLoopMode() const;
- virtual bool IsPlaying() const;
- virtual bool IsPaused() const;
-};
-
class SvpSalObject : public SalObject
{
public:
diff -ru vcl.orig/unx/headless/svpinst.cxx vcl/unx/headless/svpinst.cxx
--- openoffice.org.orig/vcl/unx/headless/svpinst.cxx 2007-08-15 11:15:22.000000000 +0100
+++ openoffice.org/vcl/unx/headless/svpinst.cxx 2007-08-15 11:16:11.000000000 +0100
@@ -269,11 +269,6 @@
delete pDevice;
}
-SalSound* SvpSalInstance::CreateSalSound()
-{
- return new SvpSalSound();
-}
-
SalTimer* SvpSalInstance::CreateSalTimer()
{
return new SvpSalTimer( this );
diff -ru vcl.orig/unx/headless/svpinst.hxx vcl/unx/headless/svpinst.hxx
--- openoffice.org.orig/vcl/unx/headless/svpinst.hxx 2007-08-15 11:15:22.000000000 +0100
+++ openoffice.org/vcl/unx/headless/svpinst.hxx 2007-08-15 11:16:38.000000000 +0100
@@ -166,8 +166,6 @@
virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
virtual String GetDefaultPrinter();
- // SalSound
- virtual SalSound* CreateSalSound();
// SalTimer
virtual SalTimer* CreateSalTimer();
// SalOpenGL
openoffice.org-1.9.114.rh161886.rpath.desktop.patch:
Index: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-1.9.114.rh161886.rpath.desktop.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.114.rh161886.rpath.desktop.patch 29 Jan 2007 13:41:40 -0000 1.5
+++ openoffice.org-1.9.114.rh161886.rpath.desktop.patch 10 Oct 2007 16:11:56 -0000 1.6
@@ -5,7 +5,7 @@
diff -u -p -r1.17 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh 15 Jun 2005 08:16:47 -0000 1.17
+++ openoffice.org/desktop/scripts/soffice.sh 5 Jul 2005 07:49:51 -0000
-@@ -77,28 +79,16 @@
+@@ -77,96 +79,6 @@
# change back directory
cd "$sd_cwd"
@@ -17,70 +17,117 @@
- fi
-fi
-
- # set search path for shared libraries
+-# set search path for shared libraries
-add_moz_lib=
--for moz_lib_path in $MOZILLA_LIBRARY_PATH /usr/lib /usr/lib/mozilla /usr/lib/mozilla-firefox /usr/lib/mozilla-thunderbird /opt/mozilla/lib /opt/MozillaFirefox/lib /opt/MozillaThunderbird/lib; do
-- test -f $moz_lib_path/libnss3.so && add_moz_lib=":$moz_lib_path" && break;
+-for moz_lib_path in \
+- $MOZILLA_LIBRARY_PATH \
+- /usr/lib \
+- /usr/lib/mozilla \
+- /usr/lib/mozilla-firefox \
+- /usr/lib/mozilla-thunderbird \
+- /opt/mozilla/lib \
+- /opt/MozillaFirefox/lib \
+- /opt/MozillaThunderbird/lib; \
+-do
+- if [ -f $moz_lib_path/libnss3.so ]; then
+- case "$moz_lib_path" in
+- /usr/lib|/usr/lib64) : ;;
+- *) add_moz_lib=":$moz_lib_path"
+- esac
+- break
+- fi
-done
- case $sd_platform in
- AIX)
- # this is a temporary hack until we can live with the default search paths
- if [ $LIBPATH ]; then
- SYSTEM_LIBPATH=$LIBPATH
- export SYSTEM_LIBPATH
+-case $sd_platform in
+- AIX)
+- # this is a temporary hack until we can live with the default search paths
+- if [ $LIBPATH ]; then
+- SYSTEM_LIBPATH=$LIBPATH
+- export SYSTEM_LIBPATH
- LIBPATH="$sd_prog$add_moz_lib":$LIBPATH
-+ LIBPATH="$sd_prog":$LIBPATH
- else
+- else
- LIBPATH="$sd_prog$add_moz_lib"
-+ LIBPATH="$sd_prog"
- fi
- export LIBPATH
- ;;
-@@ -108,9 +98,9 @@
- if [ $DYLD_LIBRARY_PATH ]; then
- SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
- export SYSTEM_DYLD_LIBRARY_PATH
+- fi
+- export LIBPATH
+- ;;
+-
+- Darwin)
+- # this is a temporary hack until we can live with the default search paths
+- if [ "$DYLD_LIBRARY_PATH" ]; then
+- SYSTEM_DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH
+- export SYSTEM_DYLD_LIBRARY_PATH
- DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib":$DYLD_LIBRARY_PATH
-+ DYLD_LIBRARY_PATH="$sd_prog":$DYLD_LIBRARY_PATH
- else
+- else
- DYLD_LIBRARY_PATH="$sd_prog$add_moz_lib"
-+ DYLD_LIBRARY_PATH="$sd_prog"
- fi
- export DYLD_LIBRARY_PATH
- ;;
-@@ -120,9 +110,9 @@
- if [ $SHLIB_PATH ]; then
- SYSTEM_SHLIB_PATH=$SHLIB_PATH
- export SYSTEM_SHLIB_PATH
+- fi
+- export DYLD_LIBRARY_PATH
+- ;;
+-
+- HP-UX)
+- # this is a temporary hack until we can live with the default search paths
+- if [ $SHLIB_PATH ]; then
+- SYSTEM_SHLIB_PATH=$SHLIB_PATH
+- export SYSTEM_SHLIB_PATH
- SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib:$SHLIB_PATH
-+ SHLIB_PATH="$sd_prog":/usr/openwin/lib:$SHLIB_PATH
- else
+- else
- SHLIB_PATH="$sd_prog$add_moz_lib":/usr/openwin/lib
-+ SHLIB_PATH="$sd_prog":/usr/openwin/lib
- fi
- export SHLIB_PATH
- ;;
-@@ -132,9 +122,9 @@
- if [ $LD_LIBRARYN32_PATH ]; then
- SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
- export SYSTEM_LD_LIBRARYN32_PATH
+- fi
+- export SHLIB_PATH
+- ;;
+-
+- IRIX*)
+- # this is a temporary hack until we can live with the default search paths
+- if [ $LD_LIBRARYN32_PATH ]; then
+- SYSTEM_LD_LIBRARYN32_PATH=$LD_LIBRARYN32_PATH
+- export SYSTEM_LD_LIBRARYN32_PATH
- LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib":$LD_LIBRARYN32_PATH
-+ LD_LIBRARYN32_PATH=:"$sd_prog":$LD_LIBRARYN32_PATH
- else
+- else
- LD_LIBRARYN32_PATH=:"$sd_prog$add_moz_lib"
-+ LD_LIBRARYN32_PATH=:"$sd_prog"
- fi
- export LD_LIBRARYN32_PATH
- ;;
-@@ -144,9 +134,9 @@
- if [ $LD_LIBRARY_PATH ]; then
- SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
- export SYSTEM_LD_LIBRARY_PATH
+- fi
+- export LD_LIBRARYN32_PATH
+- ;;
+-
+- *)
+- # this is a temporary hack until we can live with the default search paths
+- if [ $LD_LIBRARY_PATH ]; then
+- SYSTEM_LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+- export SYSTEM_LD_LIBRARY_PATH
- LD_LIBRARY_PATH="$sd_prog$add_moz_lib":$LD_LIBRARY_PATH
-+ LD_LIBRARY_PATH="$sd_prog":$LD_LIBRARY_PATH
- else
+- else
- LD_LIBRARY_PATH="$sd_prog$add_moz_lib"
-+ LD_LIBRARY_PATH="$sd_prog"
+- fi
+- export LD_LIBRARY_PATH
+- ;;
+-esac
+-
+ #collect all bootstrap variables specified on the command line
+ #so that they can be passed as arguments to javaldx later on
+ for arg in $@
+@@ -180,23 +92,11 @@
+ if [ -x "$sd_prog/javaldx" ] ; then
+ java_ld_library_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS`
+ if [ "$java_ld_library_path" != "" ] ; then
+- case $sd_platform in
+- AIX)
+- LIBPATH=${java_ld_library_path}:${LIBPATH}
+- ;;
+- Darwin)
+- DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+- ;;
+- HP-UX)
+- SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
+- ;;
+- IRIX*)
+- LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
+- ;;
+- *)
+- LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
+- ;;
+- esac
++ if [ $LD_LIBRARY_PATH ]; then
++ LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
++ else
++ LD_LIBRARY_PATH=${java_ld_library_path}
++ fi
fi
- export LD_LIBRARY_PATH
- ;;
+ fi
+
openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:
Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 2 Dec 2006 11:40:26 -0000 1.5
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 10 Oct 2007 16:11:56 -0000 1.6
@@ -9,22 +9,22 @@
case ${sd_arg} in
-calc)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
-+ sd_binary="scalc.bin"
++ sd_binary="soffice.bin"
break;
;;
-draw)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
-+ sd_binary="sdraw.bin"
++ sd_binary="soffice.bin"
break;
;;
-impress)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
-+ sd_binary="simpress.bin"
++ sd_binary="soffice.bin"
break;
;;
-writer)
- sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
-+ sd_binary="swriter.bin"
++ sd_binary="soffice.bin"
break;
;;
*)
openoffice.org-1.9.129.ooo54603.fontconfig.patch:
Index: openoffice.org-1.9.129.ooo54603.fontconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-1.9.129.ooo54603.fontconfig.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openoffice.org-1.9.129.ooo54603.fontconfig.patch 4 Apr 2007 12:40:42 -0000 1.16
+++ openoffice.org-1.9.129.ooo54603.fontconfig.patch 10 Oct 2007 16:11:56 -0000 1.17
@@ -1,6 +1,6 @@
diff -ru OOE680_m6.fontconfig/vcl/inc/outdev.h OOE680_m6/vcl/inc/outdev.h
---- OOE680_m6.fontconfig/vcl/inc/outdev.h 2006-12-18 13:00:23.000000000 -0500
-+++ OOE680_m6/vcl/inc/outdev.h 2006-12-19 04:28:08.000000000 -0500
+--- OOE680_m6.fontconfig/vcl/inc/vcl/outdev.h 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/vcl/outdev.h 2006-12-19 04:28:08.000000000 -0500
@@ -213,7 +213,7 @@
const Font& rFont, const Size& rSize, ImplFontSubstEntry* pDevSpecific );
ImplFontEntry* GetFallback( ImplDevFontList* pFontList,
@@ -11,8 +11,8 @@
void Invalidate();
};
diff -ru OOE680_m6.fontconfig/vcl/inc/outfont.hxx OOE680_m6/vcl/inc/outfont.hxx
---- OOE680_m6.fontconfig/vcl/inc/outfont.hxx 2006-12-18 13:00:23.000000000 -0500
-+++ OOE680_m6/vcl/inc/outfont.hxx 2006-12-19 04:27:48.000000000 -0500
+--- OOE680_m6.fontconfig/vcl/inc/vcl/outfont.hxx 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/vcl/outfont.hxx 2006-12-19 04:27:48.000000000 -0500
@@ -230,6 +230,7 @@
ImplDevFontListData* FindFontFamily( const String& rFontName ) const;
ImplDevFontListData* ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplFontSubstEntry* pDevSpecificSubst ) const;
@@ -50,8 +50,8 @@
diff -ru OOE680_m6.fontconfig/vcl/inc/sallayout.hxx OOE680_m6/vcl/inc/sallayout.hxx
---- OOE680_m6.fontconfig/vcl/inc/sallayout.hxx 2006-12-18 13:00:23.000000000 -0500
-+++ OOE680_m6/vcl/inc/sallayout.hxx 2006-12-19 04:28:08.000000000 -0500
+--- OOE680_m6.fontconfig/vcl/inc/vcl/sallayout.hxx 2006-12-18 13:00:23.000000000 -0500
++++ OOE680_m6/vcl/inc/vcl/sallayout.hxx 2006-12-19 04:28:08.000000000 -0500
@@ -101,6 +101,7 @@
bool GetRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL ) const;
bool GetNextPos( int* nCharPos, bool* bRTL );
@@ -611,7 +611,7 @@
rArgs.NeedFallback( nCharPos, bRightToLeft );
+ if ( (nCharPos > 0) && lcl_CharIsJoiner(rArgs.mpStr[nCharPos-1]) )
+ rArgs.NeedFallback( nCharPos-1, bRightToLeft );
-+ else if ( (nCharPos + 1 < nRawRunGlyphCount) && lcl_CharIsJoiner(rArgs.mpStr[nCharPos+1]) )
++ else if ( (nCharPos + 1 < nEndRunPos) && lcl_CharIsJoiner(rArgs.mpStr[nCharPos+1]) )
+ rArgs.NeedFallback( nCharPos+1, bRightToLeft );
+ }
+
@@ -621,15 +621,15 @@
diff -ru OOE680_m6.fontconfig/vcl/source/window/window.cxx OOE680_m6/vcl/source/window/window.cxx
--- OOE680_m6.fontconfig/vcl/source/window/window.cxx 2006-12-18 13:00:26.000000000 -0500
+++ OOE680_m6/vcl/source/window/window.cxx 2006-12-19 04:27:48.000000000 -0500
-@@ -200,6 +200,7 @@
+@@ -201,6 +201,7 @@
#endif
- #include <pdfextoutdevdata.hxx>
+ #include <vcl/pdfextoutdevdata.hxx>
+#include <psprint/fontmanager.hxx>
- #include "lazydelete.hxx"
+ #include "vcl/lazydelete.hxx"
using namespace rtl;
-@@ -342,6 +343,10 @@
+@@ -347,6 +348,10 @@
bool Window::ImplCheckUIFont( const Font& rFont )
{
@@ -665,18 +665,20 @@
#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_
#include <com/sun/star/lang/Locale.hpp>
-@@ -413,7 +416,10 @@
+@@ -413,7 +416,11 @@
std::hash_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode;
std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode;
+- mutable FontCache* m_pFontCache;
+ std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontconfigNameToLocalized;
+
- mutable FontCache* m_pFontCache;
++ mutable FontCache* m_pFontCache;
+ bool m_bFontconfigSuccess;
++
+ mutable std::vector< fontID > m_aOverrideFonts;
rtl::OString getAfmFile( PrintFont* pFont ) const;
- rtl::OString getFontFile( PrintFont* pFont ) const;
-@@ -724,6 +730,11 @@
+@@ -737,6 +744,11 @@
false else
*/
bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale );
@@ -1380,8 +1382,8 @@
// fill XLFD aliases from fonts.alias files
initFontsAlias();
diff -ru vcl/inc/sallayout.hxx vcl/inc/sallayout.hxx
---- openoffice.org.orig/vcl/inc/sallayout.hxx 2007-01-11 10:26:04.000000000 +0000
-+++ openoffice.org/vcl/inc/sallayout.hxx 2007-01-11 10:32:50.000000000 +0000
+--- openoffice.org.orig/vcl/inc/vcl/sallayout.hxx 2007-01-11 10:26:04.000000000 +0000
++++ openoffice.org/vcl/inc/vcl/sallayout.hxx 2007-01-11 10:32:50.000000000 +0000
@@ -281,6 +281,8 @@
ImplFontData* GetFallbackFontData( int nFallbackLevel ) const
{ return mpFallbackFonts[ nFallbackLevel ]; }
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 26 Jul 2007 20:16:50 -0000 1.19
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 10 Oct 2007 16:11:56 -0000 1.20
@@ -87,7 +87,7 @@
diff -u -p -r1.3 wizard.cxx
--- openoffice.org.orig/desktop/source/migration/wizard.cxx 11 Mar 2005 10:50:09 -0000 1.3
+++ openoffice.org/desktop/source/migration/wizard.cxx 29 Mar 2005 09:01:44 -0000
-@@ -711,25 +711,8 @@
+@@ -729,25 +729,8 @@
// yuck! no license :/
}
@@ -97,8 +97,8 @@
- OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
- AllSettings aSettings(Application::GetSettings());
- aLocale = aSettings.GetUILocale();
-- ResMgr::SearchCreateResMgr(aMgrName, aLocale);
-+ OUString aLangString(OUString::createFromAscii("en-US"));
+- ResMgr* pLocalResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);
++ OUString aLangString(OUString::createFromAscii("en-US"));
- aLangString = aLocale.Language;
- if ( aLocale.Country.getLength() != 0 )
@@ -114,6 +114,14 @@
#ifdef WNT
aLicensePath =
aBaseInstallPath + OUString::createFromAscii(szLicensePath)
+@@ -763,7 +746,6 @@
+ + aLangString
+ + OUString::createFromAscii(szUNXLicenseExt);
+ #endif
+- delete pLocalResMgr;
+ return aLicensePath;
+ }
+ }
Index: util/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/util/makefile.mk,v
@@ -841,3 +849,19 @@
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
+Index: ./bin/modules/installer/worker.pm
+===================================================================
+RCS file: /cvs/tools/solenv/bin/modules/installer/worker.pm,v
+retrieving revision 1.51
+diff -u -r1.51 worker.pm
+--- openoffice.org.orig/solenv/bin/modules/installer/worker.pm 31 Jul 2007 13:59:14 -0000 1.51
++++ openoffice.org/solenv/bin/modules/installer/worker.pm 17 Aug 2007 17:55:11 -0000
+@@ -791,7 +791,7 @@
+
+ push @lines, "$destination\n";
+ # printf "cp $sourcepath $destdir$destination\n";
+- copy ("$sourcepath", "$destdir$destination") || die "Can't copy file: $!";
++ copy ("$sourcepath", "$destdir$destination") || die "Can't copy file $sourcepath to $destdir$destination: $!";
+ my $sourcestat = stat($sourcepath);
+ utime ($sourcestat->atime, $sourcestat->mtime, "$destdir$destination");
+ chmod (oct($unixrights), "$destdir$destination") || die "Can't change permissions: $!";
openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch:
Index: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 29 Nov 2005 09:35:11 -0000 1.1
+++ openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch 10 Oct 2007 16:11:56 -0000 1.2
@@ -5,23 +5,24 @@
diff -u -p -u -r1.57 docnew.cxx
--- openoffice.org.orig/sw/source/core/doc/docnew.cxx 8 Nov 2005 17:16:18 -0000 1.57
+++ openoffice.org/sw/source/core/doc/docnew.cxx 29 Nov 2005 09:38:58 -0000
-@@ -500,6 +500,15 @@ SwDoc::SwDoc() :
+@@ -502,6 +502,16 @@
SwDoc::~SwDoc()
{
-+ if( pExtInputRing )
-+ {
-+ Ring* pTmp = pExtInputRing;
-+ pExtInputRing = 0;
-+ while( pTmp->GetNext() != pTmp )
-+ delete pTmp->GetNext();
-+ delete pTmp;
-+ }
++ if( pExtInputRing )
++ {
++ Ring* pTmp = pExtInputRing;
++ pExtInputRing = 0;
++ while( pTmp->GetNext() != pTmp )
++ delete pTmp->GetNext();
++ delete pTmp;
++ }
+
- //!! needs to be done to destroy a possible SwFmtDrop format that may
- //!! be connected to a char format which may not otherwise be removed
- //!! and thus would leave a unremoved SwFmt object. (TL)
-@@ -569,15 +578,6 @@ SwDoc::~SwDoc()
++
+ // --> OD 2007-03-16 #i73788#
+ SwPauseThreadStarting aPauseThreadStarting;
+ // <--
+@@ -582,15 +592,6 @@
pBookmarkTbl->DeleteAndDestroy( 0, pBookmarkTbl->Count() );
DELETEZ( pMacroTable );
openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 16 Apr 2007 10:06:28 -0000 1.14
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 10 Oct 2007 16:11:56 -0000 1.15
@@ -1,6 +1,6 @@
diff -ru vcl/inc/impfont.hxx vcl/inc/impfont.hxx
---- openoffice.org.orig/vcl/inc/impfont.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/impfont.hxx 2006-05-05 09:39:11.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/impfont.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/impfont.hxx 2006-05-05 09:39:11.000000000 +0100
@@ -155,6 +155,42 @@
bool operator==( const ImplFontMetric& ) const;
};
@@ -45,9 +45,9 @@
// - ImplFontCharMap -
// -------------------
diff -ru vcl/inc/outdev.hxx vcl/inc/outdev.hxx
---- openoffice.org.orig/vcl/inc/outdev.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/outdev.hxx 2006-05-05 10:27:05.000000000 +0100
-@@ -105,6 +105,8 @@
+--- openoffice.org.orig/vcl/inc/vcl/outdev.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/outdev.hxx 2006-05-05 10:27:05.000000000 +0100
+@@ -106,6 +106,8 @@
class FontCharMap;
class SalLayout;
class ImplLayoutArgs;
@@ -56,17 +56,17 @@
class VirtualDevice;
namespace basegfx {
-@@ -543,6 +545,7 @@
+@@ -566,6 +568,7 @@
SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont );
SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& );
+ SAL_DLLPRIVATE void ImplGetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
- #endif
+ //#endif
protected:
diff -ru vcl/inc/outfont.hxx vcl/inc/outfont.hxx
---- openoffice.org.orig/vcl/inc/outfont.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/outfont.hxx 2006-05-04 14:37:46.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/outfont.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/outfont.hxx 2006-05-04 14:37:46.000000000 +0100
@@ -118,8 +118,6 @@
bool IsDeviceFont() const { return mbDevice; }
bool IsEmbeddable() const { return mbEmbeddable; }
@@ -86,8 +86,8 @@
// ----------------
diff -ru vcl/inc/salgdi.hxx vcl/inc/salgdi.hxx
---- openoffice.org.orig/vcl/inc/salgdi.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/salgdi.hxx 2006-05-05 10:40:08.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/salgdi.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/salgdi.hxx 2006-05-05 10:40:08.000000000 +0100
@@ -215,6 +215,8 @@
void ReleaseFonts() { SetFont( NULL, 0 ); }
// get the current font's metrics
@@ -98,8 +98,8 @@
// return only PairCount if (pKernPairs == NULL)
virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ) = 0;
diff -ru vcl/inc/vclenum.hxx vcl/inc/vclenum.hxx
---- openoffice.org.orig/vcl/inc/vclenum.hxx 2006-05-04 08:55:40.000000000 +0100
-+++ openoffice.org/vcl/inc/vclenum.hxx 2006-05-04 15:53:15.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/vclenum.hxx 2006-05-04 08:55:40.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/vclenum.hxx 2006-05-04 15:53:15.000000000 +0100
@@ -289,6 +289,27 @@
#endif
@@ -741,7 +741,7 @@
diff -ru psprint/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:10.000000000 -0400
+++ openoffice.org/psprint/source/fontmanager/fontmanager.cxx 2006-05-08 16:00:32.000000000 -0400
-@@ -379,9 +379,7 @@
+@@ -391,9 +391,7 @@
m_nXMax( 0 ),
m_nYMax( 0 ),
m_bHaveVerticalSubstitutedGlyphs( false ),
@@ -752,7 +752,7 @@
{
}
-@@ -2594,8 +2592,6 @@
+@@ -2761,8 +2759,6 @@
rInfo.m_eWeight = pFont->m_eWeight;
rInfo.m_ePitch = pFont->m_ePitch;
rInfo.m_aEncoding = pFont->m_aEncoding;
@@ -761,9 +761,18 @@
rInfo.m_aAliases.clear();
for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
+@@ -4006,8 +4002,6 @@
+ BuiltinFont* pFont = new BuiltinFont();
+ pFont->m_nDirectory = 0;
+ pFont->m_bUserOverride = false;
+- pFont->m_eEmbeddedbitmap = fcstatus::isunset;
+- pFont->m_eAntialias = fcstatus::isunset;
+ pFont->m_pMetrics = new PrintFontMetrics;
+ memset( pFont->m_pMetrics->m_aPages, 0xff, sizeof( pFont->m_pMetrics->m_aPages ) );
+ pFont->m_pMetrics->m_bKernPairsQueried = true;
diff -ru vcl/inc/impfont.hxx vcl/inc/impfont.hxx
---- openoffice.org.orig/vcl/inc/impfont.hxx 2006-05-22 13:59:55.000000000 +0100
-+++ openoffice.org/vcl/inc/impfont.hxx 2006-05-23 12:26:20.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/impfont.hxx 2006-05-22 13:59:55.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/impfont.hxx 2006-05-23 12:26:20.000000000 +0100
@@ -167,24 +167,29 @@
FontAutoHint meAutoHint; // whether the font should be autohinted
FontHinting meHinting; // whether the font should be hinted
@@ -798,8 +807,8 @@
bool DontUseAntiAlias() const { return meAntiAlias == ANTIALIAS_FALSE; }
bool DontUseHinting() const { return (meHinting == HINTING_FALSE) || (GetHintStyle() == HINT_NONE); }
diff -ru vcl/inc/vclenum.hxx vcl/inc/vclenum.hxx
---- openoffice.org.orig/vcl/inc/vclenum.hxx 2006-05-22 13:59:55.000000000 +0100
-+++ openoffice.org/vcl/inc/vclenum.hxx 2006-05-22 14:14:49.000000000 +0100
+--- openoffice.org.orig/vcl/inc/vcl/vclenum.hxx 2006-05-22 13:59:55.000000000 +0100
++++ openoffice.org/vcl/inc/vcl/vclenum.hxx 2006-05-22 14:14:49.000000000 +0100
@@ -310,6 +310,14 @@
#endif
@@ -823,14 +832,14 @@
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx 24 Jan 2007 15:08:39 -0000 1.139.12.2
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx 13 Apr 2007 11:33:47 -0000
@@ -44,6 +44,7 @@
- #include <impfont.hxx>
- #include <bitmap.hxx>
- #include <bmpacc.hxx>
-+#include <virdev.hxx>
+ #include <vcl/impfont.hxx>
+ #include <vcl/bitmap.hxx>
+ #include <vcl/bmpacc.hxx>
++#include <vcl/virdev.hxx>
#include <tools/poly.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
-@@ -614,9 +617,6 @@
+@@ -616,9 +617,6 @@
aDFA.mbSubsettable= false;
aDFA.mbEmbeddable = false;
@@ -840,7 +849,7 @@
FT_Done_Face( aFaceFT );
AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
++nCount;
-@@ -696,6 +696,7 @@
+@@ -698,6 +696,7 @@
: ServerFont( rFSD ),
mnPrioEmbedded(nDefaultPrioEmbedded),
mnPrioAntiAlias(nDefaultPrioAntiAlias),
@@ -848,7 +857,7 @@
mpFontInfo( pFI ),
maFaceFT( NULL ),
maSizeFT( NULL ),
-@@ -825,42 +826,84 @@
+@@ -830,42 +829,84 @@
mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
@@ -956,7 +965,7 @@
#endif
if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1192,13 +1239,15 @@
+@@ -1197,13 +1238,15 @@
}
}
@@ -973,7 +982,7 @@
#endif
if( nGlyphIndex != 0 )
-@@ -1329,11 +1378,11 @@
+@@ -1334,11 +1377,11 @@
#if (FTVERSION >= 2002)
// for 0/90/180/270 degree fonts enable autohinting even if not advisable
// non-hinted and non-antialiased bitmaps just look too ugly
@@ -987,7 +996,7 @@
nLoadFlags |= FT_LOAD_NO_BITMAP;
FT_Error rc = -1;
-@@ -1484,7 +1533,7 @@
+@@ -1489,7 +1532,7 @@
// autohinting in FT<=2.0.4 makes antialiased glyphs look worse
nLoadFlags |= FT_LOAD_NO_HINTING;
#else
@@ -1098,7 +1107,7 @@
void FcDefaultSubstitute( FcPattern* pPattern )
{ m_pFcDefaultSubstitute( pPattern ); }
FcPattern* FcFontSetMatch( FcConfig* pConfig, FcFontSet **ppFontSet, int nset, FcPattern* pPattern, FcResult* pResult )
-@@ -774,14 +777,18 @@
+@@ -774,14 +777,19 @@
rWrapper.FcPatternAddDouble( pPattern, FC_PIXEL_SIZE, nSize);
FcBool embitmap = true, antialias = true, autohint = true, hinting = true;
@@ -1106,7 +1115,8 @@
+ int hintstyle = FC_HINT_FULL, rgba = FC_RGBA_UNKNOWN;
rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchFont );
-+ if (const cairo_font_options_t *pOptions = gdk_screen_get_font_options(gdk_screen_get_default()))
++ GdkScreen *pScreen = gdk_screen_get_default();
++ if (const cairo_font_options_t *pOptions = pScreen ? gdk_screen_get_font_options(pScreen) : 0)
+ cairo_ft_font_options_substitute(pOptions, pPattern);
rWrapper.FcDefaultSubstitute( pPattern );
FcResult eEmbeddedBitmap = rWrapper.FcPatternGetBool( pPattern, FC_EMBEDDED_BITMAP, 0, &embitmap );
@@ -1179,3 +1189,97 @@
+
.INCLUDE : target.mk
+Index: svppspgraphics.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svppspgraphics.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 svppspgraphics.cxx
+--- openoffice.org.orig/vcl/unx/headless/svppspgraphics.cxx 24 Jul 2007 10:28:29 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svppspgraphics.cxx 15 Aug 2007 11:59:04 -0000
+@@ -1175,32 +1175,6 @@
+ aDFA.mePitch = ToFontPitch (rInfo.m_ePitch);
+ aDFA.mbSymbolFlag = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
+
+- switch (rInfo.m_eEmbeddedbitmap)
+- {
+- default:
+- aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_DONTKNOW;
+- break;
+- case psp::fcstatus::istrue:
+- aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_TRUE;
+- break;
+- case psp::fcstatus::isfalse:
+- aDFA.meEmbeddedBitmap = EMBEDDEDBITMAP_FALSE;
+- break;
+- }
+-
+- switch (rInfo.m_eAntialias)
+- {
+- default:
+- aDFA.meAntiAlias = ANTIALIAS_DONTKNOW;
+- break;
+- case psp::fcstatus::istrue:
+- aDFA.meAntiAlias = ANTIALIAS_TRUE;
+- break;
+- case psp::fcstatus::isfalse:
+- aDFA.meAntiAlias = ANTIALIAS_FALSE;
+- break;
+- }
+-
+ // special case for the ghostscript fonts
+ if( aDFA.maName.CompareIgnoreCaseToAscii( "itc ", 4 ) == COMPARE_EQUAL )
+ aDFA.maName = aDFA.maName.Copy( 4 );
+@@ -1386,3 +1360,7 @@
+ return bRet && m_bSwallowFaxNo;
+ }
+
++void PspGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const
++{
++}
++
+Index: svppspgraphics.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svppspgraphics.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 svppspgraphics.hxx
+--- openoffice.org.orig/vcl/unx/headless/svppspgraphics.hxx 24 Jul 2007 10:28:40 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svppspgraphics.hxx 15 Aug 2007 12:02:57 -0000
+@@ -201,6 +201,7 @@
+
+ virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
+ virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop );
++ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+ };
+
+ #endif // _SVP_PSPGRAPHICS_HXX
+Index: svpgdi.cxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svpgdi.cxx,v
+retrieving revision 1.2
+diff -u -r1.2 svpgdi.cxx
+--- openoffice.org.orig/vcl/unx/headless/svpgdi.cxx 24 Jul 2007 10:27:28 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svpgdi.cxx 15 Aug 2007 12:06:47 -0000
+@@ -535,3 +535,7 @@
+ {
+ return FALSE;
+ }
++
++void SvpSalGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const
++{
++}
+Index: svpgdi.hxx
+===================================================================
+RCS file: /cvs/gsl/vcl/unx/headless/svpgdi.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 svpgdi.hxx
+--- openoffice.org.orig/vcl/unx/headless/svpgdi.hxx 24 Jul 2007 10:27:38 -0000 1.2
++++ openoffice.org/vcl/unx/headless/svpgdi.hxx 15 Aug 2007 12:07:36 -0000
+@@ -176,6 +176,8 @@
+ virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags );
+
+ virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
++
++ virtual void GetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
+ };
+
+ #endif
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 4 Oct 2007 14:24:26 -0000 1.34
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 10 Oct 2007 16:11:56 -0000 1.35
@@ -98,15 +98,89 @@
};
// ----------------------------------------------------------------------
-@@ -139,7 +141,7 @@
+@@ -89,6 +90,7 @@
+ private:
+
+ bool m_bUIOption;
++ bool m_bPseudo;
+ String m_aUITranslation;
+ UIType m_eUIType;
+ int m_nOrderDependency;
+@@ -110,6 +112,8 @@
+
+ const String& getKey() const { return m_aKey; }
+ bool isUIKey() const { return m_bUIOption; }
++ bool isPseudoKey() const { return m_bPseudo; }
++ void setPseudoKey() { m_bPseudo = true; }
+ const String& getUITranslation() const { return m_aUITranslation; }
+ UIType getUIType() const { return m_eUIType; }
+ SetupType getSetupType() const { return m_eSetupType; }
+@@ -139,8 +143,9 @@
typedef ::std::hash_map< ::rtl::OUString, PPDKey*, ::rtl::OUStringHash > hash_type;
typedef ::std::vector< PPDKey* > value_type;
-
+public:
void insertKey( const String& rKey, PPDKey* pKey );
++ void Reset();
public:
struct PPDConstraint
+ {
+@@ -302,6 +307,7 @@
+ // returns false: check failed, new value is constrained
+ // true: check succeded, new value can be set
+ bool checkConstraints( const PPDKey*, const PPDValue*, bool bDoReset );
++public:
+ bool resetValue( const PPDKey*, bool bDefaultable = false );
+ public:
+ PPDContext( const PPDParser* pParser = NULL );
+Index: source/helper/ppdparser.cxx
+===================================================================
+RCS file: /cvs/gsl/psprint/source/helper/ppdparser.cxx,v
+retrieving revision 1.24
+diff -u -r1.24 ppdparser.cxx
+--- openoffice.org.orig/psprint/source/helper/ppdparser.cxx 25 Jan 2007 11:20:15 -0000 1.24
++++ openoffice.org/psprint/source/helper/ppdparser.cxx 4 Oct 2007 11:25:31 -0000
+@@ -53,6 +53,7 @@
+ #include <osl/thread.h>
+ #include <rtl/strbuf.hxx>
+ #include <rtl/ustrbuf.hxx>
++#include <algorithm>
+
+ #define PRINTER_PPDDIR "driver"
+
+@@ -486,6 +487,23 @@
+ delete it->second;
+ }
+
++void PPDParser::Reset()
++{
++ for( PPDParser::hash_type::iterator it = m_aKeys.begin(); it != m_aKeys.end(); /*nothing*/ )
++ {
++ PPDKey* pKey = it->second;
++ if (pKey->isPseudoKey())
++ {
++ m_aOrderedKeys.erase(::std::remove(m_aOrderedKeys.begin(),
++ m_aOrderedKeys.end(), pKey), m_aOrderedKeys.end());
++ delete it->second;
++ m_aKeys.erase(it++);
++ }
++ else
++ ++it;
++ }
++}
++
+ void PPDParser::insertKey( const String& rKey, PPDKey* pKey )
+ {
+ m_aKeys[ rKey ] = pKey;
+@@ -1238,6 +1256,7 @@
+ m_pDefaultValue( NULL ),
+ m_bQueryValue( false ),
+ m_bUIOption( false ),
++ m_bPseudo( false ),
+ m_eUIType( PickOne ),
+ m_nOrderDependency( 100 ),
+ m_eSetupType( AnySetup )
Index: source/dialogs/makefile.mk
===================================================================
RCS file: /cvs/util/svtools/source/dialogs/makefile.mk,v
@@ -160,37 +234,39 @@
RCS file: /cvs/gsl/vcl/inc/jobset.hxx,v
retrieving revision 1.7
diff -u -r1.7 jobset.hxx
---- openoffice.org.orig/vcl/inc/jobset.hxx 9 Sep 2005 11:06:48 -0000 1.7
-+++ openoffice.org/vcl/inc/jobset.hxx 19 May 2006 13:16:52 -0000
+--- openoffice.org.orig/vcl/inc/vcl/jobset.hxx 9 Sep 2005 11:06:48 -0000 1.7
++++ openoffice.org/vcl/inc/vcl/jobset.hxx 19 May 2006 13:16:52 -0000
@@ -50,6 +50,7 @@
#ifndef _SV_PRNTYPES_HXX
- #include <prntypes.hxx>
+ #include <vcl/prntypes.hxx>
#endif
+#include <psprint/printerinfomanager.hxx>
class SvStream;
struct ImplJobSetup;
-@@ -87,6 +88,8 @@
+@@ -87,6 +88,9 @@
*/
String GetValue( const String& rKey ) const;
void SetValue( const String& rKey, const String& rValue );
-+ void SetCupsKey( const String& rKey, const String& rValue );
-+ psp::PrinterInfo GetPrinterInfo() const;
-
++ void SetCupsKey( const String& rKey, const String& rValue );
++ void Reset( );
++ psp::PrinterInfo GetPrinterInfo() const;
JobSetup& operator=( const JobSetup& rJob );
+
Index: inc/print.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/print.hxx,v
retrieving revision 1.22
diff -u -r1.22 print.hxx
---- openoffice.org.orig/vcl/inc/print.hxx 9 Sep 2005 11:15:40 -0000 1.22
-+++ openoffice.org/vcl/inc/print.hxx 19 May 2006 13:16:55 -0000
-@@ -355,6 +355,9 @@
+--- openoffice.org.orig/vcl/inc/vcl/print.hxx 9 Sep 2005 11:15:40 -0000 1.22
++++ openoffice.org/vcl/inc/vcl/print.hxx 19 May 2006 13:16:55 -0000
+@@ -355,6 +355,10 @@
const JobSetup& GetJobSetup() const { return maJobSetup; }
String GetJobValue( const String& rKey ) const { return maJobSetup.GetValue( rKey ); }
void SetJobValue( const String& rKey, const String& rValue ) { maJobSetup.SetValue( rKey, rValue ); }
+ void SetJobCupsKey( const String& rKey, const String& rValue ) { maJobSetup.SetCupsKey( rKey, rValue ); }
++ void Reset( ) { maJobSetup.Reset(); }
+ psp::PrinterInfo GetPrinterInfo() const;
+
@@ -211,7 +287,7 @@
// =======================================================================
DBG_NAME( JobSetup )
-@@ -244,6 +245,198 @@
+@@ -244,6 +245,229 @@
mpData = new ImplJobSetup();
mpData->maValueMap[ rKey ] = rValue;
@@ -339,6 +415,35 @@
+ return aInfo;
+}
+
++void JobSetup::Reset( )
++{
++ if( ! mpData )
++ mpData = new ImplJobSetup();
++
++ using namespace psp;
++
++ PrinterInfoManager& rManager = PrinterInfoManager::get();
++ PrinterInfo aInfo(rManager.getPrinterInfo(mpData->maPrinterName));
++ if (mpData->mpDriverData )
++ {
++ JobData::constructFromStreamBuffer(mpData->mpDriverData,
++ mpData->mnDriverDataLen, aInfo);
++ }
++
++ int nDifferent = aInfo.m_aContext.countValuesModified();
++ for (int i = 0; i < nDifferent; ++i)
++ {
++ const PPDKey* pKey = aInfo.m_aContext.getModifiedKey(i);
++ bool bResult = aInfo.m_aContext.resetValue(pKey, true);
++ }
++
++ if (aInfo.m_pParser)
++ const_cast<PPDParser*>(aInfo.m_pParser)->Reset();
++
++ aInfo.m_bCupsJob=false;
++ copyJobDataToJobSetup( mpData, aInfo );
++}
++
+void JobSetup::SetCupsKey( const String& rKey, const String& rValue )
+{
+ if( ! mpData )
@@ -397,6 +502,8 @@
+ else
+ {
+ PPDKey* pNewKey = new PPDKey( rKey );
++ pNewKey->setPseudoKey();
++ pNewKey->insertValue(String(RTL_CONSTASCII_USTRINGPARAM("None")));
+ PPDValue* pValue = pNewKey->insertValue(rValue);
+ pValue->m_eType = eInvocation;
+ pValue->m_aValue = rValue;
@@ -520,8 +627,8 @@
RCS file: /cvs/util/svtools/inc/printdlg.hxx,v
retrieving revision 1.9
diff -u -r1.9 printdlg.hxx
---- openoffice.org.orig/svtools/inc/printdlg.hxx 8 Sep 2005 10:06:06 -0000 1.9
-+++ openoffice.org/svtools/inc/printdlg.hxx 16 Nov 2006 14:14:18 -0000
+--- openoffice.org.orig/svtools/inc/svtools/printdlg.hxx 8 Sep 2005 10:06:06 -0000 1.9
++++ openoffice.org/svtools/inc/svtools/printdlg.hxx 16 Nov 2006 14:14:18 -0000
@@ -140,6 +140,9 @@
Link maOKHdlLink; // Link zum OK-Handler
@@ -548,10 +655,10 @@
diff -u -r1.23 printdlg.cxx
--- openoffice.org.orig/svtools/source/dialogs/printdlg.cxx 17 Sep 2006 14:45:21 -0000 1.23
+++ openoffice.org/svtools/source/dialogs/printdlg.cxx 16 Nov 2006 14:14:35 -0000
-@@ -85,9 +85,62 @@
+@@ -84,9 +84,64 @@
+ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
#endif
-
+extern void ImplDeletePrnQueueList();
+#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
+#include <com/sun/star/frame/XFrame.hpp>
@@ -583,7 +690,7 @@
+#include <unotools/ucbstreamhelper.hxx>
+
+#ifndef INCLUDED_SVTOOLS_MISCOPT_HXX
-+#include "miscopt.hxx"
++#include "svtools/miscopt.hxx"
+#endif
+#include <gtk/gtkprintunixdialog.h>
+#include <gtk/gtkstock.h>
@@ -598,20 +705,22 @@
+
+using namespace osl;
+
- using namespace com::sun::star::uno;
- using namespace com::sun::star::lang;
+
+ using rtl::OUString;
+ using namespace com::sun::star;
+using namespace ::com::sun::star::frame;
+using namespace ::com::sun::star::beans;
- using namespace com::sun::star::ui::dialogs;
+using namespace com::sun::star::view;
+using namespace com::sun::star::document;
+using namespace com::sun::star::sheet;
+using namespace com::sun::star::container;
+using namespace com::sun::star::io;
- using namespace rtl;
++using namespace com::sun::star::uno;
++using namespace com::sun::star::lang;
struct SvtPrinterImpl
-@@ -139,7 +185,10 @@
+ {
+@@ -137,7 +190,10 @@
maBtnHelp ( this, SvtResId( BTN_HELP ) ),
maFlSepCopiesRange( this, SvtResId( FL_SEPCOPIESRANGE ) ),
maFlSepButtonLine( this, SvtResId( FL_SEPBUTTONLINE ) ),
@@ -623,7 +732,7 @@
{
FreeResource();
-@@ -608,6 +656,250 @@
+@@ -605,6 +661,250 @@
// -----------------------------------------------------------------------
@@ -644,7 +753,7 @@
+ else if ((!strcmp(key, "collate")) && (!strcmp(value, "true")))
+ pPrinter->SetJobCupsKey(String::CreateFromAscii("Collate"), String::CreateFromAscii("True"));
+ else if (!strcmp(key, "n-copies"))
-+ pPrinter->SetJobCupsKey(String::CreateFromAscii("Copies"), String::CreateFromAscii(value));
++ pPrinter->SetJobCupsKey(String::CreateFromAscii("copies"), String::CreateFromAscii(value));
+}
+
+void ExportAsPDF(const rtl::OUString &rFileURL, PrintDialogRange eRange, const OUString &rRange)
@@ -874,7 +983,7 @@
short PrintDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -625,15 +908,321 @@
+@@ -622,15 +922,322 @@
ImplInitControls();
ImplModifyControlHdl( NULL );
@@ -897,7 +1006,7 @@
+ {
+ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, parent);
+
-+ rtl::OString aOptions(OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
++ rtl::OString aOptions(rtl::OUStringToOString(maBtnOptions.GetText(), RTL_TEXTENCODING_UTF8));
+ aOptions = aOptions.replace('~','_');
+
+ gtk_dialog_add_button( GTK_DIALOG( aHandle.pDialog ), aOptions.getStr(), GTK_RESPONSE_HELP);
@@ -1153,6 +1262,7 @@
+ }
+ }
+ }
++ mpPrinter->Reset();
+ gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter);
+
+ mpPrinter->SetOrientation(ORIENTATION_PORTRAIT);
@@ -1203,7 +1313,7 @@
}
maStatusTimer.Stop();
-@@ -648,4 +1161,3 @@
+@@ -645,4 +1239,3 @@
mpPrinterImpl->m_bHelpDisabled = sal_True;
maBtnHelp.Disable();
}
@@ -1253,8 +1363,8 @@
diff -u -r1.45 printdlg.src
--- openoffice.org/svtools/source/dialogs/printdlg.src 23 Sep 2005 14:52:41 -0000 1.45
+++ openoffice.org.orig/svtools/source/dialogs/printdlg.src 16 Nov 2006 14:14:44 -0000
-@@ -291,6 +291,16 @@
- Text [ de ] = "<Alle>";
+@@ -256,6 +256,16 @@
+ {
Text [ en-US ] = "<All>";
};
+ String STR_PAPER_PAPER_TXT
@@ -1267,9 +1377,9 @@
+ Text [ de ] = "Orientierung:";
+ Text [ en-US ] = "Orientation:";
+ };
- Text [ x-comment ] = " ";
};
+ Image RID_IMG_PRNDLG_COLLATE
--- openoffice.org.orig/psprint/source/printer/printerinfomanager.cxx 2007-01-30 10:03:20.000000000 +0000
+++ openoffice.org/psprint/source/printer/printerinfomanager.cxx 2007-01-29 12:49:51.000000000 +0000
@@ -137,6 +137,14 @@
@@ -1292,8 +1402,8 @@
RCS file: /cvs/gsl/vcl/inc/print.h,v
retrieving revision 1.3
diff -u -r1.3 print.h
---- openoffice.org.orig/vcl/inc/print.h 9 Sep 2005 11:15:23 -0000 1.3
-+++ openoffice.org/vcl/inc/print.h 15 Mar 2007 12:07:29 -0000
+--- openoffice.org.orig/vcl/inc/vcl/print.h 9 Sep 2005 11:15:23 -0000 1.3
++++ openoffice.org/vcl/inc/vcl/print.h 15 Mar 2007 12:07:29 -0000
@@ -82,6 +82,6 @@
// - Prototypes -
// --------------
@@ -1317,8 +1427,8 @@
RCS file: /cvs/gsl/vcl/inc/Attic/salframe.hxx,v
retrieving revision 1.30
diff -u -r1.30 salframe.hxx
---- openoffice.org.orig/vcl/inc/salframe.hxx 1 Nov 2006 15:28:55 -0000 1.30
-+++ openoffice.org/vcl/inc/salframe.hxx 1 May 2007 12:21:25 -0000
+--- openoffice.org.orig/vcl/inc/vcl/salframe.hxx 1 Nov 2006 15:28:55 -0000 1.30
++++ openoffice.org/vcl/inc/vcl/salframe.hxx 1 May 2007 12:21:25 -0000
@@ -313,6 +313,9 @@
// (e.g. input methods, printer update handlers).
long CallCallback( USHORT nEvent, const void* pEvent ) const
@@ -1334,8 +1444,8 @@
RCS file: /cvs/gsl/vcl/inc/Attic/window.hxx,v
retrieving revision 1.80.24.1
diff -u -r1.80.24.1 window.hxx
---- openoffice.org.orig/vcl/inc/window.hxx 19 Jan 2007 16:10:11 -0000 1.80.24.1
-+++ openoffice.org/vcl/inc/window.hxx 1 May 2007 12:21:29 -0000
+--- openoffice.org.orig/vcl/inc/vcl/window.hxx 19 Jan 2007 16:10:11 -0000 1.80.24.1
++++ openoffice.org/vcl/inc/vcl/window.hxx 1 May 2007 12:21:29 -0000
@@ -1087,6 +1087,9 @@
/* mark Window for deletion in top of event queue
*/
openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch:
Index: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch 24 Sep 2006 16:16:45 -0000 1.1
+++ openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch 10 Oct 2007 16:11:56 -0000 1.2
@@ -20,16 +20,16 @@
diff -u -r1.9 spadmin.xhp
--- openoffice.org.orig/helpcontent2/source/text/shared/guide/spadmin.xhp 28 Jun 2006 15:43:29 -0000 1.9
+++ openoffice.org/helpcontent2/source/text/shared/guide/spadmin.xhp 24 Sep 2006 14:46:08 -0000
-@@ -81,8 +81,6 @@
+@@ -58,8 +58,6 @@
<bookmark_value>PostScript; PDF converter, UNIX</bookmark_value>
<bookmark_value>converters; PostScript, UNIX</bookmark_value>
<bookmark_value>PDF; PostScript to PDF converter, UNIX</bookmark_value>
-<bookmark_value>fonts; adding under UNIX</bookmark_value>
-<bookmark_value>typefaces; adding under UNIX</bookmark_value>
- </bookmark>
+ </bookmark><comment>mw deleted "printer programs under UNIX", "fax programs under UNIX" and "font programs under UNIX" and changed "faxes;..."</comment>
<paragraph role="paragraph" id="par_id3154422" xml-lang="en-US" l10n="E" oldref="341" localize="false"/>
<paragraph role="heading" id="hd_id3147834" xml-lang="en-US" level="1" l10n="U" oldref="1"><variable id="spadmin"><link href="text/shared/guide/spadmin.xhp" name="Setting up Printer, Fax and Fonts Under UNIX Based Platforms">Setting up Printer, Fax and Fonts Under UNIX Based Platforms</link>
-@@ -100,7 +98,6 @@
+@@ -77,7 +75,6 @@
</list>
<paragraph role="paragraph" id="par_id3152349" xml-lang="en-US" l10n="U" oldref="14">After it starts, the window of the printer administration program <emph>spadmin</emph> appears.</paragraph>
<paragraph role="paragraph" id="par_id3149580" xml-lang="en-US" l10n="U" oldref="10">Following a server installation, the system administrator first logs on as with root privileges, and starts the printer administration program <emph>spadmin</emph>. The administrator then creates a general printer configuration file called {install_path}/share/psprint/psprint.conf for all users. All changes are immediately available to all users.</paragraph>
@@ -37,7 +37,7 @@
<paragraph role="heading" id="hd_id3159177" xml-lang="en-US" level="2" l10n="U" oldref="121">Setting up Printers</paragraph>
<paragraph role="paragraph" id="par_id3159157" xml-lang="en-US" l10n="U" oldref="122">Under UNIX based platforms, the $[officename] software only offers direct support for printers using the PostScript technology. Other printers must be set up as described in the section <emph>Printer Drivers in the $[officename] Software</emph>. The $[officename] software automatically provides a printer with the default driver for each system queue. You can add additional printers as needed.</paragraph>
<paragraph role="heading" id="hd_id3148564" xml-lang="en-US" level="3" l10n="U" oldref="286">Adding a Printer</paragraph>
-@@ -257,88 +254,6 @@
+@@ -234,88 +231,6 @@
</list>
<paragraph role="paragraph" id="par_id3153064" xml-lang="en-US" l10n="U" oldref="313">You can now create PDF documents by printing to the converter that has just been created.</paragraph>
<paragraph role="paragraph" id="par_id3159222" xml-lang="en-US" l10n="E" oldref="345" localize="false"/>
openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch:
Index: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 26 Jul 2007 20:25:22 -0000 1.1
+++ openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch 10 Oct 2007 16:11:56 -0000 1.2
@@ -121,170 +121,3 @@
aSuppLocales.realloc(numlocs);
-Index: configure.in
-===================================================================
-RCS file: /cvs/tools/config_office/configure.in,v
-retrieving revision 1.192.2.3
-diff -u -r1.192.2.3 configure.in
---- openoffice.org.orig/config_office/configure.in 19 Jan 2007 12:55:19 -0000 1.192.2.3
-+++ openoffice.org/config_office/configure.in 6 Jun 2007 14:11:02 -0000
-@@ -3985,14 +3985,16 @@
- AC_CHECK_HEADER(hunspell/hunspell.hxx, [ HUNSPELL_CFLAGS=-I/usr/include/hunspell ],
- [AC_MSG_ERROR(hunspell headers not found.)], [])
- ], [])
-- AC_CHECK_LIB(hunspell, main, [],
-+ AC_CHECK_LIB(hunspell-1.1, main, [],
- [ AC_MSG_ERROR(hunspell library not found.) ], [])
-+ HUNSPELL_LIBS="-lhunspell-1.1"
- else
- AC_MSG_RESULT([internal])
- SYSTEM_HUNSPELL=NO
- fi
- AC_SUBST(SYSTEM_HUNSPELL)
- AC_SUBST(HUNSPELL_CFLAGS)
-+AC_SUBST(HUNSPELL_LIBS)
-
- dnl ===================================================================
- dnl Checking for altlinuxhyph
-Index: set_soenv.in
-===================================================================
-RCS file: /cvs/tools/config_office/set_soenv.in,v
-retrieving revision 1.130.2.3
-diff -u -r1.130.2.3 set_soenv.in
---- openoffice.org.orig/config_office/set_soenv.in 19 Jan 2007 12:55:33 -0000 1.130.2.3
-+++ openoffice.org/config_office/set_soenv.in 6 Jun 2007 14:11:03 -0000
-@@ -1852,6 +1852,7 @@
- ToFile( "XINERAMA_LINK", "@XINERAMA_LINK@", "e" );
- ToFile( "SYSTEM_HUNSPELL", "@SYSTEM_HUNSPELL@", "e" );
- ToFile( "HUNSPELL_CFLAGS", "@HUNSPELL_CFLAGS@", "e" );
-+ToFile( "HUNSPELL_LIBS", "@HUNSPELL_LIBS@", "e" );
- ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" );
- ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" );
- ToFile( "PAM", "@PAM@", "e" );
-Index: source/hyphenator/altlinuxhyph/hyphen/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk,v
-retrieving revision 1.11.34.1
-diff -u -r1.11.34.1 makefile.mk
---- openoffice.org.orig/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 1 Feb 2007 19:08:18 -0000 1.11.34.1
-+++ openoffice.org/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 6 Jun 2007 14:12:05 -0000
-@@ -97,10 +97,10 @@
- $(LNGLIB) \
- $(HNJLIB)
-
--.IF "$(SYSTEM_MYSPELL)" != "YES"
-+.IF "$(SYSTEM_HUNSPELL)" != "YES"
- SHL1STDLIBS+= $(ULINGULIB)
- .ELSE
--SHL1STDLIBS+= $(MYSPELL_LIBS)
-+SHL1STDLIBS+= $(HUNSPELL_LIBS)
- .ENDIF
-
-
-Index: source/lingutil/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/lingutil/makefile.mk,v
-retrieving revision 1.6
-diff -u -r1.6 makefile.mk
---- openoffice.org.orig/lingucomponent/source/lingutil/makefile.mk 7 Sep 2005 19:40:54 -0000 1.6
-+++ openoffice.org/lingucomponent/source/lingutil/makefile.mk 6 Jun 2007 14:12:05 -0000
-@@ -43,9 +43,9 @@
-
- .INCLUDE : settings.mk
-
--.IF "$(SYSTEM_MYSPELL)" == "YES"
-+.IF "$(SYSTEM_HUNSPELL)" == "YES"
- @all:
-- @echo "Nothing to do here; using system myspell..."
-+ @echo "Nothing to do here; using system hunspell..."
- .ENDIF
-
- SLOFILES= \
-Index: source/spellcheck/spell/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/spellcheck/spell/makefile.mk,v
-retrieving revision 1.13.34.1
-diff -u -r1.13.34.1 makefile.mk
---- openoffice.org.orig/lingucomponent/source/spellcheck/spell/makefile.mk 1 Feb 2007 19:08:29 -0000 1.13.34.1
-+++ openoffice.org/lingucomponent/source/spellcheck/spell/makefile.mk 6 Jun 2007 14:12:06 -0000
-@@ -40,11 +40,6 @@
- ENABLE_EXCEPTIONS=TRUE
- USE_DEFFILE=TRUE
-
--.IF "$(MYSPELLLIB)"==""
--.ELSE
-- at echo "Build Hunspell instead of system Myspell."
--.ENDIF
--
- .IF "$(HUNSPELLLIB)"==""
- .IF "$(GUI)"=="UNX"
- HUNSPELLLIB=-lhunspell
-@@ -108,11 +103,12 @@
- $(SALLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
-- $(LNGLIB) \
-- $(HUNSPELLLIB)
-+ $(LNGLIB)
-
- .IF "$(SYSTEM_HUNSPELL)" != "YES"
--SHL1STDLIBS+= $(ULINGULIB)
-+SHL1STDLIBS+= $(ULINGULIB) $(HUNSPELLLIB)
-+.ELSE
-+SHL1STDLIBS+= $(HUNSPELL_LIBS)
- .ENDIF
-
- # build DLL
-Index: source/thesaurus/libnth/makefile.mk
-===================================================================
-RCS file: /cvs/whiteboard/lingucomponent/source/thesaurus/libnth/makefile.mk,v
-retrieving revision 1.7.34.1
-diff -u -r1.7.34.1 makefile.mk
---- openoffice.org.orig/lingucomponent/source/thesaurus/libnth/makefile.mk 1 Feb 2007 19:08:41 -0000 1.7.34.1
-+++ openoffice.org/lingucomponent/source/thesaurus/libnth/makefile.mk 6 Jun 2007 14:12:06 -0000
-@@ -66,22 +66,22 @@
-
- # --- Files --------------------------------------------------------
-
--.IF "$(SYSTEM_MYSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
--CXXFLAGS += $(MYSPELL_CFLAGS)
--CFLAGSCXX += $(MYSPELL_CFLAGS)
--CFLAGSCC += $(MYSPELL_CFLAGS)
--.ENDIF
--.IF "$(SYSTEM_MYSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
--CXXFLAGS += -I..$/mythes $(MYSPELL_CFLAGS)
--CFLAGSCXX += -I..$/mythes $(MYSPELL_CFLAGS)
--CFLAGSCC += -I..$/mythes $(MYSPELL_CFLAGS)
-+.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" == "YES"
-+CXXFLAGS += $(HUNSPELL_CFLAGS)
-+CFLAGSCXX += $(HUNSPELL_CFLAGS)
-+CFLAGSCC += $(HUNSPELL_CFLAGS)
-+.ENDIF
-+.IF "$(SYSTEM_HUNSPELL)" == "YES" && "$(SYSTEM_MYTHES)" != "YES"
-+CXXFLAGS += -I..$/mythes $(HUNSPELL_CFLAGS)
-+CFLAGSCXX += -I..$/mythes $(HUNSPELL_CFLAGS)
-+CFLAGSCC += -I..$/mythes $(HUNSPELL_CFLAGS)
- .ENDIF
- .IF "$(SYSTEM_MYPSPELL)" != "YES" && "$(SYSTEM_MYTHES)" == "YES"
- CXXFLAGS += -I..$/..$/lingutil
- CFLAGSCXX += -I..$/..$/lingutil
- CFLAGSCC += -I..$/..$/lingutil
- .ENDIF
--.IF "$(SYSTEM_MYSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
-+.IF "$(SYSTEM_HUNSPELL)" != "YES" && "$(SYSTEM_MYTHES)" != "YES"
- CXXFLAGS += -I..$/mythes -I..$/..$/lingutil
- CFLAGSCXX += -I..$/mythes -I..$/..$/lingutil
- CFLAGSCC += -I..$/mythes -I..$/..$/lingutil
-@@ -117,10 +117,10 @@
- $(LNGLIB) \
- $(MYTHESLIB)
-
--.IF "$(SYSTEM_MYSPELL)" != "YES"
-+.IF "$(SYSTEM_HUNSPELL)" != "YES"
- SHL1STDLIBS+= $(ULINGULIB)
- .ELSE
--SHL1STDLIBS+= $(MYSPELL_LIBS)
-+SHL1STDLIBS+= $(HUNSPELL_LIBS)
- .ENDIF
- # build DLL
- SHL1LIBS= $(SLB)$/$(TARGET).lib
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
Index: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 17 Apr 2007 09:25:15 -0000 1.2
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 10 Oct 2007 16:11:56 -0000 1.3
@@ -1,1252 +1,1550 @@
---- /dev/null 2006-08-13 17:52:05.000000000 +0200
-+++ Source/avmedia/source/gstreamer/exports.dxp 2006-08-22 11:38:56.000000000 +0200
-@@ -0,0 +1,4 @@
-+component_getImplementationEnvironment
-+component_writeInfo
-+component_getFactory
-+
---- /dev/null 2006-08-13 17:52:05.000000000 +0200
-+++ Source/avmedia/source/gstreamer/gstcommon.hxx 2006-08-22 11:38:56.000000000 +0200
-@@ -0,0 +1,83 @@
-+/*************************************************************************
-+ *
-+ * OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ * $RCSfile$
-+ *
-+ * $Revision$
-+ *
-+ * last change: $Author$ $Date$
-+ *
-+ * The Contents of this file are made available subject to
-+ * the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ * GNU Lesser General Public License Version 2.1
-+ * =============================================
-+ * Copyright 2005 by Sun Microsystems, Inc.
-+ * 901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License version 2.1, as published by the Free Software Foundation.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ *
-+ ************************************************************************/
-+
-+#ifndef _GSTCOMMON_HXX
-+#define _GSTCOMMON_HXX
-+
-+#include <gst/gst.h>
+diff -rup avmedia-orig/prj/build.lst avmedia/prj/build.lst
+--- avmedia-orig/prj/build.lst 2006-08-17 16:04:56.000000000 +0200
++++ avmedia/prj/build.lst 2006-08-17 16:05:01.000000000 +0200
+@@ -7,4 +7,5 @@ av avmedia\source\framework nmake - all
+ av avmedia\source\win nmake - all av_win NULL
+ av avmedia\source\java nmake - all av_java NULL
+ av avmedia\source\xine nmake - all av_xine NULL
+-av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_xine NULL
++av avmedia\source\gstreamer nmake - all av_gstreamer NULL
++av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_xine av_gstreamer NULL
+diff -rup avmedia-orig/source/inc/mediamisc.hxx avmedia/source/inc/mediamisc.hxx
+--- avmedia-orig/source/inc/mediamisc.hxx 2006-08-17 16:04:56.000000000 +0200
++++ avmedia/source/inc/mediamisc.hxx 2006-08-17 16:06:41.000000000 +0200
+@@ -37,13 +37,16 @@ class ResMgr;
+
+ #define AVMEDIA_RESID( nId ) ResId( nId, ::avmedia::GetResMgr() )
+
++#ifdef GSTREAMER
++#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
++#else
+ #ifdef WNT
+ #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
+ #else
+ #define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+ #endif
++#endif
+
+-
+ namespace avmedia
+ {
+ ResMgr* GetResMgr();
+Index: mediawindow_impl.cxx
+===================================================================
+RCS file: /cvs/graphics/avmedia/source/viewer/mediawindow_impl.cxx,v
+retrieving revision 1.7
+diff -u -u -r1.7 mediawindow_impl.cxx
+--- avmedia/source/viewer/mediawindow_impl.cxx 19 Jun 2006 13:59:09 -0000 1.7
++++ avmedia/source/viewer/mediawindow_impl.cxx 24 Aug 2006 14:17:41 -0000
+@@ -44,6 +44,11 @@
+ #include <osl/mutex.hxx>
+ #include <tools/time.hxx>
+ #include <vcl/svapp.hxx>
++#ifdef UNX
++#ifndef _SV_SYSDATA_HXX
++#include <vcl/sysdata.hxx>
++#endif
++#endif
+
+ #ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
+ #include <com/sun/star/awt/SystemPointer.hdl>
+@@ -102,7 +107,11 @@
+ // --------------------
+
+ MediaChildWindow::MediaChildWindow( Window* pParent ) :
++#ifdef GSTREAMER
++ SystemChildWindow( pParent, WB_CLIPCHILDREN )
++#else
+ JavaChildWindow( pParent, WB_CLIPCHILDREN )
++#endif
+ {
+ }
+
+@@ -119,7 +128,11 @@
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
++#ifdef GSTREAMER
++ SystemChildWindow::MouseMove( rMEvt );
++#else
+ JavaChildWindow::MouseMove( rMEvt );
++#endif
+ GetParent()->MouseMove( aTransformedEvent );
+ }
+
+@@ -130,7 +143,11 @@
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+
++#ifdef GSTREAMER
++ SystemChildWindow::MouseButtonDown( rMEvt );
++#else
+ JavaChildWindow::MouseButtonDown( rMEvt );
++#endif
+ GetParent()->MouseButtonDown( aTransformedEvent );
+ }
+
+@@ -140,8 +157,12 @@
+ {
+ const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
+ rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+-
+
-+#ifndef _OSL_MUTEX_HXX_
-+#include <osl/mutex.hxx>
++#ifdef GSTREAMER
++ SystemChildWindow::MouseButtonUp( rMEvt );
++#else
+ JavaChildWindow::MouseButtonUp( rMEvt );
+#endif
-+#ifndef _DEBUG_HXX
-+#include <tools/debug.hxx>
+ GetParent()->MouseButtonUp( aTransformedEvent );
+ }
+
+@@ -149,7 +170,11 @@
+
+ void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
+ {
++#ifdef GSTREAMER
++ SystemChildWindow::KeyInput( rKEvt );
++#else
+ JavaChildWindow::KeyInput( rKEvt );
+#endif
-+#ifndef _STREAM_HXX
-+#include <tools/stream.hxx>
+ GetParent()->KeyInput( rKEvt );
+ }
+
+@@ -157,7 +182,11 @@
+
+ void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
+ {
++#ifdef GSTREAMER
++ SystemChildWindow::KeyUp( rKEvt );
++#else
+ JavaChildWindow::KeyUp( rKEvt );
+#endif
-+#ifndef _STRING_HXX
-+#include <tools/string.hxx>
+ GetParent()->KeyUp( rKEvt );
+ }
+
+@@ -168,7 +197,11 @@
+ const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
+ rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
+
++#ifdef GSTREAMER
++ SystemChildWindow::Command( rCEvt );
++#else
+ JavaChildWindow::Command( rCEvt );
+#endif
-+#ifndef _URLOBJ_HXX
[...5404 lines suppressed...]
++ * The Contents of this file are made available subject to
++ * the terms of GNU Lesser General Public License Version 2.1.
++ *
++ *
++ * GNU Lesser General Public License Version 2.1
++ * =============================================
++ * Copyright 2005 by Sun Microsystems, Inc.
++ * 901 San Antonio Road, Palo Alto, CA 94303, USA
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License version 2.1, as published by the Free Software Foundation.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++ * MA 02111-1307 USA
++ *
++ ************************************************************************/
++
++#ifndef _WINDOW_HXX
++#define _WINDOW_HXX
++
++#include "gstcommon.hxx"
++#include <cppuhelper/interfacecontainer.h>
++
++#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_
++#include "com/sun/star/media/XPlayerWindow.hdl"
++#endif
++
++namespace avmedia { namespace gstreamer {
++
++// ---------------
++// - Window -
++// ---------------
++
++class Player;
++
++class Window : public ::cppu::WeakImplHelper2 < ::com::sun::star::media::XPlayerWindow,
++ ::com::sun::star::lang::XServiceInfo >
++{
++public:
++
++ Window( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMgr,
++ Player& rPlayer );
++ ~Window();
++
++ bool create( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments );
++ void processGraphEvent();
++ void updatePointer();
++
++ // XPlayerWindow
++ virtual void SAL_CALL update( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL setZoomLevel( ::com::sun::star::media::ZoomLevel ZoomLevel ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XWindow
++ virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL setFocus( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XComponent
++ virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
++ virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
++
++ // XServiceInfo
++ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException);
++ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
++ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException);
++
++
++private:
++
++ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMgr;
++
++ ::osl::Mutex maMutex;
++ ::cppu::OMultiTypeInterfaceContainerHelper maListeners;
++ ::com::sun::star::media::ZoomLevel meZoomLevel;
++ Player& mrPlayer;
++ int mnPointerType;
++
++ void ImplLayoutVideoWindow();
+};
+
- String STR_SVT_MIMETYPE_VIDEO_VDO
- {
- Text [ de ] = "Video-Datei" ;
++} // namespace gstreamer
++} // namespace avmedia
++
++#endif // _WINDOW_HXX
+--- /dev/null 2006-08-13 17:52:05.000000000 +0200
++++ avmedia/source/gstreamer/makefile.mk 2006-08-22 11:38:56.000000000 +0200
+@@ -0,0 +1,85 @@
++#*************************************************************************
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile$
++#
++# $Revision$
++#
++# last change: $Author$ $Date$
++#
++# The Contents of this file are made available subject to
++# the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++# GNU Lesser General Public License Version 2.1
++# =============================================
++# Copyright 2005 by Sun Microsystems, Inc.
++# 901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License version 2.1, as published by the Free Software Foundation.
++#
++# This library is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++#*************************************************************************
++
++PRJ=..$/..
++PRJNAME=avmedia
++TARGET=avmediagst
++
++# --- Settings ----------------------------------
++
++.INCLUDE : settings.mk
++
++.IF "$(ENABLE_GSTREAMER)" == "TRUE"
++
++.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
++CDEFS+= -DVERBOSE
++.ENDIF
++
++PKGCONFIG_MODULES=gstreamer-0.10, gstreamer-plugins-base-0.10
++.INCLUDE: pkg_config.mk
++PKGCONFIG_LIBS+=-lgstinterfaces-0.10
++
++# --- Files ----------------------------------
++
++.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
++
++.IF "$(GUI)" == "WNT"
++CDEFS+= -DWINNT
++.ENDIF
++
++SLOFILES= \
++ $(SLO)$/gstuno.obj \
++ $(SLO)$/gstmanager.obj \
++ $(SLO)$/gstplayer.obj \
++ $(SLO)$/gstwindow.obj
++
++
++EXCEPTIONSFILES= \
++ $(SLO)$/gstuno.obj \
++
++SHL1TARGET=$(TARGET)
++SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB)
++SHL1IMPLIB=i$(TARGET)
++SHL1LIBS=$(SLB)$/$(TARGET).lib
++SHL1DEF=$(MISC)$/$(SHL1TARGET).def
++
++DEF1NAME=$(SHL1TARGET)
++DEF1EXPORTFILE=exports.dxp
++
++.ENDIF
++
++.ENDIF
++
++.INCLUDE : target.mk
openoffice.org-2.2.0.rh232389.tango.patch:
Index: openoffice.org-2.2.0.rh232389.tango.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-2.2.0.rh232389.tango.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.2.0.rh232389.tango.patch 30 Mar 2007 14:39:51 -0000 1.4
+++ openoffice.org-2.2.0.rh232389.tango.patch 10 Oct 2007 16:11:56 -0000 1.5
@@ -1,46 +1,43 @@
diff -ru svtools.orig/inc/imgdef.hxx svtools/inc/imgdef.hxx
--- openoffice.org.orig/svtools/inc/imgdef.hxx 2007-03-16 11:34:33.000000000 +0000
+++ openoffice.org/svtools/inc/imgdef.hxx 2007-03-16 11:34:45.000000000 +0000
-@@ -46,9 +46,8 @@
+@@ -46,9 +46,7 @@
enum SfxSymbolsStyle
{
SFX_SYMBOLS_STYLE_AUTO,
- SFX_SYMBOLS_STYLE_DEFAULT,
SFX_SYMBOLS_STYLE_HICONTRAST,
- SFX_SYMBOLS_STYLE_INDUSTRIAL,
-+ SFX_SYMBOLS_STYLE_TANGO,
- SFX_SYMBOLS_STYLE_CRYSTAL
+ SFX_SYMBOLS_STYLE_CRYSTAL,
+ SFX_SYMBOLS_STYLE_TANGO
};
-
diff -ru svtools.orig/source/config/miscopt.cxx svtools/source/config/miscopt.cxx
--- openoffice.org.orig/svtools/source/config/miscopt.cxx 2007-03-16 11:34:32.000000000 +0000
+++ openoffice.org/svtools/source/config/miscopt.cxx 2007-03-16 11:35:13.000000000 +0000
-@@ -281,9 +281,8 @@
+@@ -285,9 +285,7 @@
switch ( nStyle )
{
case STYLE_SYMBOLS_AUTO: return SFX_SYMBOLS_STYLE_AUTO;
- case STYLE_SYMBOLS_DEFAULT: return SFX_SYMBOLS_STYLE_DEFAULT;
case STYLE_SYMBOLS_HICONTRAST: return SFX_SYMBOLS_STYLE_HICONTRAST;
- case STYLE_SYMBOLS_INDUSTRIAL: return SFX_SYMBOLS_STYLE_INDUSTRIAL;
-+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
case STYLE_SYMBOLS_CRYSTAL: return SFX_SYMBOLS_STYLE_CRYSTAL;
+ case STYLE_SYMBOLS_TANGO: return SFX_SYMBOLS_STYLE_TANGO;
}
-
-@@ -295,9 +294,8 @@
+@@ -300,9 +298,7 @@
switch ( nStyle )
{
case SFX_SYMBOLS_STYLE_AUTO: return STYLE_SYMBOLS_AUTO;
- case SFX_SYMBOLS_STYLE_DEFAULT: return STYLE_SYMBOLS_DEFAULT;
case SFX_SYMBOLS_STYLE_HICONTRAST: return STYLE_SYMBOLS_HICONTRAST;
- case SFX_SYMBOLS_STYLE_INDUSTRIAL: return STYLE_SYMBOLS_INDUSTRIAL;
-+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
case SFX_SYMBOLS_STYLE_CRYSTAL: return STYLE_SYMBOLS_CRYSTAL;
+ case SFX_SYMBOLS_STYLE_TANGO: return STYLE_SYMBOLS_TANGO;
}
-
diff -ru vcl.orig/inc/settings.hxx vcl/inc/settings.hxx
---- openoffice.org.orig/vcl/inc/settings.hxx 2007-03-16 11:35:31.000000000 +0000
-+++ openoffice.org/vcl/inc/settings.hxx 2007-03-16 11:36:40.000000000 +0000
-@@ -524,10 +524,9 @@
+--- openoffice.org.orig/vcl/inc/vcl/settings.hxx 2007-03-16 11:35:31.000000000 +0000
++++ openoffice.org/vcl/inc/vcl/settings.hxx 2007-03-16 11:36:40.000000000 +0000
+@@ -524,12 +524,10 @@
#define STYLE_TOOLBAR_ICONSIZE_LARGE ((ULONG)2)
#define STYLE_SYMBOLS_AUTO ((ULONG)0)
@@ -48,27 +45,29 @@
-#define STYLE_SYMBOLS_HICONTRAST ((ULONG)2)
-#define STYLE_SYMBOLS_INDUSTRIAL ((ULONG)3)
-#define STYLE_SYMBOLS_CRYSTAL ((ULONG)4)
-+#define STYLE_SYMBOLS_HICONTRAST ((ULONG)1)
-+#define STYLE_SYMBOLS_TANGO ((ULONG)2)
-+#define STYLE_SYMBOLS_CRYSTAL ((ULONG)3)
+-#define STYLE_SYMBOLS_TANGO ((ULONG)5)
+-#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)5)
++#define STYLE_SYMBOLS_HICONTRAST ((ULONG)1)
++#define STYLE_SYMBOLS_CRYSTAL ((ULONG)2)
++#define STYLE_SYMBOLS_TANGO ((ULONG)3)
++#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)3)
#define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF)
diff -ru vcl.orig/source/app/settings.cxx vcl/source/app/settings.cxx
--- openoffice.org.orig/vcl/source/app/settings.cxx 2007-03-16 11:35:31.000000000 +0000
+++ openoffice.org/vcl/source/app/settings.cxx 2007-03-16 11:37:23.000000000 +0000
-@@ -730,9 +730,8 @@
+@@ -723,9 +723,7 @@
{
switch ( nStyle )
{
- case STYLE_SYMBOLS_DEFAULT: return ::rtl::OUString::createFromAscii( "default" );
case STYLE_SYMBOLS_HICONTRAST: return ::rtl::OUString::createFromAscii( "hicontrast" );
- case STYLE_SYMBOLS_INDUSTRIAL: return ::rtl::OUString::createFromAscii( "industrial" );
-+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
case STYLE_SYMBOLS_CRYSTAL: return ::rtl::OUString::createFromAscii( "crystal" );
+ case STYLE_SYMBOLS_TANGO: return ::rtl::OUString::createFromAscii( "tango" );
}
-
-@@ -743,12 +742,10 @@
+@@ -737,12 +736,8 @@
ULONG StyleSettings::ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const
{
@@ -79,28 +78,18 @@
return STYLE_SYMBOLS_HICONTRAST;
- else if ( rName == ::rtl::OUString::createFromAscii( "industrial" ) )
- return STYLE_SYMBOLS_INDUSTRIAL;
-+ else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
-+ return STYLE_SYMBOLS_TANGO;
else if ( rName == ::rtl::OUString::createFromAscii( "crystal" ) )
return STYLE_SYMBOLS_CRYSTAL;
+ else if ( rName == ::rtl::OUString::createFromAscii( "tango" ) )
+@@ -788,7 +785,7 @@
+
+ // use a hardcoded desktop-specific fallback if no preferred style has been detected
+ static bool sbFallbackDesktopChecked = false;
+- static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_DEFAULT;
++ static ULONG snFallbackDesktopStyle = STYLE_SYMBOLS_TANGO;
-@@ -764,14 +761,14 @@
- if ( nStyle == STYLE_SYMBOLS_AUTO )
- {
- static bool sbDesktopChecked = false;
-- static ULONG snDesktopStyle = STYLE_SYMBOLS_DEFAULT;
-+ static ULONG snDesktopStyle = STYLE_SYMBOLS_TANGO;
-
- if ( !sbDesktopChecked )
- {
- const ::rtl::OUString &rDesktopEnvironment = Application::GetDesktopEnvironment();
-
- if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "gnome" ) )
-- snDesktopStyle = STYLE_SYMBOLS_INDUSTRIAL;
-+ snDesktopStyle = STYLE_SYMBOLS_TANGO;
- else if( rDesktopEnvironment.equalsIgnoreAsciiCaseAscii( "kde" ) )
- snDesktopStyle = STYLE_SYMBOLS_CRYSTAL;
-
+ if ( !sbFallbackDesktopChecked )
+ {
diff -ru vcl.orig/source/window/toolbox2.cxx vcl/source/window/toolbox2.cxx
--- openoffice.org.orig/vcl/source/window/toolbox2.cxx 2007-03-16 11:35:30.000000000 +0000
+++ openoffice.org/vcl/source/window/toolbox2.cxx 2007-03-16 11:37:59.000000000 +0000
@@ -125,53 +114,49 @@
diff -ru svx.orig/source/dialog/optgdlg.cxx svx/source/dialog/optgdlg.cxx
--- openoffice.org.orig/svx/source/dialog/optgdlg.cxx 2007-03-16 12:31:16.000000000 +0000
+++ openoffice.org/svx/source/dialog/optgdlg.cxx 2007-03-16 12:34:05.000000000 +0000
-@@ -913,10 +913,9 @@
+@@ -913,11 +913,9 @@
switch( nStyleLB_NewSelection )
{
case 0: eSet = SFX_SYMBOLS_STYLE_AUTO; break;
- case 1: eSet = SFX_SYMBOLS_STYLE_DEFAULT; break;
-+ case 1: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
- case 2: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
+- case 2: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
- case 3: eSet = SFX_SYMBOLS_STYLE_INDUSTRIAL; break;
- case 4: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
-+ case 3: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
+- case 5: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
++ case 1: eSet = SFX_SYMBOLS_STYLE_HICONTRAST; break;
++ case 2: eSet = SFX_SYMBOLS_STYLE_CRYSTAL; break;
++ case 3: eSet = SFX_SYMBOLS_STYLE_TANGO; break;
default:
DBG_ERROR( "OfaViewTabPage::FillItemSet(): This state of aIconStyleLB should not be possible!" );
}
-@@ -1083,10 +1082,9 @@
+@@ -1084,11 +1082,9 @@
{
switch ( aMiscOptions.GetCurrentSymbolsStyle() )
{
- case SFX_SYMBOLS_STYLE_DEFAULT: nStyleLB_InitialSelection = 1; break;
-+ case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 1; break;
- case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 2; break;
+- case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 2; break;
- case SFX_SYMBOLS_STYLE_INDUSTRIAL: nStyleLB_InitialSelection = 3; break;
- case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 4; break;
-+ case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 3; break;
+- case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 5; break;
++ case SFX_SYMBOLS_STYLE_HICONTRAST: nStyleLB_InitialSelection = 1; break;
++ case SFX_SYMBOLS_STYLE_CRYSTAL: nStyleLB_InitialSelection = 2; break;
++ case SFX_SYMBOLS_STYLE_TANGO: nStyleLB_InitialSelection = 3; break;
default: nStyleLB_InitialSelection = 0; break;
}
}
diff -ru svx.orig/source/dialog/optgdlg.src svx/source/dialog/optgdlg.src
--- openoffice.org.orig/svx/source/dialog/optgdlg.src 2007-03-16 12:31:16.000000000 +0000
+++ openoffice.org/svx/source/dialog/optgdlg.src 2007-03-16 12:33:11.000000000 +0000
-@@ -269,17 +269,15 @@
- StringList [ de ] =
- {
- < "Automatisch" ; > ;
- < "Standard" ; > ;
- < "HiContrast" ; > ;
-- < "Industrial" ; > ;
- < "Crystal" ; > ;
- };
+@@ -238,9 +238,7 @@
StringList [ en-US ] =
{
< "Automatic" ; > ;
- < "Default" ; > ;
+- < "Default" ; > ;
< "HiContrast" ; > ;
- < "Industrial" ; > ;
< "Crystal" ; > ;
+ < "Tango" ; > ;
};
- };
Index: inc/settings.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/settings.mk,v
@@ -179,28 +164,12 @@
diff -u -r1.205.32.2 settings.mk
--- openoffice.org.orig/solenv/inc/settings.mk 16 Jan 2007 08:33:58 -0000 1.205.32.2
+++ openoffice.org/solenv/inc/settings.mk 30 Mar 2007 14:36:30 -0000
-@@ -995,7 +995,7 @@
+@@ -946,7 +946,7 @@
.ENDIF
# additional image sets
--CUSTOM_IMAGE_SETS=hicontrast industrial crystal
-+CUSTOM_IMAGE_SETS=hicontrast tango crystal
+-CUSTOM_IMAGE_SETS=hicontrast industrial crystal tango
++CUSTOM_IMAGE_SETS=hicontrast crystal tango
# settings for mozilla idl compiler
XPIDL=xpidl
-Index: jaminc/settings.jam
-===================================================================
-RCS file: /cvs/tools/solenv/jaminc/settings.jam,v
-retrieving revision 1.3
-diff -u -r1.3 settings.jam
---- openoffice.org.orig/solenv/jaminc/settings.jam 5 Oct 2006 16:22:36 -0000 1.3
-+++ openoffice.org/solenv/jaminc/settings.jam 30 Mar 2007 14:36:31 -0000
-@@ -1070,7 +1070,7 @@
- # additional image sets
- CUSTOM_IMAGE_SETS =
- hicontrast
-- industrial
-+ tango
- crystal
- ;
- # settings for mozilla idl compiler
Index: openoffice.org-simple-crash_report.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org-simple-crash_report.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-simple-crash_report.sh 26 Jul 2007 20:16:50 -0000 1.4
+++ openoffice.org-simple-crash_report.sh 10 Oct 2007 16:11:56 -0000 1.5
@@ -5,20 +5,16 @@
filename=`mktemp -t ooocrash.XXXXXXXXXX` || exit 1
echo "(I) x.org loaded video driver of..." > $filename
-xlog=`(xset -q || echo " Log file: /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-`
-grep "drivers" $xlog >> $filename
-grep "pixmap format" $xlog >> $filename
+grep drivers `(xset -q || echo " Log file: /var/log/Xorg.0.log") | grep "Log file:" | cut -c 17-` >> $filename
echo "(III) Desktop is: `if [ "$GNOME_DESKTOP_SESSION_ID" != "" ] ; then echo GNOME ; else echo not GNOME; fi`" >> $filename
echo "(IV) libgcj version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH} ' libgcj` >> $filename
echo "(V) kernel is:" `uname -s -r -v -m -p -i` >> $filename
echo "(VI) OpenOffice.org core rpm version is:" `rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}-%{ARCH}' openoffice.org-core` >> $filename
-echo "(VII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
+echo "(VII)`xdpyinfo | grep "depth of root window:"`" >> $filename
+echo "(VIII) accessibility is:" `gconftool-2 -g "/desktop/gnome/interface/accessibility"` >> $filename
if [ -e /etc/fedora-release ]; then
-echo "(VIII) fedora release is:" `cat /etc/fedora-release` >> $filename
+echo "(VIV) fedora release is:" `cat /etc/fedora-release` >> $filename
fi
-echo "...start free space details ..." >> $filename
-df -k /home /tmp >> $filename
-echo "...end free space details ..." >> $filename
if [ -e /usr/sbin/sestatus ]; then
echo "...start sestatus details ..." >> $filename
/usr/sbin/sestatus >> $filename
@@ -34,7 +30,7 @@
echo "...end stackreport details ..." >> $filename
echo "...start sample ldd details ..." >> $filename
-ldd /usr/lib*/openoffice.org/program/libvclplug_gtk*.so >> $filename
+ldd /usr/lib*/openoffice.org2.0/program/libreg.so.3 >> $filename
echo "...end sample ldd details ..." >> $filename
echo
openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch:
Index: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 28 Feb 2007 11:21:11 -0000 1.12
+++ openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch 10 Oct 2007 16:11:56 -0000 1.13
@@ -642,3 +642,195 @@
-
+#pragma GCC visibility pop
#endif
+Index: inc/cppuhelper/implbase1.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase1.hxx,v
+retrieving revision 1.16
+diff -u -r1.16 implbase1.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase1.hxx 13 Dec 2006 14:51:42 -0000 1.16
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase1.hxx 6 Oct 2007 16:41:02 -0000
+@@ -60,7 +60,7 @@
+ /** @internal */
+ template< typename Ifc1, typename Impl > struct ImplClassData1
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data1 s_cd =
+ {
+Index: inc/cppuhelper/implbase10.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase10.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase10.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase10.hxx 5 Oct 2005 14:24:09 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase10.hxx 6 Oct 2007 16:41:02 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Impl >
+ struct ImplClassData10
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data10 s_cd =
+ {
+Index: inc/cppuhelper/implbase11.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase11.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase11.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase11.hxx 5 Oct 2005 14:24:35 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase11.hxx 6 Oct 2007 16:41:03 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Impl >
+ struct ImplClassData11
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data11 s_cd =
+ {
+Index: inc/cppuhelper/implbase12.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase12.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase12.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase12.hxx 5 Oct 2005 14:25:08 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase12.hxx 6 Oct 2007 16:41:03 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Ifc10, typename Ifc11, typename Ifc12, typename Impl >
+ struct ImplClassData12
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data12 s_cd =
+ {
+Index: inc/cppuhelper/implbase2.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase2.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase2.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase2.hxx 5 Oct 2005 14:25:28 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase2.hxx 6 Oct 2007 16:41:03 -0000
+@@ -57,7 +57,7 @@
+ /** @internal */
+ template< typename Ifc1, typename Ifc2, typename Impl > struct ImplClassData2
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data2 s_cd =
+ {
+Index: inc/cppuhelper/implbase3.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase3.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase3.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase3.hxx 5 Oct 2005 14:25:47 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase3.hxx 6 Oct 2007 16:41:04 -0000
+@@ -57,7 +57,7 @@
+ /** @internal */
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Impl > struct ImplClassData3
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data3 s_cd =
+ {
+Index: inc/cppuhelper/implbase4.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase4.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase4.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase4.hxx 5 Oct 2005 14:26:03 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase4.hxx 6 Oct 2007 16:41:04 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Impl >
+ struct ImplClassData4
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data4 s_cd =
+ {
+Index: inc/cppuhelper/implbase5.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase5.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase5.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase5.hxx 5 Oct 2005 14:26:20 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase5.hxx 6 Oct 2007 16:41:05 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Impl >
+ struct ImplClassData5
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data5 s_cd =
+ {
+Index: inc/cppuhelper/implbase6.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase6.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase6.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase6.hxx 5 Oct 2005 14:26:37 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase6.hxx 6 Oct 2007 16:41:05 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Impl >
+ struct ImplClassData6
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data6 s_cd =
+ {
+Index: inc/cppuhelper/implbase7.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase7.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase7.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase7.hxx 5 Oct 2005 14:26:54 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase7.hxx 6 Oct 2007 16:41:05 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Impl >
+ struct ImplClassData7
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data7 s_cd =
+ {
+Index: inc/cppuhelper/implbase8.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase8.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase8.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase8.hxx 5 Oct 2005 14:27:12 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase8.hxx 6 Oct 2007 16:41:06 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl >
+ struct ImplClassData8
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data8 s_cd =
+ {
+Index: inc/cppuhelper/implbase9.hxx
+===================================================================
+RCS file: /cvs/udk/cppuhelper/inc/cppuhelper/implbase9.hxx,v
+retrieving revision 1.15
+diff -u -r1.15 implbase9.hxx
+--- openoffice.org.orig/cppuhelper/inc/cppuhelper/implbase9.hxx 5 Oct 2005 14:27:40 -0000 1.15
++++ openoffice.org/cppuhelper/inc/cppuhelper/implbase9.hxx 6 Oct 2007 16:41:06 -0000
+@@ -58,7 +58,7 @@
+ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Ifc9, typename Impl >
+ struct ImplClassData9
+ {
+- class_data* operator ()()
++ CPPU_GCC_DLLPUBLIC_EXPORT class_data* operator ()()
+ {
+ static class_data9 s_cd =
+ {
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/openoffice.org.spec,v
retrieving revision 1.1191
retrieving revision 1.1192
diff -u -r1.1191 -r1.1192
--- openoffice.org.spec 2 Oct 2007 12:44:56 -0000 1.1191
+++ openoffice.org.spec 10 Oct 2007 16:11:56 -0000 1.1192
@@ -1,6 +1,6 @@
-%define oootag OOF680
-%define ooomilestone 18
-%define rh_rpm_release 2
+%define oootag OOG680
+%define ooomilestone 6
+%define rh_rpm_release 0
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -8,7 +8,15 @@
%define gtkprintui 1
# undef to refrain from combining startup libs into a single libsoffice
%define linkopt 0
+# whether to use stlport or gcc's stl, we're basically locked to stlport
+# for i386 to enable third party built against "vanilla OOo" uno components
+# and add-ons to work with our OOo. We assume there aren't any such for the
+# other archs
+%ifarch %{ix86}
%define stlport_abi_lockin 1
+%else
+%define stlport_abi_lockin 0
+%endif
%if %{stlport_abi_lockin}
%define stlflags --with-stlport4
@@ -16,6 +24,9 @@
%define stlflags --without-stlport4
%endif
+%define jdkflags --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj
+%define jdk_ver 1.5.0
+
%if %{langpacks}
%define langpack_langs af ar bg bn ca cs cy da de el en-US es et eu fi fr ga gl gu-IN pa-IN he hi-IN hu hr it ja ko lt ms nb nl nn nr pl pt pt-BR ru sk sl sr-CS ss st sv ta-IN th tr ve xh zh-CN zh-TW zu ns tn ts as-IN mr-IN ml-IN or-IN te-IN ur-IN kn-IN
%else
@@ -24,13 +35,12 @@
%define ooo_base_name %{oootag}_m%{ooomilestone}
-ExcludeArch: ppc64
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 2.2.1
+Version: 2.3.0
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
-License: LGPL
+License: LGPLv2 and LGPLv2+ and MPLv1.1 and BSD
Group: Applications/Productivity
URL: http://www.openoffice.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,108 +52,86 @@
Source5: http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
Source6: http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
BuildRequires: tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
-BuildRequires: perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires: gdb, libgcj-devel, java-devel, zlib-devel, xerces-j2, prelink
+BuildRequires: perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, prelink
+BuildRequires: gdb, java-devel >= %{jdk_ver}, zlib-devel, hsqldb, vigra-devel
BuildRequires: freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
BuildRequires: curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
-BuildRequires: libxml2-devel, neon-devel, libidn-devel, pam-devel, hsqldb
-BuildRequires: libjpeg-devel, sane-backends-devel, libICE-devel, hunspell-devel
+BuildRequires: libxml2-devel, libidn-devel, pam-devel, hunspell-devel
+BuildRequires: libjpeg-devel, sane-backends-devel, libICE-devel,
BuildRequires: evolution-data-server-devel, libxslt-devel, desktop-file-utils
-BuildRequires: libxslt-devel, db4-devel, firefox-devel, libwpd-devel
+BuildRequires: libxslt-devel, db4-devel, firefox-devel, libwpd-devel, xerces-j2
BuildRequires: gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires: perl-Archive-Zip
+BuildRequires: perl-Archive-Zip, nss-devel
Patch0: openoffice.org-simple-crash_report.sh
Patch1: AutoSaveRecovery.xcu
Patch2: RegisterAndLicence.xcu
Patch3: AutoSaveCommon.xcu
-Patch4: openoffice.org.langpack-cjk.template
-Patch5: openoffice.org.langpack-help.template
-Patch6: openoffice.org.langpack-common.template
-Patch7: openoffice.org.langpack-lingu.template
-Patch8: openoffice.org.langpack-ctl.template
-Patch9: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
-Patch10: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
-Patch11: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
-Patch12: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
-Patch13: openoffice.org-1.9.97.rh156067.noversionedsysui.patch
-Patch14: openoffice.org-2.0.2.rhXXXXXX.redhatcolours.extras.patch
+Patch5: openoffice.org.langpack-cjk.template
+Patch6: openoffice.org.langpack-help.template
+Patch7: openoffice.org.langpack-common.template
+Patch8: openoffice.org.langpack-lingu.template
+Patch9: openoffice.org.langpack-ctl.template
+Patch10: openoffice.org-1.9.88.rh133741.alwaysgtk.desktop.patch
+Patch11: openoffice.org-1.9.114.rh161886.rpath.desktop.patch
+Patch12: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
%if %{gtkprintui}
-Patch15: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
+Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
%endif
-Patch16: openoffice.org-1.9.121.rh156677.cripplemenus.sysui.patch
-Patch17: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
-Patch18: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
-Patch19: openoffice.org-1.9.129.ooo54603.fontconfig.patch
-Patch20: openoffice.org-1.9.115.ooo51931.fixxmlsec.patch
-Patch21: openoffice.org-1.9.130.oooXXXXX.newsystemdb.xmlhelp.patch
-Patch22: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
-Patch23: workspace.libxslt02.patch
-Patch24: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
-Patch25: openoffice.org-2.0.2.rh188467.printingdefaults.patch
-Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch27: workspace.fpicker6.patch
-Patch28: workspace.ppc64one.patch
-Patch29: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch30: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch31: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch32: ooobuild.VBAObjects.patch
-Patch33: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
-Patch34: openoffice.org-2.0.4.oooXXXXX.vcl.x86_64.impressatk.patch
-Patch35: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
-Patch36: pseudoworkspace.valgrind1.patch
-Patch37: workspace.thbpp6.patch
-Patch38: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch39: openoffice.org-2.0.4.rh217065.syncbackspace.patch
-Patch40: openoffice.org-2.0.4.ooo70155.fasterhelplinking.patch
-Patch41: openoffice.org.2.0.4.oooXXXXX.i18npool.extendgrapheme.patch
-Patch42: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch43: openoffice.org-2.1.0.ooo61812.svx.a11ycrash.patch
-Patch44: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch45: openoffice.org-2.1.0.ooo72014.officecfg.malayammenu.patch
-Patch46: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
-Patch47: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
-Patch48: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
-Patch49: openoffice.org-2.1.0.gccXXXXX.basegfx.crash.patch
-Patch50: workspace.tl37.patch
-Patch51: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
-Patch52: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
-Patch53: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
-Patch54: openoffice.org-2.2.0.ooo73866.javaunohelper.parallel.patch
-Patch55: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
-Patch56: openoffice.org-2.2.0.ooo73974.bridges.doublereturn.patch
-Patch57: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch58: openoffice.org-2.2.0.ooo74451.sw.typemismatch.patch
-Patch59: openoffice.org-2.2.0.ooo74401.basctl.boost.patch
-Patch60: workspace.configrefactor01.patch
-Patch61: workspace.sixtyfour11.patch
-Patch62: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch63: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch64: openoffice.org-2.2.0.ooo75167.framework.workspacerestore.patch
-Patch65: openoffice.org-2.2.0.ooo75190.shell.newrecentlyused.patch
-Patch66: openoffice.org-2.2.0.ooo75329.xdguserdir.patch
-Patch67: openoffice.org-2.2.0.rh232389.tango.patch
-Patch68: openoffice.org-2.2.0.ooo53397.linkopt.patch
-Patch69: openoffice.org-2.2.0.ooo75790.sc.pa-IN.translate.patch
-Patch70: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch71: openoffice.org-2.2.0.oooXXXXX.shell.reduceglobals.patch
-Patch72: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
-Patch73: workspace.cmcfixes34.patch
-Patch74: openoffice.org-2.2.0.ooo77470.docexport.liberation.to.ms.patch
-Patch75: openoffice.org-2.2.1.ooo73728.desktop.mapped_type.patch
-Patch76: openoffice.org-2.3.0.ooo77885.stoc.bootstrap.patch
-Patch77: openoffice.org-2.3.0.ooo77885.stoc.nonbootstrap.patch
-Patch78: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch79: openoffice.org-2.2.1.ooo78198.sixtyfour.svx.patch
-Patch80: openoffice.org-2.2.1.ooo78383.vcl.printxerror.patch
-Patch81: openoffice.org-2.2.1.ooo78392.sixtyfour.tools.patch
-Patch82: openoffice.org-2.2.1.oooXXXXX.xmloff.outofrange.patch
-Patch83: workspace.glyphadv.patch
-Patch84: openoffice.org-2.2.1.ooo78921.sw.embedded.patch
-Patch85: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
-Patch86: openoffice.org.ooo79953.dbusinhibitscreensaver.patch
-Patch87: openoffice.org-2.2.1.ooo79878.vcl.honourwidthtype.patch
-Patch88: workspace.tipatch8.patch
+Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
+Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
+Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
+Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
+Patch18: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
+Patch19: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
+Patch20: openoffice.org-2.0.2.rh188467.printingdefaults.patch
+Patch21: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch22: workspace.fpicker6.patch
+Patch23: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch24: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch25: openoffice.org-2.0.4.ooo69051.vcl.singlekeypress.patch
+Patch26: pseudoworkspace.valgrind1.patch
+Patch27: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
+Patch28: openoffice.org-2.0.4.rh217065.syncbackspace.patch
+Patch29: openoffice.org.2.0.4.ooo80412.i18npool.extendgrapheme.patch
+Patch30: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch31: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch32: openoffice.org-2.1.0.ooo78148.lingucomponent.systemhunspell.patch
+Patch33: openoffice.org-2.1.0.rh217269.officecfg.nosequencecheck.patch
+Patch34: openoffice.org-2.1.0.ooo72129.vcl.fontglyphindex.patch
+Patch35: workspace.tl37.patch
+Patch36: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
+Patch37: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+Patch38: openoffice.org-2.2.0.ooo73863.vcl.imcommit.patch
+Patch39: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch40: workspace.configrefactor01.patch
+Patch41: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch42: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch43: openoffice.org-2.2.0.rh232389.tango.patch
+Patch44: openoffice.org-2.2.0.ooo53397.linkopt.patch
+Patch45: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch46: openoffice.org-2.2.0.ooo76424.nonatnum.bn_IN.18npool.patch
+Patch47: openoffice.org-2.3.0.ooo77885.stoc.stocmerge.patch
+Patch48: openoffice.org-2.0.3.ooo80816.selinux.bridges.patch
+Patch49: openoffice.org-2.2.1.ooo78971.xmloff.outofrange.patch
+Patch50: openoffice.org-2.2.1.oooXXXXX.sw.titlepagedialog.patch
+Patch51: openoffice.org-2.2.1.ooo79481.sw.rowordcount.patch
+Patch52: openoffice.org-2.2.1.ooo80424.vcl.honourwidthtype.patch
+Patch53: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.patch
+Patch54: openoffice.org-2.3.0.ooo80257.sd.textonlystyle.tar.gz
+Patch55: workspace.unifysound01.patch
+Patch56: workspace.npower7.patch
+Patch57: openoffice.org-2.3.0.ooo80721.reportdesign.stlportism.patch
+Patch58: openoffice.org-2.3.0.ooo80735.cppu.map.patch
+Patch59: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch60: openoffice.org-2.3.0.ooo80967.ucb.neon27.patch
+Patch61: openoffice.org-2.3.0.ooo81112.reportdesign.parallel.patch
+Patch62: openoffice.org-2.3.0.ooo74751.bean.mawt.patch
+Patch63: openoffice.org-2.3.0.ooo77672.boost.use.end_p.patch
+Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
+Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
+Patch66: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
+Patch67: openoffice.org-2.3.0.ooo82458.libtextcat.rpath.patch
%define instdir %{_libdir}/openoffice.org
@@ -164,17 +152,10 @@
%package core
Summary: Core modules for %{name}
Group: Applications/Productivity
-Requires: urw-fonts
-Requires: dejavu-lgc-fonts
Requires: hunspell-en
-%ifarch %{ppc}
-# Ensure we have 32-bit theme libs in 64-bit multilib environments.
-# We need at least 32-bit redhat-artwork and 32-bit gtk2-engines, but
-# rpm doesn't "do the right thing" if only the packages are Required.
-Requires: libbluecurve.so, libcrux-engine.so
-%endif
-Requires: libgcj >= 4.0.0, bsh, java = 1.5.0
-Requires: hsqldb >= 1.80.1, xalan-j2, xerces-j2
+Requires: liberation-fonts
+Requires: bsh, java >= 1.5.0
+Requires: hsqldb >= 1.8.0.8, xalan-j2, xerces-j2
PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
Obsoletes: openoffice.org
Obsoletes: openoffice.org-libs
@@ -323,11 +304,20 @@
%description sdk-doc
This provides the documentation for programming using the %{name} APIs and examples of creating extensions (UNO components) for %{name}.
+%package headless
+Summary: Headless plugin for %{name}
+Group: Development/Libraries
+Requires: %{name}-core = %{epoch}:%{version}-%{release}
+
+%description headless
+A plugin for %{name} that enables it to function without an X server.
+It implements the -headless command line option and allows %{name} to be
+used as a backend server for e.g. document conversion.
+
%package langpack-af_ZA
Summary: Afrikaans language pack for %{name}
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: hunspell-af
Obsoletes: openoffice.org-i18n
Obsoletes: openoffice.org-langpack-af
Obsoletes: openoffice.org2-langpack-af_ZA
@@ -998,94 +988,80 @@
%prep
%setup -q -n %{ooo_base_name}
-%patch9 -p1 -b .rh133741.alwaysgtk.desktop.patch
-%patch10 -p1 -b .rh161886.rpath.desktop.patch
-%patch11 -p1 -b .rh151357.setlangtolocale.patch
-%patch12 -p1 -b .rh151356.usetwodotzeropath.patch
-%patch13 -p1 -b .rh156067.noversionedsysui.patch
-%patch14 -p1
+cp -p %{SOURCE1} extras/source/database/evolocal.odb
+(sed -e '/Sun/d' extras/source/palettes/standard.soc | head -n -1 && \
+ echo -e ' <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
+ <draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
+ <draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
+ <draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
+ <draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
+ tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
+mv -f redhat.soc extras/source/palettes/standard.soc
+cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
+%patch10 -p1 -b .rh133741.alwaysgtk.desktop.patch
+%patch11 -p1 -b .rh161886.rpath.desktop.patch
+%patch12 -p1 -b .rh151357.setlangtolocale.patch
%if %{gtkprintui}
-%patch15 -p1 -b .rh127576.gtkunixprintdialog.patch
+%patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
%endif
-%patch16 -p1 -b .rh156677.cripplemenus.sysui.patch
-%patch17 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
-%patch18 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
-%patch19 -p1 -b .ooo54603.fontconfig.patch
-%patch20 -p1 -b .ooo51931.fixxmlsec.patch
-%patch21 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-%patch22 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
-%patch23 -p1 -b .workspace.libxslt02.patch
-%patch24 -p1 -b .ooo58606.sw.pre-edit.patch
-%patch25 -p1
-%patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch27 -p1 -b .workspace.fpicker6.patch
-%patch28 -p1 -b .workspace.ppc64one.patch
-%patch29 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch30 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch31 -p1 -b .rh187919.gtkunderkde.patch
-%patch32 -p0 -b .ooobuild.VBAObjects.patch
-%patch33 -p1 -b .ooo68048.vcl.imsurroundtext.patch
-%patch34 -p1 -b .oooXXXXX.vcl.x86_64.impressatk.patch
-%patch35 -p1 -b .ooo69051.vcl.singlekeypress.patch
-%patch36 -p1 -b .pseudoworkspace.valgrind1.patch
-%patch37 -p1 -b .workspace.thbpp6.patch
-%patch38 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch39 -p1 -b .rh217065.syncbackspace.patch
-%patch40 -p1 -b .ooo70155.fasterhelplinking.patch
-%patch41 -p1 -b .oooXXXXX.i18npool.extendgrapheme.patch
-%patch42 -p1 -b .ooo65491.psprint.enablenups.patch
-%patch43 -p1 -b .ooo61812.svx.a11ycrash.patch
-cat %{PATCH44} >> svtools/source/dialogs/localize.sdf
-%patch45 -p1 -b .ooo72014.officecfg.malayammenu.patch
-%patch46 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
-%patch47 -p1 -b .rh217269.officecfg.nosequencecheck.patch
-%patch48 -p1 -b .ooo72129.vcl.fontglyphindex.patch
-%patch49 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch50 -p1 -b .tl37.patch
-%patch51 -p1 -b .ooo73201.sw.a11yloadcrash.patch
-%patch52 -p1 -b .ooo73481.svx.longnotint32.patch
-%patch53 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
-%patch54 -p1 -b .ooo73866.javaunohelper.parallel.patch
-%patch55 -p1 -b .ooo73863.vcl.imcommit.patch
-%patch56 -p1 -b .ooo73974.bridges.doublereturn.patch
-%patch57 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch58 -p1 -b .ooo74451.sw.typemismatch.patch
-%patch59 -p1 -b .ooo74401.basctl.boost.patch
-%patch60 -p1 -b .workspace.configrefactor01.patch
-%patch61 -p1 -b .workspace.sixtyfour11.patch
-%patch62 -p1 -b .ooo68717.gstreamer.video.patch
-%patch63 -p1 -b .ooo63159.sal.dtype.patch
-%patch64 -p1 -b .ooo75167.framework.workspacerestore.patch
-%patch65 -p1 -b .ooo75190.shell.newrecentlyused.patch
-%patch66 -p1 -b .ooo75329.xdguserdir.patch
-%patch67 -p1 -b .rh232389.tango.patch
+%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
+%patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
+%patch16 -p1 -b .ooo54603.fontconfig.patch
+%patch17 -p1 -b .ooo69368.fixxmlsec.patch
+%patch18 -p1 -b .ooo53397.prelinkoptimize.desktop.patch
+%patch19 -p1 -b .ooo58606.sw.pre-edit.patch
+%patch20 -p1
+%patch21 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch22 -p1 -b .workspace.fpicker6.patch
+%patch23 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch24 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch25 -p1 -b .ooo69051.vcl.singlekeypress.patch
+%patch26 -p1 -b .pseudoworkspace.valgrind1.patch
+%patch27 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
+%patch28 -p1 -b .rh217065.syncbackspace.patch
+%patch29 -p1 -b .ooo80412.i18npool.extendgrapheme.patch
+%patch30 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH31} >> svtools/source/dialogs/localize.sdf
+%patch32 -p1 -b .ooo78148.lingucomponent.systemhunspell.patch
+%patch33 -p1 -b .rh217269.officecfg.nosequencecheck.patch
+%patch34 -p1 -b .ooo72129.vcl.fontglyphindex.patch
+%patch35 -p1 -b .tl37.patch
+%patch36 -p1 -b .ooo73201.sw.a11yloadcrash.patch
+%patch37 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
+%patch38 -p1 -b .ooo73863.vcl.imcommit.patch
+%patch39 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch40 -p0 -b .workspace.configrefactor01.patch
+%patch41 -p0 -b .ooo68717.gstreamer.video.patch
+%patch42 -p1 -b .ooo63159.sal.dtype.patch
+%patch43 -p1 -b .rh232389.tango.patch
%if %{linkopt}
-%patch68 -p1 -b .ooo53397.linkopt.patch
+%patch44 -p1 -b .ooo53397.linkopt.patch
%endif
-%patch69 -p1 -b .ooo75790.sc.pa-IN.translate.patch
-%patch70 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch71 -p1 -b .oooXXXXX.shell.reduceglobals.patch
-%patch72 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
-%patch73 -p1 -b .workspace.cmcfixes34.patch
-%patch74 -p1 -b .ooo77470.docexport.liberation.to.ms.patch
-%patch75 -p1 -b .ooo73728.desktop.mapped_type.patch
+%patch45 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch46 -p1 -b .ooo76424.nonatnum.bn_IN.18npool.patch
%if %{linkopt}
-%patch76 -p0 -b .ooo77885.stoc.bootstrap.patch
-%patch77 -p0 -b .ooo77885.stoc.nonbootstrap.patch
+%patch47 -p0 -b .ooo77885.stoc.stocmerge.patch
%endif
-%patch78 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch79 -p1 -b .ooo78198.sixtyfour.svx.patch
-%patch80 -p1 -b .ooo78383.vcl.printxerror.patch
-%patch81 -p1 -b .ooo78392.sixtyfour.tools.patch
-%patch82 -p1 -b .oooXXXXX.xmloff.outofrange.patch
-%patch83 -p1 -b .workspace.glyphadv.patch
-%patch84 -p1 -b .ooo78921.sw.embedded.patch
-%patch85 -p1 -b .ooo79481.sw.rowordcount.patch
-%patch86 -p1 -b .ooo79953.dbusinhibitscreensaver.patch
-%patch87 -p1 -b .ooo79878.vcl.honourwidthtype.patch
-%patch88 -p1 -b .workspace.tipatch8.patch
-
-cp %{SOURCE1} extras/source/database/evolocal.odb
+%patch48 -p1 -b .ooo80816.selinux.bridges.patch
+%patch49 -p1 -b .ooo78971.xmloff.outofrange.patch
+%patch50 -p1 -b .oooXXXXX.sw.titlepagedialog.patch
+%patch51 -p1 -b .ooo79481.sw.rowordcount.patch
+%patch52 -p1 -b .ooo80424.vcl.honourwidthtype.patch
+%patch53 -p1 -b .ooo80257.sd.textonlystyle.patch
+tar xzf %{PATCH54}
+%patch55 -p1 -b .workspace.unifysound01.patch
+%patch56 -p1 -b .workspace.npower7.patch
+%patch57 -p1 -b .ooo80721.reportdesign.stlportism.patch
+%patch58 -p1 -b .ooo80735.cppu.map.patch
+%patch59 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch60 -p1 -b .ooo80967.ucb.neon27.patch
+%patch61 -p1 -b .ooo81112.reportdesign.parallel.patch
+%patch62 -p1 -b .ooo74751.bean.mawt.patch
+%patch63 -p1 -b .ooo77672.boost.use.end_p.patch
+%patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
+%patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
+%patch66 -p1 -b .ooo81936.sc.maketypesagree.patch
+%patch67 -p1 -b .ooo82458.libtextcat.rpath.patch
%if %{linkopt}
chmod a+x solenv/bin/mklinkscript.pl
@@ -1095,14 +1071,15 @@
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
#don't build localized helps which are poorly translated
POORHELPS=`grep "Working With %PRODUCTNAME" helpcontent2/source/text/swriter/localize.sdf | cut -f 10 | xargs`
-cp -p %{SOURCE6} external/unowinreg/unowinreg.dll
cd config_office
autoconf
export PATH=$PATH:/usr/sbin
-%configure --with-build-version=%{release} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-jdk-home=/usr/lib/jvm/java-1.5.0-gcj --enable-gcjaot --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-xsltproc --with-system-libs --with-system-python --with-system-mozilla --with-firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --with-system-hunspell --without-system-mspack --without-system-xt --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --with-poor-help-localizations="$POORHELPS"
+%configure --with-build-version=%{name}-%{version}-%{release} --with-unix-wrapper=%{name} --disable-ldap --disable-crashdump --disable-epm --disable-qadevooo --disable-fontooo --disable-mathmldtd --disable-pasf --disable-Xaw --with-ant-home=/usr/share/ant %{jdkflags} --enable-gstreamer --enable-symbols --enable-lockdown --enable-evolution2 --enable-cairo --enable-vba --enable-dbus --with-system-libs --with-system-vigra --with-system-hunspell --with-system-python --with-system-mozilla=firefox --with-system-boost --with-system-libwpd --with-system-icu --with-system-odbc-headers --with-system-sane-header --with-system-xrender-headers --with-system-libxslt --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan --without-system-mspack --without-system-xt --without-system-neon --without-fonts --without-nas --without-gpc --without-agg --without-ppds --without-afms %{stlflags} --with-lang="%{langpack_langs}" --!
with-poor-help-localizations="$POORHELPS"
cd ..
./bootstrap
source Linux*Env.Set.sh
+#unneccessary to build for both hash types
+unset HAVE_LD_HASH_STYLE
#faster build
export nodep=true
export NO_HIDS=true
@@ -1113,24 +1090,37 @@
#use the RPM_OPT_FLAGS but remove the OOo overridden ones
for i in $RPM_OPT_FLAGS; do
case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions|-fasynchronous-unwind-tables) continue;;
+ -O?|-pipe|-Wall|-g|-fexceptions) continue;;
esac
ARCH_FLAGS="$ARCH_FLAGS $i"
done
-export ARCH_FLAGS="$ARCH_FLAGS -D_FILE_OFFSET_BITS=64 -finline-limit=64"
-#add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
-export CXX="$CXX -fno-threadsafe-statics"
+export ARCH_FLAGS
+
+##very not happy with gcc at the moment wrt launching the bibliography,
+##let's go conservative for a bit
+##something odd with <= limit of 125 in framework/source/loadenv/loadenv.cxx and
+##the frame from tools->bibliography not closable wrt the mutex in
+##LoadEnvListener so use >= 128, but want 64
+#export ARCH_FLAGS="$ARCH_FLAGS -finline-limit=128"
+##add -fno-threadsafe-statics (our statics are already double-locked) to C++ only
+#export CXX="$CXX -fno-threadsafe-statics"
+
#convert _smp_mflags to dmake equivalent
SMP_MFLAGS=%{?_smp_mflags}
SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
if [ "$SMP_MFLAGS" == "-P0" ]; then SMP_MFLAGS=-P2; fi
#just in case you have a >16 proc box
export MAXPROCESSLIMIT=65535
-
+#get core dumps
+ulimit -c unlimited
#build translation tools and apply extra translations, so
#this can be removed when these translations are upstreamed
cd transex3/prj
-build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s
+if ! build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s; then
+ echo bt > gdbcmds
+ find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \;
+ build --dlv_switch -link --all
+fi
deliver -link
localize -m -x -l bn -f %{SOURCE5}
cd ../..
@@ -1138,7 +1128,6 @@
#build OOo, on failure make a stab at debugging the crash if any, and
#rebuild un-parallel
cd instsetoo_native/util
-ulimit -c unlimited
if ! build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s; then
echo bt > gdbcmds
find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \;
@@ -1177,6 +1166,10 @@
%install
source Linux*Env.Set.sh
+#figure out the icon version
+export LONGICON`grep "PRODUCTVERSION[ ]*=[ ]*" sysui/desktop/productversion.mk | sed -e "s/ //g"`
+export ICONPRODUCTVERSION=${LONGICONPRODUCTVERSION/./}
+unset HAVE_LD_HASH_STYLE
#don't duplicate english helpcontent about the place
unset DEFAULT_TO_ENGLISH_FOR_PACKING
cd instsetoo_native/util
@@ -1196,6 +1189,7 @@
cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
+chmod -R +w $RPM_BUILD_ROOT/%{instdir}
%if %{langpacks}
dmake ooolanguagepack
%endif
@@ -1226,9 +1220,12 @@
#add our custom configuration options
#default GTK fpicker
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH1}
-#default autosave settings
+#don't prompt user to agree to license
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH2}
+#default autosave settings
$RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH3}
+#rhbz#151356 set a consistent bootstrap value, unfortunately upstream finally picked a different one
+sed -i -e s/org2/org2.0/ $RPM_BUILD_ROOT/%{instdir}/program/bootstraprc
#add the debugging libsalalloc_malloc.so.3 library
cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
@@ -1306,24 +1303,24 @@
i=0
while [ $i -lt ${#langpackdetails[@]} ]; do
lang=${langpackdetails[$i]}
- sed -e "s/LANG/$lang/g" %{PATCH6} > $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH7} > $lang.filelist
i=$[i+1]
help=${langpackdetails[$i]}
if [ "$help" = "help" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH5} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH6} >> $lang.filelist
fi
i=$[i+1]
lingu=${langpackdetails[$i]}
if [ ! "$lingu" = "nolingu" ]; then
- sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH7} >> $lang.filelist
+ sed -e "s/LINGUPATTERN/$lingu/g" %{PATCH8} >> $lang.filelist
fi
i=$[i+1]
type=${langpackdetails[$i]}
if [ "$type" = "ctl" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH8} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH9} >> $lang.filelist
fi
if [ "$type" = "cjk" ]; then
- sed -e "s/LANG/$lang/g" %{PATCH4} >> $lang.filelist
+ sed -e "s/LANG/$lang/g" %{PATCH5} >> $lang.filelist
fi
i=$[i+1]
done
@@ -1443,38 +1440,60 @@
echo exec %{instdir}/program/soffice -base \"\$@\" >> $RPM_BUILD_ROOT/%{_bindir}/oobase
chmod a+x $RPM_BUILD_ROOT/%{_bindir}/oobase
-chmod u+w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop
-echo "TryExec=oobase" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop
-echo "TryExec=oocalc" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop
-echo "TryExec=ooimpress" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop
-echo "TryExec=oowriter" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
-echo "TryExec=oomath" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
-echo "StartupNotify=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
-echo "TryExec=oodraw" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
+pushd $RPM_BUILD_ROOT/%{instdir}/share/xdg/
+chmod u+w *.desktop
+# rhbz#156677 use GenericNames
+for file in base.desktop calc.desktop impress.desktop writer.desktop; do
+ sed -i -e '/^Name/d' $file
+ sed -i -e 's/GenericName/Name/g' $file
+done
+# rhbz#156067 don't version the icons
+for file in *.desktop; do
+ sed -i -e s/$ICONPRODUCTVERSION//g $file
+done
+echo "StartupNotify=true" >> base.desktop
+echo "TryExec=oobase" >> base.desktop
+echo "StartupNotify=true" >> calc.desktop
+echo "TryExec=oocalc" >> calc.desktop
+echo "StartupNotify=true" >> impress.desktop
+echo "TryExec=ooimpress" >> impress.desktop
+echo "StartupNotify=true" >> writer.desktop
+echo "TryExec=oowriter" >> writer.desktop
+echo "StartupNotify=true" >> math.desktop
+echo "TryExec=oomath" >> math.desktop
+echo "StartupNotify=true" >> draw.desktop
+echo "TryExec=oodraw" >> draw.desktop
# rh#156677# / rh#186515#
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop
-echo "NoDisplay=true" >> $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop
-chmod u-w $RPM_BUILD_ROOT/%{instdir}/share/xdg/*.desktop
-
-#relocate the .desktop and icon files
+echo "NoDisplay=true" >> math.desktop
+echo "NoDisplay=true" >> draw.desktop
+chmod u-w *.desktop
+# relocate the .desktop and icon files
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
-cp $RPM_BUILD_ROOT/%{instdir}/share/xdg/draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
-#get rid of the gnome icons
-rm -rf sysui/output/usr/share/icons/gnome
+cp -p base.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-base.desktop
+cp -p calc.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-calc.desktop
+cp -p impress.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-impress.desktop
+cp -p writer.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-writer.desktop
+cp -p math.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-math.desktop
+cp -p draw.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/openoffice.org-1.9-draw.desktop
+popd
+pushd sysui/output/usr/share/
+#get rid of the gnome icons and other unneeded files
+rm -rf icons/gnome applications mime application-registry
+# rhbz#156067 don't version the icons
+find . -name "*.desktop" -exec sed -i -e s/$ICONPRODUCTVERSION//g {} \;
+find . -name "openofficeorg$ICONPRODUCTVERSION*" -exec bash -c \
+ "mv \$1 \`echo \$1 | sed s/officeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
+find . -name "openoffice.org$LONGICONPRODUCTVERSION*" -exec bash -c \
+ "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
+sed -i -e s/openofficeorg$ICONPRODUCTVERSION/openofficeorg/g \
+ ./mime-info/openoffice.org.keys
+sed -i -e s/openoffice.org$LONGICONPRODUCTVERSION/openoffice.org/g \
+ ./mime-info/openoffice.org.keys
#relocate the rest of them
-cp -r sysui/output/usr/share/icons $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/output/usr/share/mime-info $RPM_BUILD_ROOT/%{_datadir}
-cp -r sysui/output/usr/share/mimelnk $RPM_BUILD_ROOT/%{_datadir}
+cp -r icons $RPM_BUILD_ROOT/%{_datadir}
+cp -r mime-info $RPM_BUILD_ROOT/%{_datadir}
+cp -r mimelnk $RPM_BUILD_ROOT/%{_datadir}
+popd
rm -rf $RPM_BUILD_ROOT/%{instdir}/readmes
rm -rf $RPM_BUILD_ROOT/%{instdir}/licenses
@@ -1501,7 +1520,8 @@
%files langpack-en
%{instdir}/share/dict/ooo/WordNet_license.txt
%{instdir}/share/dict/ooo/th_en*
-%files langpack-es -f es.filelist
+%files langpack-es -f es.filelist
+%{instdir}/share/dict/ooo/README-COMO-HYPH_ES.txt
%files langpack-et_EE -f et.filelist
%files langpack-eu_ES -f eu.filelist
%files langpack-fi_FI -f fi.filelist
@@ -1592,7 +1612,6 @@
%{instdir}/program/classes/fax.jar
%{instdir}/program/classes/form.jar
%{instdir}/program/classes/java_uno.jar
-%{instdir}/program/classes/java_uno_accessbridge.jar
%{instdir}/program/classes/js.jar
%{instdir}/program/classes/juh.jar
%{instdir}/program/classes/jurt.jar
@@ -1643,12 +1662,14 @@
%{instdir}/program/kde-open-url
%{instdir}/program/legacy_binfilters.rdb
%{instdir}/program/libabp680*.so
+%{instdir}/program/libacc680*.so
%{instdir}/program/libadabas2.so
+%{instdir}/program/libaffine_uno_uno.so
%{instdir}/program/libavmedia*.so
%{instdir}/program/libbasctl680*.so
+%{instdir}/program/libbf_sb680*.so
%{instdir}/program/libbf_frm680*.so
%{instdir}/program/libbf_go680*.so
-%{instdir}/program/libbf_lng680*.so
%{instdir}/program/libbf_migratefilter680*.so
%{instdir}/program/libbf_ofa680*.so
%{instdir}/program/libbf_sch680*.so
@@ -1662,6 +1683,7 @@
%{instdir}/program/libbindet680*.so
%{instdir}/program/libcached1.so
%{instdir}/program/libcanvastools680*.so
+%{instdir}/program/libchart*680*.so
%{instdir}/program/libcollator_data.so
%{instdir}/program/libcppcanvas680*.so
%{instdir}/program/libcppu.so
@@ -1717,6 +1739,7 @@
%{instdir}/program/libflat680*.so
%{instdir}/program/libfrm680*.so
%{instdir}/program/libgcc3_uno.so
+%{instdir}/program/libguesslang680*.so
%{instdir}/program/libhsqldb2.so
%{instdir}/program/libhyphen680*.so
%{instdir}/program/libi18nregexpgcc3.so
@@ -1731,6 +1754,7 @@
%{instdir}/program/libjvmfwk.so.3
%{instdir}/program/liblegacy_binfilters680*.so
%{instdir}/program/liblng680*.so
+%{instdir}/program/liblog680*.so
%{instdir}/program/liblocaledata_en.so
%{instdir}/program/liblocaledata_es.so
%{instdir}/program/liblocaledata_euro.so
@@ -1743,7 +1767,6 @@
%{instdir}/program/liboffacc680*.so
%{instdir}/program/libpcr680*.so
%{instdir}/program/libpdffilter680*.so
-%{instdir}/program/libpk680*.so
%{instdir}/program/libpl680*.so
%{instdir}/program/libpreload680*.so
%{instdir}/program/libprotocolhandler680*.so
@@ -1759,8 +1782,6 @@
%{instdir}/program/libsalhelper3gcc3.so
%{instdir}/program/libsalhelpergcc3.so
%{instdir}/program/libsalhelpergcc3.so.3
-%{instdir}/program/libsch680*.so
-%{instdir}/program/libschd680*.so
%{instdir}/program/libscn680*.so
%{instdir}/program/libscriptframe.so
%{instdir}/program/libsd680*.so
@@ -1776,10 +1797,12 @@
%{instdir}/program/libsts680*.so
%{instdir}/program/libsvx680*.so
%{instdir}/program/libsw680*.so
+%{instdir}/program/libtextcat.so
%{instdir}/program/libtextconv_dict.so
%{instdir}/program/libtextconversiondlgs680*.so
%{instdir}/program/libtfu680*.so
%{instdir}/program/libtvhlp1.so
+%{instdir}/program/libucbhelper4gcc3.so
%{instdir}/program/libucpchelp1.so
%{instdir}/program/libucpdav1.so
%{instdir}/program/libucpftp1.so
@@ -1789,15 +1812,18 @@
%{instdir}/program/libuno_cppu.so.3
%{instdir}/program/libuno_cppuhelpergcc3.so
%{instdir}/program/libuno_cppuhelpergcc3.so.3
+%{instdir}/program/libuno_purpenvhelpergcc3.so.3
%{instdir}/program/libuno_sal.so
%{instdir}/program/libuno_sal.so.3
%{instdir}/program/libuno_salhelpergcc3.so
%{instdir}/program/libuno_salhelpergcc3.so.3
%{instdir}/program/libunoxml680*.so
+%{instdir}/program/libunsafe_uno_uno.so
%{instdir}/program/libupdchk680*.so
%{instdir}/program/liburp_uno.so
%{instdir}/program/libuui680*.so
-%{instdir}/program/libvclplug_*680*.so
+%{instdir}/program/libvclplug_gen680*.so
+%{instdir}/program/libvclplug_gtk680*.so
%{instdir}/program/libxmlfa680*.so
%{instdir}/program/libxmlfd680*.so
%{instdir}/program/libxmx680*.so
@@ -1823,16 +1849,17 @@
%dir %{instdir}/program/resource
%{instdir}/program/resource/avmedia680en-US.res
%{instdir}/program/resource/abp680en-US.res
+%{instdir}/program/resource/acc680en-US.res
%{instdir}/program/resource/basctl680en-US.res
%{instdir}/program/resource/bf_frm680en-US.res
%{instdir}/program/resource/bf_ofa680en-US.res
%{instdir}/program/resource/bf_sch680en-US.res
%{instdir}/program/resource/bf_sd680en-US.res
-%{instdir}/program/resource/bf_sfx680en-US.res
%{instdir}/program/resource/bf_svx680en-US.res
%{instdir}/program/resource/bf_sw680en-US.res
%{instdir}/program/resource/bib680en-US.res
%{instdir}/program/resource/cal680en-US.res
+%{instdir}/program/resource/chartcontroller680en-US.res
%{instdir}/program/resource/dba680en-US.res
%{instdir}/program/resource/dbp680en-US.res
%{instdir}/program/resource/dbu680en-US.res
@@ -1860,8 +1887,9 @@
%{instdir}/program/resource/preload680en-US.res
%{instdir}/program/resource/productregistration680en-US.res
%{instdir}/program/resource/san680en-US.res
-%{instdir}/program/resource/sch680en-US.res
+%{instdir}/program/resource/sb680en-US.res
%{instdir}/program/resource/sd680en-US.res
+%{instdir}/program/resource/sdbcl680en-US.res
%{instdir}/program/resource/sfx680en-US.res
%{instdir}/program/resource/spa680en-US.res
%{instdir}/program/resource/sdbt680en-US.res
@@ -1883,6 +1911,7 @@
%{instdir}/program/senddoc
%{instdir}/program/services.rdb
%{instdir}/program/setuprc
+%{instdir}/program/simplecanvas.uno.so
%{instdir}/program/slideshow.uno.so
%{instdir}/program/setofficelang*
%{instdir}/program/soffice
@@ -1909,7 +1938,6 @@
%{instdir}/program/updatefeed.uno.so
%{instdir}/program/uri-encode
%{instdir}/program/uuresolver.uno.so
-%{instdir}/program/vbaevents*.uno.so
%{instdir}/program/vclcanvas.uno.so
%{instdir}/program/cairocanvas.uno.so
%{instdir}/program/versionrc
@@ -1925,6 +1953,7 @@
%{instdir}/share/config/images_hicontrast.zip
%{instdir}/share/config/images_tango.zip
%{instdir}/share/config/javavendors.xml
+%{instdir}/share/config/javasettingsunopkginstall.xml
%{instdir}/share/config/psetup.xpm
%{instdir}/share/config/psetupl.xpm
%dir %{instdir}/share/config/soffice.cfg
@@ -1938,12 +1967,14 @@
%if %{langpacks}
%{instdir}/share/dict/ooo/DicOOo.sxw
%{instdir}/share/dict/ooo/dictionary.lst
-%{instdir}/share/dict/ooo/*hyph_en*
+%{instdir}/share/dict/ooo/*en_*
+%{instdir}/share/dict/ooo/WordNet_license.txt
%else
%{instdir}/share/dict/ooo/*
%endif
%dir %{instdir}/share/dtd
%{instdir}/share/dtd/officedocument
+%{instdir}/share/fingerprint/
%{instdir}/share/fonts
%{instdir}/share/gallery
%{instdir}/share/psprint
@@ -1965,9 +1996,13 @@
%{instdir}/share/registry/data/org/openoffice/Office/Compatibility.xcu
%{instdir}/share/registry/data/org/openoffice/Office/DataAccess.xcu
%{instdir}/share/registry/data/org/openoffice/Office/Embedding.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/ExtendedColorScheme.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/ExtensionManager.xcu
%{instdir}/share/registry/data/org/openoffice/Office/FormWizard.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/Impress.xcu
%{instdir}/share/registry/data/org/openoffice/Office/Jobs.xcu
%{instdir}/share/registry/data/org/openoffice/Office/Labels.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/Logging.xcu
%{instdir}/share/registry/data/org/openoffice/Office/Math.xcu
%{instdir}/share/registry/data/org/openoffice/Office/Paths.xcu
%{instdir}/share/registry/data/org/openoffice/Office/ProtocolHandler.xcu
@@ -1996,6 +2031,7 @@
%{instdir}/share/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
%{instdir}/share/registry/data/org/openoffice/Office/UI/StartModuleCommands.xcu
%{instdir}/share/registry/data/org/openoffice/Office/UI/StartModuleWindowState.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
%{instdir}/share/registry/data/org/openoffice/Office/Views.xcu
%{instdir}/share/registry/data/org/openoffice/Office/WebWizard.xcu
%{instdir}/share/registry/data/org/openoffice/Office/Writer.xcu
@@ -2050,6 +2086,8 @@
%{instdir}/share/registry/schema/org/openoffice/Office/DataAccess.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Draw.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Embedding.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/ExtendedColorScheme.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/ExtensionManager.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Events.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/FormWizard.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Impress.xcs
@@ -2057,6 +2095,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/Jobs.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Labels.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Linguistic.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/Logging.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Math.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/OptionsDialog.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Paths.xcs
@@ -2095,6 +2134,7 @@
%{instdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleCommands.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/StartModuleWindowState.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/WindowState.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/UI/XFormsWindowState.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Views.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/WebWizard.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2182,7 +2222,6 @@
%{instdir}/program/libtk680*.so
%{instdir}/program/libtl680*.so
%{instdir}/program/libucb1.so
-%{instdir}/program/libucbhelper3gcc3.so
%{instdir}/program/libucpfile1.so
%{instdir}/program/libutl680*.so
%{instdir}/program/libvcl680*.so
@@ -2209,6 +2248,8 @@
%{instdir}/program/bootstrap.uno.so
%{instdir}/program/stocservices.uno.so
%endif
+#vba
+%{instdir}/program/oovbaapi.rdb
%post core
update-desktop-database -q %{_datadir}/applications
@@ -2240,8 +2281,11 @@
%defattr(-,root,root,-)
%{instdir}/help/en/sdatabase.*
%{instdir}/program/sbase
+%{instdir}/program/librpt*680*.so
%dir %{instdir}/program/resource
%{instdir}/program/resource/cnr680en-US.res
+%{instdir}/program/resource/rpt680en-US.res
+%{instdir}/program/resource/rptui680en-US.res
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/modules
%dir %{instdir}/share/registry/modules/org
@@ -2249,8 +2293,12 @@
%dir %{instdir}/share/registry/modules/org/openoffice/Office
%dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-base.xcu
+%dir %{instdir}/share/registry/data/org/openoffice/Office/UI
+%{instdir}/share/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/UI/ReportCommands.xcu
%dir %{instdir}/share/registry/modules/org/openoffice/Setup
%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-base.xcu
+%{instdir}/share/registry/modules/org/openoffice/Setup/Setup-report.xcu
%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection
%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter
%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_database_filters.xcu
@@ -2258,6 +2306,14 @@
%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Misc/fcfg_database_others.xcu
%dir %{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types
%{instdir}/share/registry/modules/org/openoffice/TypeDetection/Types/fcfg_database_types.xcu
+%dir %{instdir}/share/registry/schema
+%dir %{instdir}/share/registry/schema/org
+%dir %{instdir}/share/registry/schema/org/openoffice
+%dir %{instdir}/share/registry/schema/org/openoffice/Office
+%{instdir}/share/registry/schema/org/openoffice/Office/ReportDesign.xcs
+%dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
+%{instdir}/share/registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/UI/ReportCommands.xcs
%{_bindir}/oobase
%dir %{_datadir}/applications
%{_datadir}/applications/openoffice.org-*-base.desktop
@@ -2327,6 +2383,8 @@
%dir %{_datadir}/mimelnk/application
%{_datadir}/mimelnk/application/*spreadsheet*
%{_bindir}/oocalc
+#vba
+%{instdir}/program/libvbaobj680*.uno.so
%post calc
update-desktop-database -q %{_datadir}/applications
@@ -2420,7 +2478,9 @@
%dir %{instdir}/share/registry/data/org/openoffice/Office
%dir %{instdir}/share/registry/data/org/openoffice/Office/UI
%{instdir}/share/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
%{instdir}/share/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+%{instdir}/share/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
%{instdir}/share/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
%{instdir}/share/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
%dir %{instdir}/share/registry/modules
@@ -2446,7 +2506,9 @@
%dir %{instdir}/share/registry/schema/org/openoffice/Office
%dir %{instdir}/share/registry/schema/org/openoffice/Office/UI
%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterCommands.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterFormWindowState.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterGlobalWindowState.xcs
+%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterReportWindowState.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWebWindowState.xcs
%{instdir}/share/registry/schema/org/openoffice/Office/UI/WriterWindowState.xcs
%dir %{_datadir}/applications
@@ -2607,6 +2669,7 @@
%{instdir}/share/xslt/docbook
%dir %{instdir}/share/xslt/export
%{instdir}/share/xslt/export/xhtml
+%{instdir}/share/xslt/wiki/
%files javafilter
%defattr(-,root,root,-)
@@ -2655,6 +2718,13 @@
%{instdir}/sdk/docs/
%{instdir}/sdk/examples/
+%files headless
+%defattr(-,root,root,-)
+%dir %{instdir}
+%dir %{instdir}/program
+%{instdir}/program/libbasebmp680*.so
+%{instdir}/program/libvclplug_svp680*.so
+
%files pyuno
%defattr(-,root,root,-)
%dir %{instdir}
@@ -2680,7 +2750,8 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
-* Tue Oct 02 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.2.1-18.3UNRELEASED
+* Wed Oct 10 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.0
+- bump to 2.3.0
- Resolves: rhbz#286221 allow custom printing commands
* Mon Sep 17 2007 Jan Navratil <jnavrati at redhat.com> - 1:2.2.1-18.2
pseudoworkspace.valgrind1.patch:
Index: pseudoworkspace.valgrind1.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/pseudoworkspace.valgrind1.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- pseudoworkspace.valgrind1.patch 26 Jul 2007 20:16:50 -0000 1.18
+++ pseudoworkspace.valgrind1.patch 10 Oct 2007 16:11:56 -0000 1.19
@@ -13,24 +13,6 @@
nNumItemId(SID_ATTR_NUMBERING_RULE),
bInInintControl(FALSE)
{
-Index: bf_sfx2/source/explorer/sfx2_nochaos.cxx
-===================================================================
-RCS file: /cvs/framework/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx,v
-retrieving revision 1.4
-diff -u -r1.4 sfx2_nochaos.cxx
---- openoffice.org.orig/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx 8 Sep 2005 03:19:32 -0000 1.4
-+++ openoffice.org/binfilter/bf_sfx2/source/explorer/sfx2_nochaos.cxx 9 Jan 2007 14:56:16 -0000
-@@ -212,8 +212,8 @@
- /*N*/ m_ppDefaults( new SfxPoolItem* [ m_nItems ] ),
- /*N*/ m_pItemInfos( new SfxItemInfo [ m_nItems ] )
- /*N*/ {
--/*N*/ rtl_zeroMemory( m_ppDefaults, sizeof( m_ppDefaults ) * m_nItems );
--/*N*/ rtl_zeroMemory( m_pItemInfos, sizeof( m_pItemInfos ) * m_nItems );
-+/*N*/ rtl_zeroMemory( m_ppDefaults, sizeof( SfxPoolItem* ) * m_nItems );
-+/*N*/ rtl_zeroMemory( m_pItemInfos, sizeof( SfxItemInfo ) * m_nItems );
- /*N*/
- /*N*/ Insert(
- /*N*/ new SfxStringItem( WID_CHAOS_START, String() ),
Index: source/core/txtnode/swfont.cxx
===================================================================
RCS file: /cvs/sw/sw/source/core/txtnode/swfont.cxx,v
@@ -47,41 +29,91 @@
SwUnderlineFont* pUnderFnt = 0;
if( rInf.GetUnderFnt() )
-Index: inc/viewfrm.hxx
+Index: source/commontools/statementcomposer.cxx
===================================================================
-RCS file: /cvs/framework/sfx2/inc/viewfrm.hxx,v
-retrieving revision 1.24
-diff -u -r1.24 viewfrm.hxx
---- openoffice.org.orig/sfx2/inc/viewfrm.hxx 12 Dec 2006 19:28:13 -0000 1.24
-+++ openoffice.org/sfx2/inc/viewfrm.hxx 5 Apr 2007 10:42:26 -0000
-@@ -109,6 +109,14 @@
- }
- BOOL operator != ( const SvBorder & rObj ) const
- { return !(*this == rObj); }
-+ SvBorder & operator = ( const SvBorder & rBorder )
-+ {
-+ Left() = rBorder.Left();
-+ Top() = rBorder.Top();
-+ Right() = rBorder.Right();
-+ Bottom() = rBorder.Bottom();
-+ return *this;
-+ }
- SvBorder & operator += ( const SvBorder & rBorder )
- {
- Left() += rBorder.Left();
-Index: source/msfilter/msdffimp.cxx
+RCS file: /cvs/dba/connectivity/source/commontools/statementcomposer.cxx,v
+retrieving revision 1.4
+diff -u -r1.4 statementcomposer.cxx
+--- openoffice.org.orig/connectivity/source/commontools/statementcomposer.cxx 31 Jul 2007 13:38:39 -0000 1.4
++++ openoffice.org/connectivity/source/commontools/statementcomposer.cxx 4 Sep 2007 11:51:46 -0000
+@@ -109,6 +109,7 @@
+ ,nCommandType( CommandType::COMMAND )
+ ,bEscapeProcessing( sal_True )
+ ,bComposerDirty( true )
++ ,bDisposeComposer( true )
+ {
+ if ( !_rxConnection.is() )
+ throw NullPointerException();
+Index: source/ui/config/usrpref.cxx
+===================================================================
+RCS file: /cvs/sw/sw/source/ui/config/usrpref.cxx,v
+retrieving revision 1.32
+diff -u -r1.32 usrpref.cxx
+--- openoffice.org.orig/sw/source/ui/config/usrpref.cxx 27 Jun 2007 12:49:41 -0000 1.32
++++ openoffice.org/sw/source/ui/config/usrpref.cxx 4 Sep 2007 13:34:50 -0000
+@@ -79,16 +79,16 @@
+ }
+
+ SwMasterUsrPref::SwMasterUsrPref(BOOL bWeb) :
+- aContentConfig(bWeb, *this),
+- aLayoutConfig(bWeb, *this),
+- aGridConfig(bWeb, *this),
+- aCursorConfig(*this),
+- pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0),
+ nFldUpdateFlags(0),
+ nLinkUpdateMode(0),
+ bIsHScrollMetricSet(sal_False),
+ bIsVScrollMetricSet(sal_False),
+- nDefTab( MM50 * 4 )
++ nDefTab( MM50 * 4 ),
++ aContentConfig(bWeb, *this),
++ aLayoutConfig(bWeb, *this),
++ aGridConfig(bWeb, *this),
++ aCursorConfig(*this),
++ pWebColorConfig(bWeb ? new SwWebColorConfig(*this) : 0)
+ {
+ MeasurementSystem eSystem = GetAppLocaleData().getMeasurementSystemEnum();
+ eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
+Index: source/ui/inc/usrpref.hxx
===================================================================
-RCS file: /cvs/graphics/svx/source/msfilter/msdffimp.cxx,v
-retrieving revision 1.144.42.3
-diff -u -r1.144.42.3 msdffimp.cxx
---- openoffice.org.orig/svx/source/msfilter/msdffimp.cxx 19 Jan 2007 16:46:49 -0000 1.144.42.3
-+++ openoffice.org/svx/source/msfilter/msdffimp.cxx 5 Apr 2007 13:57:43 -0000
-@@ -6969,7 +6969,7 @@
+RCS file: /cvs/sw/sw/source/ui/inc/usrpref.hxx,v
+retrieving revision 1.11
+diff -u -r1.11 usrpref.hxx
+--- openoffice.org.orig/sw/source/ui/inc/usrpref.hxx 27 Jun 2007 12:50:12 -0000 1.11
++++ openoffice.org/sw/source/ui/inc/usrpref.hxx 4 Sep 2007 13:34:54 -0000
+@@ -141,6 +141,17 @@
+ ---------------------------------------------------------------------------*/
+ class SwMasterUsrPref : public SwViewOption
+ {
++ sal_Int32 nFldUpdateFlags; //udpate of fields and charts
++ sal_Int32 nLinkUpdateMode;
++ FieldUnit eUserMetric;
++ FieldUnit eHScrollMetric;
++ sal_Bool bIsHScrollMetricSet;
++ FieldUnit eVScrollMetric;
++ sal_Bool bIsVScrollMetricSet;
++
++ sal_Int32 nDefTab; //default tab stop distance
++
++
+ friend class SwContentViewConfig;
+ friend class SwLayoutViewConfig;
+ friend class SwGridConfig;
+@@ -153,17 +164,6 @@
+ SwCursorConfig aCursorConfig;
+ SwWebColorConfig* pWebColorConfig;
- // nachschauen, ob es sich auch wirklich um ein BLIP handelt
- UINT32 nLength;
-- USHORT nInst, nFbt;
-+ USHORT nInst, nFbt(0);
- BYTE nVer;
- if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) )
- {
+- sal_Int32 nFldUpdateFlags; //udpate of fields and charts
+- sal_Int32 nLinkUpdateMode;
+- FieldUnit eUserMetric;
+- FieldUnit eHScrollMetric;
+- sal_Bool bIsHScrollMetricSet;
+- FieldUnit eVScrollMetric;
+- sal_Bool bIsVScrollMetricSet;
+-
+-
+- sal_Int32 nDefTab; //default tab stop distance
+-
+ public:
+ SwMasterUsrPref(BOOL bWeb);
+ ~SwMasterUsrPref();
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/sources,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -r1.240 -r1.241
--- sources 10 Oct 2007 15:45:48 -0000 1.240
+++ sources 10 Oct 2007 16:11:56 -0000 1.241
@@ -4,5 +4,4 @@
05a906513ef89af5e189097fa0c50681 ooo64726.sdf
e3a0b76dcd876f3d721ee7183729153d unowinreg.dll
f0cda31fe18bf9289629a321663031b8 redhat-templates.tar.gz
-db12596a2a667fb5c2a6c8467dcc9223 OOF680_m18.tar.bz2
877fe27a91096d0ea2e634849f0ef1d6 OOG680_m6.tar.bz2
workspace.configrefactor01.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 workspace.configrefactor01.patch
Index: workspace.configrefactor01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/workspace.configrefactor01.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.configrefactor01.patch 26 Jul 2007 20:16:50 -0000 1.2
+++ workspace.configrefactor01.patch 10 Oct 2007 16:11:56 -0000 1.3
@@ -1,7 +1,9 @@
-Index: util/configmgr/qa/unit/export.map
-diff -u /dev/null util/configmgr/qa/unit/export.map:1.1.2.1
---- /dev/null Wed Feb 21 04:50:14 2007
-+++ util/configmgr/qa/unit/export.map Mon Feb 5 07:21:44 2007
+Index: configmgr/qa/unit/export.map
+===================================================================
+RCS file: configmgr/qa/unit/export.map
+diff -N configmgr/qa/unit/export.map
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/qa/unit/export.map 5 Feb 2007 15:21:44 -0000 1.1.2.1
@@ -0,0 +1,7 @@
+UDK_3.0 {
+ global:
@@ -10,10 +12,12 @@
+ local:
+ *;
+};
-Index: util/configmgr/qa/unit/makefile.mk
-diff -u /dev/null util/configmgr/qa/unit/makefile.mk:1.1.2.2
---- /dev/null Wed Feb 21 04:50:14 2007
-+++ util/configmgr/qa/unit/makefile.mk Thu Feb 8 04:44:56 2007
+Index: configmgr/qa/unit/makefile.mk
+===================================================================
+RCS file: configmgr/qa/unit/makefile.mk
+diff -N configmgr/qa/unit/makefile.mk
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/qa/unit/makefile.mk 8 Feb 2007 12:44:56 -0000 1.1.2.2
@@ -0,0 +1,64 @@
+#*************************************************************************
+#
@@ -79,10 +83,12 @@
+
+test .PHONY: $(SHL1TARGETN) $(MISC)$/$(TARGET).rdb
+ testshl2 $(SHL1TARGETN) -forward "$(MISC)$/$(TARGET).rdb#$(PWD)$/$(MISC)$/$(TARGET).registry"
-Index: util/configmgr/qa/unit/performance.cxx
-diff -u /dev/null util/configmgr/qa/unit/performance.cxx:1.1.2.3
---- /dev/null Wed Feb 21 04:50:14 2007
-+++ util/configmgr/qa/unit/performance.cxx Thu Feb 8 04:44:56 2007
+Index: configmgr/qa/unit/performance.cxx
+===================================================================
+RCS file: configmgr/qa/unit/performance.cxx
+diff -N configmgr/qa/unit/performance.cxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/qa/unit/performance.cxx 8 Feb 2007 12:44:56 -0000 1.1.2.3
@@ -0,0 +1,138 @@
+/*************************************************************************
+ *
@@ -222,11 +228,15 @@
+}
+
+NOADDITIONAL;
-Index: util/configmgr/source/api/confeventhelpers.cxx
-diff -u util/configmgr/source/api/confeventhelpers.cxx:1.14 util/configmgr/source/api/confeventhelpers.cxx:1.14.24.1
---- util/configmgr/source/api/confeventhelpers.cxx:1.14 Sat Sep 16 07:52:51 2006
-+++ util/configmgr/source/api/confeventhelpers.cxx Fri Jan 12 09:51:16 2007
-@@ -177,7 +177,6 @@
+Index: configmgr/source/api/confeventhelpers.cxx
+===================================================================
+RCS file: /cvs/util/configmgr/source/api/confeventhelpers.cxx,v
+retrieving revision 1.14
+retrieving revision 1.14.24.1
+diff -u -p -r1.14 -r1.14.24.1
+--- configmgr/source/api/confeventhelpers.cxx 16 Sep 2006 14:52:51 -0000 1.14
++++ configmgr/source/api/confeventhelpers.cxx 12 Jan 2007 17:51:16 -0000 1.14.24.1
+@@ -177,7 +177,6 @@ void ConfigChangesBroadcasterImpl::dispa
(
INodeListenerRef const& pTarget,
AbsolutePath const& _aTargetPath,
@@ -234,7 +244,7 @@
Change const& rBaseChange,
AbsolutePath const& _aChangeLocation,
sal_Bool , //_bError,
-@@ -198,10 +197,10 @@
+@@ -198,10 +197,10 @@ void ConfigChangesBroadcasterImpl::dispa
OSL_ASSERT( !pTargetChange || matches(_aChangeLocation.compose(aLocalPath),_aTargetPath) );
if (pRemoved)
@@ -247,7 +257,7 @@
}
catch (InvalidName& )
-@@ -215,7 +214,6 @@
+@@ -215,7 +214,6 @@ void ConfigChangesBroadcasterImpl::dispa
(
INodeListenerRef const& pTarget,
AbsolutePath const& _aTargetPath,
@@ -255,7 +265,7 @@
Change const& rBaseChange,
AbsolutePath const& _aChangeLocation,
sal_Bool , //_bError,
-@@ -226,13 +224,13 @@
+@@ -226,13 +224,13 @@ void ConfigChangesBroadcasterImpl::dispa
OSL_ASSERT(pTarget.is());
OSL_ASSERT( Path::hasPrefix( _aChangeLocation, _aTargetPath) );
@@ -272,7 +282,7 @@
}
/////////////////////////////////////////////////////////////////////////
namespace
-@@ -250,7 +248,6 @@
+@@ -250,7 +248,6 @@ namespace
/////////////////////////////////////////////////////////////////////////
void ConfigChangesBroadcasterImpl::dispatch
(
@@ -280,7 +290,7 @@
Change const& rBaseChange,
AbsolutePath const& _aChangeLocation,
sal_Bool _bError,
-@@ -305,10 +302,10 @@
+@@ -305,10 +302,10 @@ void ConfigChangesBroadcasterImpl::dispa
aGuard.clear();
{for (DispatchTargets::const_iterator it = aOuterTargets.begin(); it != aOuterTargets.end(); ++it){
@@ -293,11 +303,15 @@
}}
}
-Index: util/configmgr/source/api/confeventhelpers.hxx
-diff -u util/configmgr/source/api/confeventhelpers.hxx:1.10 util/configmgr/source/api/confeventhelpers.hxx:1.10.84.1
---- util/configmgr/source/api/confeventhelpers.hxx:1.10 Wed Sep 7 20:03:44 2005
-+++ util/configmgr/source/api/confeventhelpers.hxx Fri Jan 12 09:51:16 2007
-@@ -199,8 +199,8 @@
+Index: configmgr/source/api/confeventhelpers.hxx
+===================================================================
+RCS file: /cvs/util/configmgr/source/api/confeventhelpers.hxx,v
+retrieving revision 1.10
+retrieving revision 1.10.84.1
+diff -u -p -r1.10 -r1.10.84.1
+--- configmgr/source/api/confeventhelpers.hxx 8 Sep 2005 03:03:44 -0000 1.10
++++ configmgr/source/api/confeventhelpers.hxx 12 Jan 2007 17:51:16 -0000 1.10.84.1
+@@ -199,8 +199,8 @@ namespace configmgr
// void removed(OUString const& aPath, bool bRemovedFromModel, IConfigBroadcaster* pSource);
@@ -308,7 +322,7 @@
void disposing(IConfigBroadcaster* pSource);
private:
typedef BroadcastImplHelper<NodeListenerInfo> Listeners;
-@@ -209,8 +209,8 @@
+@@ -209,8 +209,8 @@ namespace configmgr
Listeners m_aListeners;
PathMap m_aPathMap;
private:
@@ -319,11 +333,15 @@
};
/////////////////////////////////////////////////////////////////////////
-Index: util/configmgr/source/api/confevents.cxx
-diff -u util/configmgr/source/api/confevents.cxx:1.9 util/configmgr/source/api/confevents.cxx:1.9.24.2
---- util/configmgr/source/api/confevents.cxx:1.9 Sat Sep 16 07:53:04 2006
-+++ util/configmgr/source/api/confevents.cxx Fri Jan 12 09:51:16 2007
-@@ -63,7 +63,7 @@
+Index: configmgr/source/api/confevents.cxx
+===================================================================
+RCS file: /cvs/util/configmgr/source/api/confevents.cxx,v
+retrieving revision 1.9
+retrieving revision 1.9.24.2
+diff -u -p -r1.9 -r1.9.24.2
+--- configmgr/source/api/confevents.cxx 16 Sep 2006 14:53:04 -0000 1.9
++++ configmgr/source/api/confevents.cxx 12 Jan 2007 17:51:16 -0000 1.9.24.2
+@@ -63,7 +63,7 @@ namespace configmgr
ConfigChangeBroadcastHelper();
~ConfigChangeBroadcastHelper();
@@ -332,7 +350,7 @@
public:
// IConfigBroadcaster implementation helper
-@@ -118,20 +118,12 @@
+@@ -118,20 +118,12 @@ namespace configmgr
}
}
@@ -355,7 +373,7 @@
}
}
-@@ -167,9 +159,9 @@
+@@ -167,9 +159,9 @@ namespace configmgr
}
*/
/////////////////////////////////////////////////////////////////////////
@@ -367,10 +385,14 @@
}
-Index: util/configmgr/source/api/confsvccomponent.cxx
-diff -u util/configmgr/source/api/confsvccomponent.cxx:1.6 util/configmgr/source/api/confsvccomponent.cxx:1.6.24.1
---- util/configmgr/source/api/confsvccomponent.cxx:1.6 Sat Sep 16 07:53:18 2006
-+++ util/configmgr/source/api/confsvccomponent.cxx Thu Jan 11 12:15:55 2007
+Index: configmgr/source/api/confsvccomponent.cxx
[...13057 lines suppressed...]
- { return doGetDataSegmentForUpdate(); }
-
+-
//-----------------------------------------------------------------------------
}
-Index: util/configmgr/util/makefile.mk
-diff -u util/configmgr/util/makefile.mk:1.21 util/configmgr/util/makefile.mk:1.19.84.2
---- util/configmgr/util/makefile.mk:1.21 Wed Jan 31 00:43:09 2007
-+++ util/configmgr/util/makefile.mk Wed Feb 7 03:45:28 2007
-@@ -46,7 +46,6 @@
+ //-----------------------------------------------------------------------------
+Index: configmgr/util/makefile.mk
+===================================================================
+RCS file: /cvs/util/configmgr/util/makefile.mk,v
+retrieving revision 1.21
+retrieving revision 1.19.84.2
+diff -u -p -r1.21 -r1.19.84.2
+--- configmgr/util/makefile.mk 31 Jan 2007 08:43:09 -0000 1.21
++++ configmgr/util/makefile.mk 7 Feb 2007 11:45:28 -0000 1.19.84.2
+@@ -46,7 +46,6 @@ DLLPRE =
# --- Library -----------------------------------
SHL1TARGET= $(CFGMGR_TARGET)$(CFGMGR_MAJOR).uno
@@ -17296,65 +20626,120 @@
SHL1VERSIONMAP= $(TARGET).map
SHL1OBJS=$(SLOFILES)
-Index: util/configmgr/workben/makefile.mk
-diff -u util/configmgr/workben/makefile.mk:1.4 util/configmgr/workben/makefile.mk:1.4.58.2
---- util/configmgr/workben/makefile.mk:1.4 Wed Mar 8 06:02:03 2006
-+++ util/configmgr/workben/makefile.mk Thu Jan 11 02:35:42 2007
-@@ -55,35 +55,7 @@
- # CFGDEMO
- #
- APP1TARGET= cfgdemo
--APP1OBJS=\
-- $(OBJ)$/treetests.obj \
-- $(SLO)$/xmltreebuilder.obj \
-- $(SLO)$/xmlformater.obj \
-- $(SLO)$/attributes.obj \
-- $(SLO)$/changes.obj \
-- $(SLO)$/confname.obj \
-- $(SLO)$/typeconverter.obj \
-- $(SLO)$/synchronize.obj \
-- $(SLO)$/cmtree.obj \
-- $(SLO)$/cmtreemodel.obj \
-- $(SLO)$/localsession.obj \
-- $(SLO)$/mergeupdates.obj \
-- $(SLO)$/oslstream.obj \
-- $(SLO)$/saxtools.obj \
-- $(SLO)$/configsession.obj \
-- $(SLO)$/strimpl.obj \
-- $(SLO)$/tracer.obj \
-- $(SLO)$/confchangesset.obj \
-- $(SLO)$/filehelper.obj \
-- $(SLO)$/strconverter.obj \
-- $(SLO)$/updatedom.obj \
-- $(SLO)$/valuehandler.obj \
-- $(SLO)$/dataconverter.obj \
--
--# $(OBJ)$/cmxmlexport.obj \
--# $(OBJ)$/cmxmlimport.obj \
--
--#APP1RES= $(RES)$/ucbdemo.res
+Index: configmgr/workben/makefile.mk
+===================================================================
+RCS file: /cvs/util/configmgr/workben/Attic/makefile.mk,v
+retrieving revision 1.4
+retrieving revision 1.4.58.2
+diff -u -p -r1.4 -r1.4.58.2
+--- configmgr/workben/makefile.mk 8 Mar 2006 14:02:03 -0000 1.4
++++ configmgr/workben/makefile.mk 11 Jan 2007 10:35:42 -0000 1.4.58.2
+@@ -0,0 +1,99 @@ USE_LDUMP2=TRUE
++#*************************************************************************
++#
++# OpenOffice.org - a multi-platform office productivity suite
++#
++# $RCSfile$
++#
++# $Revision$
++#
++# last change: $Author$ $Date$
++#
++# The Contents of this file are made available subject to
++# the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++# GNU Lesser General Public License Version 2.1
++# =============================================
++# Copyright 2005 by Sun Microsystems, Inc.
++# 901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++# This library is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License version 2.1, as published by the Free Software Foundation.
++#
++# This library is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++# MA 02111-1307 USA
++#
++#*************************************************************************
++
++PRJ=..
++
++PRJINC=..$/source
++
++PRJNAME=configmgr
++TARGETTYPE=CUI
++TARGET=cm
++LIBTARGET=NO
++ENABLE_EXCEPTIONS=TRUE
++
++USE_LDUMP2=TRUE
++
++# --- Settings ---
++
++.INCLUDE : settings.mk
++
++# --- Files ---
++
++#
++# CFGDEMO
++#
++APP1TARGET= cfgdemo
+APP1OBJS= $(OBJ)$/testapp.obj
-
- APP1STDLIBS=\
- $(SALLIB) \
-@@ -91,11 +63,12 @@
- $(STDLIBCPP) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
++
++APP1STDLIBS=\
++ $(SALLIB) \
++ $(VOSLIB) \
++ $(STDLIBCPP) \
++ $(CPPULIB) \
++ $(CPPUHELPERLIB) \
+ $(COMPHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(UUILIB) \
- $(SVTOOLLIB) \
-- $(SVLIB)
++ $(UNOTOOLSLIB) \
++ $(TOOLSLIB) \
++ $(UUILIB) \
++ $(SVTOOLLIB) \
+ $(SVLIB)
-
- .IF "$(GUI)"=="WNT"
- APP1STDLIBS+=$(LIBCIMT)
-Index: util/configmgr/workben/testapp.cxx
-diff -u /dev/null util/configmgr/workben/testapp.cxx:1.1.2.4
---- /dev/null Wed Feb 21 04:50:23 2007
-+++ util/configmgr/workben/testapp.cxx Tue Jan 16 04:57:13 2007
++
++.IF "$(GUI)"=="WNT"
++APP1STDLIBS+=$(LIBCIMT)
++.ENDIF
++
++
++# APP1DEF= $(MISC)\$(APP1TARGET).def
++
++## important for create a Lib
++## SHL1TARGET= $(TARGET)
++##
++## SHL1STDLIBS= \
++## $(CPPULIB) \
++## $(CPPUHELPERLIB) \
++## $(VOSLIB) \
++## $(SALLIB)
++##
++## SHL1DEPN=
++## SHL1IMPLIB= i$(TARGET)
++## SHL1LIBS= $(SLB)$/$(TARGET).lib
++## SHL1DEF= $(MISC)$/$(SHL1TARGET).def
++##
++## DEF1NAME= $(SHL1TARGET)
++## DEF1EXPORTFILE= exports.dxp
++
++# --- Targets ---
++
++.INCLUDE : target.mk
+Index: configmgr/workben/testapp.cxx
+===================================================================
+RCS file: configmgr/workben/testapp.cxx
+diff -N configmgr/workben/testapp.cxx
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ configmgr/workben/testapp.cxx 16 Jan 2007 12:57:13 -0000 1.1.2.4
@@ -0,0 +1,274 @@
+#include <stdio.h>
+#include <memory>
workspace.fpicker6.patch:
Index: workspace.fpicker6.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/workspace.fpicker6.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.fpicker6.patch 22 Jan 2007 09:27:00 -0000 1.3
+++ workspace.fpicker6.patch 10 Oct 2007 16:11:56 -0000 1.4
@@ -368,7 +368,7 @@
// fill the rpURLList
- Sequence < OUString > aPathSeq = mxFileDlg->getFiles();
-+ Reference<XFilePickerWorkaround> xFileWorkarounds(mxFileDlg, UNO_QUERY);
++ uno::Reference<XFilePickerWorkaround> xFileWorkarounds(mxFileDlg, UNO_QUERY);
+ Sequence < OUString > aPathSeq;
+ if (xFileWorkarounds.is())
+ {
workspace.tl37.patch:
Index: workspace.tl37.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-7/workspace.tl37.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.tl37.patch 31 May 2007 16:14:00 -0000 1.2
+++ workspace.tl37.patch 10 Oct 2007 16:11:56 -0000 1.3
@@ -5,26 +5,29 @@
diff -u -r1.114 impedit2.cxx
--- openoffice.org.orig/svx/source/editeng/impedit2.cxx 12 Oct 2006 12:39:14 -0000 1.114
+++ openoffice.org/svx/source/editeng/impedit2.cxx 31 May 2007 15:56:08 -0000
-@@ -1764,9 +1764,21 @@
-
+@@ -1768,9 +1768,22 @@
+ // well as with just moving the cursor from char to char.
USHORT nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
USHORT nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
+- for ( USHORT n = 0; n < rTypes.Count(); n++ )
+- {
+- if (rTypes[n].nStartPos <= nS && nE <= rTypes[n].nEndPos)
+
-+ // Find all the scripts types that intersect the selection.
-+ // For moving cursor from char to char then we have no selection,
-+ // so use a selection over the previous character if there was one.
-+ // If there is no previous character, then we'll eventually fallback
-+ // to the input language.
-+ if ( !rSel.HasRange() && nS )
-+ {
-+ DBG_ASSERT( nS == nE && nStartPara == nEndPara, "Move in sich selbst ?" );
-+ --nS;
-+ }
+
- for ( USHORT n = 0; n < rTypes.Count(); n++ )
- {
-- if ( ( rTypes[n].nStartPos <= nE ) && ( rTypes[n].nEndPos >= nS ) )
-+ if ( ( nS < rTypes[n].nEndPos ) && ( nE > rTypes[n].nStartPos ) )
++ // Find all the scripts types that intersect the selection.
++ // For moving cursor from char to char then we have no selection,
++ // so use a selection over the previous character if there was one.
++ // If there is no previous character, then we'll eventually fallback
++ // to the input language.
++ if ( !rSel.HasRange() && nS )
++ {
++ DBG_ASSERT( nS == nE && nStartPara == nEndPara, "Move in sich selbst ?" );
++ --nS;
++ }
++
++ for ( USHORT n = 0; n < rTypes.Count(); n++ )
++ {
++ if ( ( nS < rTypes[n].nEndPos ) && ( nE > rTypes[n].nStartPos ) )
{
if ( rTypes[n].nScriptType != i18n::ScriptType::WEAK )
{
More information about the fedora-extras-commits
mailing list