rpms/openoffice.org/devel workspace.inplaceobjects.patch, NONE, 1.1 workspace.pb17.patch, NONE, 1.1 workspace.thbpp4.patch, NONE, 1.1 workspace.vcl60.patch, NONE, 1.1 workspace.vcl63.patch, NONE, 1.1 openoffice.org.spec, 1.817, 1.818 workspace.fwk40.patch, 1.1, 1.2 workspace.sixtyfour06.patch, 1.1, 1.2 openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch, 1.2, NONE openoffice.org-2.0.3.ooo65318.agg24.canvas.patch, 1.1, NONE openoffice.org-2.0.3.ooo65519.printing.samba.patch, 1.1, NONE openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch, 1.2, NONE openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch, 1.1, NONE openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch, 1.1, NONE openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch, 1.2, NONE openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Aug 3 10:22:30 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17020
Modified Files:
openoffice.org.spec workspace.fwk40.patch
workspace.sixtyfour06.patch
Added Files:
workspace.inplaceobjects.patch workspace.pb17.patch
workspace.thbpp4.patch workspace.vcl60.patch
workspace.vcl63.patch
Removed Files:
openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
openoffice.org-2.0.3.ooo65519.printing.samba.patch
openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
Log Message:
clean up into respective accepted-upstream workspaces
workspace.inplaceobjects.patch:
framework/source/helper/statusindicatorfactory.cxx | 2 ++
framework/source/loadenv/loadenv.cxx | 3 ++-
source/helper/statusindicatorfactory.cxx | 0
source/loadenv/loadenv.cxx | 0
4 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE workspace.inplaceobjects.patch ---
Index: source/helper/statusindicatorfactory.cxx
===================================================================
RCS file: /cvs/framework/framework/source/helper/statusindicatorfactory.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 statusindicatorfactory.cxx
--- openoffice.org.orig/framework/source/helper/statusindicatorfactory.cxx 23 Sep 2005 15:41:23 -0000 1.21
+++ openoffice.org/framework/source/helper/statusindicatorfactory.cxx 4 Jan 2006 21:41:06 -0000
@@ -496,9 +496,11 @@ void StatusIndicatorFactory::implts_make
if (xParentWindow.is())
xParentWindow->setVisible(sal_True);
+#if 0
css::uno::Reference< css::awt::XTopWindow > xParentWindowTop(xParentWindow, css::uno::UNO_QUERY);
if (xParentWindowTop.is())
xParentWindowTop->toFront();
+#endif
}
//-----------------------------------------------
Index: source/loadenv/loadenv.cxx
===================================================================
RCS file: /cvs/framework/framework/source/loadenv/loadenv.cxx,v
retrieving revision 1.21
diff -u -p -u -r1.21 loadenv.cxx
--- openoffice.org.orig/framework/source/loadenv/loadenv.cxx 11 Nov 2005 12:06:12 -0000 1.21
+++ openoffice.org/framework/source/loadenv/loadenv.cxx 4 Jan 2006 21:41:08 -0000
@@ -1774,9 +1774,10 @@ void LoadEnv::impl_makeFrameWindowVisibl
if (xWindow.is())
xWindow->setVisible(sal_True);
-
+#if 0
if (xTopWindow.is())
xTopWindow->toFront();
+#endif
/* #i19976#
We tried to prevent a toFront() call in case the user putted the
workspace.pb17.patch:
sfx2/source/dialog/versdlg.cxx | 10 +++++-----
source/dialog/cfg.cxx | 0
source/dialog/versdlg.cxx | 0
svx/source/dialog/cfg.cxx | 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
--- NEW FILE workspace.pb17.patch ---
Index: source/dialog/versdlg.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/dialog/versdlg.cxx,v
retrieving revision 1.10
diff -u -r1.10 versdlg.cxx
--- openoffice.org.orig/sfx2/source/dialog/versdlg.cxx 2 May 2006 16:39:52 -0000 1.10
+++ openoffice.org/sfx2/source/dialog/versdlg.cxx 25 Jul 2006 09:49:54 -0000
@@ -242,6 +242,11 @@
aVersionBox.SetTabs( &nTabs_Impl[0], MAP_APPFONT );
aVersionBox.Resize(); // OS: Hack fuer richtige Selektion
Init_Impl();
+
+ // set dialog title (filename or docinfo title)
+ String sText = GetText();
+ ( sText += ' ' ) += pViewFrame->GetObjectShell()->GetTitle();
+ SetText( sText );
}
String ConvertWhiteSpaces_Impl( const String& rText )
@@ -298,11 +303,6 @@
aSaveButton.Enable( !pObjShell->IsReadOnly() );
aSaveCheckBox.Enable( !pObjShell->IsReadOnly() );
aDeleteButton.Enable( FALSE );
-
- // set dialog title (filename or docinfo title)
- String sText = GetText();
- ( sText += ' ' ) += pObjShell->GetTitle();
- SetText( sText );
}
SfxVersionDialog::~SfxVersionDialog ()
Index: source/dialog/cfg.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/dialog/cfg.cxx,v
retrieving revision 1.32
diff -u -r1.32 cfg.cxx
--- openoffice.org.orig/svx/source/dialog/cfg.cxx 28 Feb 2006 12:53:48 -0000 1.32
+++ openoffice.org/svx/source/dialog/cfg.cxx 26 Jul 2006 08:58:29 -0000
@@ -1705,6 +1705,9 @@
aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
aDescriptionField.SetAutoScroll( TRUE );
aDescriptionField.EnableCursor( FALSE );
+
+ aMoveUpButton.Enable( FALSE );
+ aMoveDownButton.Enable( FALSE );
}
SvxConfigPage::~SvxConfigPage()
workspace.thbpp4.patch:
canvas/source/tools/image.cxx | 55 ++++++++++++++++++++++--------------------
source/tools/image.cxx | 0
2 files changed, 29 insertions(+), 26 deletions(-)
--- NEW FILE workspace.thbpp4.patch ---
Index: source/tools/image.cxx
===================================================================
RCS file: /cvs/gsl/canvas/source/tools/image.cxx,v
retrieving revision 1.4
diff -u -r1.4 image.cxx
--- openoffice.org.orig/canvas/source/tools/image.cxx 14 Dec 2005 11:16:19 -0000 1.4
+++ openoffice.org/canvas/source/tools/image.cxx 11 May 2006 12:49:26 -0000
@@ -76,15 +76,14 @@
#include <agg2/agg_renderer_outline_aa.h>
#include <agg2/agg_renderer_primitives.h>
#include <agg2/agg_path_storage.h>
-#include <agg2/agg_span_pattern.h>
#include <agg2/agg_span_pattern_rgba.h>
-#include <agg2/agg_span_pattern_resample_rgb.h>
-#include <agg2/agg_span_pattern_resample_rgba.h>
+#include <agg2/agg_span_image_filter_rgb.h>
+#include <agg2/agg_span_image_filter_rgba.h>
#include <agg2/agg_span_interpolator_linear.h>
#include <agg2/agg_span_gradient.h>
-#include <agg2/agg_span_image_resample_rgb.h>
-#include <agg2/agg_span_image_resample_rgba.h>
+#include <agg2/agg_span_allocator.h>
#include <agg2/agg_image_filters.h>
+#include <agg2/agg_image_accessors.h>
#include <agg2/agg_dda_line.h>
#include <agg2/agg_scanline_storage_aa.h>
#include <agg2/agg_scanline_storage_bin.h>
@@ -1145,7 +1144,7 @@
// cachedPrimitiveFTPP [cachedPrimitive for [F]ill[T]extured[P]oly[P]olygon]
//////////////////////////////////////////////////////////////////////////////////
-template<class pixel_format,class span_gen_type>
+template<class pixel_format_dst,class span_gen_type>
class cachedPrimitiveFTPP : public ImageCachedPrimitive
{
public:
@@ -1157,10 +1156,12 @@
aTransform(rTransform),
inter(tm),
filter(filter_kernel),
- sg(sa,src,inter,filter),
- pixf(dst),
- rb(pixf),
- ren(rb,sg)
+ pixs(const_cast<agg::rendering_buffer&>(src)),
+ source(pixs),
+ sg(source,inter,filter),
+ pixd(dst),
+ rb(pixd),
+ ren(rb,sa,sg)
{
::basegfx::B2DHomMatrix aFinalTransform(aTransform);
aFinalTransform *= rViewTransform;
@@ -1192,16 +1193,21 @@
private:
typedef agg::span_interpolator_linear<> interpolator_type;
- typedef agg::renderer_base<pixel_format> renderer_base;
- typedef agg::renderer_scanline_aa<renderer_base, span_gen_type> renderer_type;
+ typedef agg::renderer_base<pixel_format_dst> renderer_base;
+ typedef agg::span_allocator< typename span_gen_type::color_type > span_alloc_type;
+ typedef agg::renderer_scanline_aa<renderer_base, span_alloc_type, span_gen_type> renderer_type;
+ typedef typename span_gen_type::source_type source_type;
+ typedef typename span_gen_type::source_type::pixfmt_type pixel_format_src;
::basegfx::B2DHomMatrix aTransform;
interpolator_type inter;
agg::image_filter_bilinear filter_kernel;
agg::image_filter_lut filter;
- agg::span_allocator< typename span_gen_type::color_type > sa;
+ span_alloc_type sa;
+ pixel_format_src pixs;
+ source_type source;
span_gen_type sg;
- pixel_format pixf;
+ pixel_format_dst pixd;
renderer_base rb;
mutable renderer_type ren;
mutable agg::scanline_p8 sl;
@@ -1414,14 +1420,12 @@
typedef agg::wrap_mode_repeat wrap_y_type;
typedef agg::pixfmt_rgb24 pixfmt_rgb24;
typedef agg::pixfmt_rgba32 pixfmt_rgba32;
- typedef agg::span_pattern_resample_rgba_affine< pixfmt_rgba32::color_type,
- pixfmt_rgba32::order_type,
- wrap_x_type,
- wrap_y_type> span_gen_type_rgba;
- typedef agg::span_pattern_resample_rgb_affine< pixfmt_rgb24::color_type,
- pixfmt_rgb24::order_type,
- wrap_x_type,
- wrap_y_type> span_gen_type_rgb;
+
+ typedef agg::image_accessor_wrap< pixfmt_rgba32, wrap_x_type, wrap_y_type > img_source_type_rgba;
+ typedef agg::image_accessor_wrap< pixfmt_rgb24, wrap_x_type, wrap_y_type > img_source_type_rgb;
+
+ typedef agg::span_image_resample_rgba_affine< img_source_type_rgba > span_gen_type_rgba;
+ typedef agg::span_image_resample_rgb_affine< img_source_type_rgb > span_gen_type_rgb;
const Format nDest = maDesc.eFormat;
const Format nSource = rTexture.maDesc.eFormat;
@@ -1572,8 +1576,7 @@
interpolator_type,
gradient_polymorphic_wrapper_base,
color_generator_type > gradient_span_gen;
- gradient_span_gen span_gen(span_alloc,
- inter,
+ gradient_span_gen span_gen(inter,
*gf[rValues.meType],
colors,
0,
@@ -1593,8 +1596,8 @@
// [in contrast to solid renderers, that is]
// the instance of this particular renderer combines the
// renderbuffer [i.e. destination] and the spanline generator [i.e. source]
- typedef agg::renderer_scanline_aa<renderer_base, gradient_span_gen> renderer_gradient;
- renderer_gradient r1(rb, span_gen);
+ typedef agg::renderer_scanline_aa<renderer_base, gradient_span_alloc, gradient_span_gen> renderer_gradient;
+ renderer_gradient r1(rb, span_alloc, span_gen);
// instantiate the rasterizer and feed the incoming polypolygon.
agg::rasterizer_scanline_aa<> ras;
workspace.vcl60.patch:
gtkframe.cxx | 3 +++
1 files changed, 3 insertions(+)
--- NEW FILE workspace.vcl60.patch ---
diff -ru vcl/unx/gtk/window/gtkframe.cxx vcl/unx/gtk/window/gtkframe.cxx
--- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 2006-05-18 12:25:04.000000000 +0100
+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 2006-05-18 12:29:56.000000000 +0100
@@ -2275,7 +2275,10 @@
if( pThis->m_pIMHandler )
if( pThis->m_pIMHandler->handleKeyEvent( pEvent ) )
+ {
+ pThis->m_bSingleAltPress = false;
return TRUE;
+ }
GTK_YIELD_GRAB();
// handle modifiers
workspace.vcl63.patch:
source/window/window.cxx | 0
vcl/source/window/window.cxx | 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE workspace.vcl63.patch ---
Index: source/window/window.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/window/window.cxx,v
retrieving revision 1.234.22.2
diff -u -r1.234.22.2 window.cxx
--- openoffice.org.orig/vcl/source/window/window.cxx 18 May 2006 07:03:13 -0000 1.234.22.2
+++ openoffice.org/vcl/source/window/window.cxx 21 Jul 2006 10:56:06 -0000
@@ -822,7 +827,8 @@
if( nStyle & WB_NOSHADOW )
nFrameStyle |= SAL_FRAME_STYLE_NOSHADOW;
- if( mpWindowImpl->mnType == WINDOW_DIALOG ||
+ if( mpWindowImpl->mnType == WINDOW_DIALOG ||
+ mpWindowImpl->mnType == WINDOW_TABDIALOG ||
mpWindowImpl->mnType == WINDOW_MODALDIALOG ||
mpWindowImpl->mnType == WINDOW_MODELESSDIALOG )
nFrameStyle |= SAL_FRAME_STYLE_DIALOG;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -r1.817 -r1.818
--- openoffice.org.spec 3 Aug 2006 09:58:40 -0000 1.817
+++ openoffice.org.spec 3 Aug 2006 10:22:27 -0000 1.818
@@ -86,52 +86,49 @@
Patch20: workspace.icuupgrade.patch
Patch21: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
Patch22: workspace.opensymbol01.patch
-Patch23: openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch
+Patch23: workspace.inplaceobjects.patch
Patch24: openoffice.org-2.0.2.rh188467.printingdefaults.patch
Patch25: openoffice.org-2.0.2.ooo64463.extensions.noxaw.patch
Patch26: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
Patch27: workspace.bfsixtyfour.patch
-Patch28: openoffice.org-2.0.3.ooo65318.agg24.canvas.patch
+Patch28: workspace.thbpp4.patch
Patch29: workspace.impress96.patch
Patch30: openoffice.org-2.0.3.ooo65327.builddep.writerperfect.patch
Patch31: workspace.fpicker6.patch
Patch32: workspace.vcl59.patch
Patch33: openoffice.org-2.0.3.oooXXXXX.atkbroken.vcl.patch
Patch34: openoffice.org-2.0.3.oooXXXXX.selinux.bridges.patch
-Patch35: openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch
+Patch35: workspace.vcl60.patch
Patch36: openoffice.org-2.0.2.oooXXXXX.vcl.honourcairofont.patch
Patch37: openoffice.org-2.0.3.rh192588.officecfg.defaultcairooff.patch
Patch38: workspace.fwk40.patch
-Patch39: openoffice.org-2.0.3.ooo65519.printing.samba.patch
-Patch40: workspace.sixtyfour06.patch
-Patch41: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
-Patch42: openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch
-Patch43: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
-Patch44: workspace.kendy10.patch
-Patch45: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
-Patch46: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
-Patch47: ooobuild.VBAObjects.patch
-Patch48: workspace.gcjsix.patch
-Patch49: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
-Patch50: openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch
-Patch51: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
-Patch52: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
-Patch53: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-Patch54: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
-Patch55: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
-Patch56: openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
-Patch57: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
-Patch58: openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
-Patch59: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
-Patch60: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
-Patch61: workspace.os84.patch
-Patch62: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
-Patch63: workspace.configure18.patch
-Patch64: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
-Patch65: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
-Patch66: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
-Patch67: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
-Patch68: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
+Patch39: workspace.sixtyfour06.patch
+Patch40: openoffice.org.2.0.3-ooo66018.cppuhelper.dangerousvisibility.patch
+Patch41: openoffice.org-2.0.3.rhXXXXXX.vcl.annoyingbeeps.patch
+Patch42: workspace.kendy10.patch
+Patch43: openoffice.org-2.0.3.rh187919.gtkunderkde.patch
+Patch44: openoffice.org-2.0.3.ooo67186.sw.eventisULONG.patch
+Patch45: ooobuild.VBAObjects.patch
+Patch46: workspace.gcjsix.patch
+Patch47: openoffice.org-2.0.3.ooo67644.sw.spacing.patch
+Patch48: workspace.vcl63.patch
+Patch49: openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
+Patch50: openoffice.org-2.0.3.ooo67716.svx.overflow.patch
+Patch51: openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
+Patch52: openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+Patch53: openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
+Patch54: workspace.pb17.patch
+Patch55: openoffice.org-2.0.3.rh200118.filter.xalanbroken.patch
+Patch56: openoffice.org-2.0.3.ooo67793.sw.stickymenu.patch
+Patch57: openoffice.org-2.0.3.ooo67829.dtrans.64bitpaste.patch
+Patch58: workspace.os84.patch
+Patch59: openoffice.org-2.0.3.ooo67781.sc.reloadhiddenrows.patch
+Patch60: workspace.configure18.patch
+Patch61: openoffice.org-1.9.129.ooo54603.fontconfig.part2.patch
+Patch62: openoffice.org-2.0.3.ooo67976.svx.macroscrash.patch
+Patch63: openoffice.org-2.0.3.ooo68018.svx.classpathdialog.patch
+Patch64: openoffice.org-2.0.3.ooo68047.vcl.zwj.patch
+Patch65: openoffice.org-2.0.3.ooo68048.vcl.imsurroundtext.patch
%define instdir %{_libdir}/openoffice.org2.0
@@ -952,52 +949,49 @@
%patch20 -p1 -b .workspace.icuupgrade.patch
%patch21 -p1 -b .ooo58606.sw.pre-edit.patch
%patch22 -p1 -b .workspace.opensymbol01.patch
-%patch23 -p1 -b .ooo19976.framework.nofocussteal.patch
+%patch23 -p1 -b .workspace.inplaceobjects.patch
%patch24 -p1
%patch25 -p1 -b .ooo64463.extensions.noxaw.patch
%patch26 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
%patch27 -p1 -b .workspace.bfsixtyfour.patch
-%patch28 -p1 -b .ooo65318.agg24.canvas.patch
+%patch28 -p1 -b .workspace.thbpp4.patch
%patch29 -p1 -b .workspace.impress96.patch
%patch30 -p1 -b .ooo65327.builddep.writerperfect.patch
%patch31 -p1 -b .workspace.fpicker6.patch
%patch32 -p1 -b .workspace.vcl59.patch
%patch33 -p1 -b .oooXXXXX.atkbroken.vcl.patch
%patch34 -p1 -b .oooXXXXX.selinux.bridges.patch
-%patch35 -p1 -b .ooo65767.vcl.removemenukey.patch
+%patch35 -p1 -b .workspace.vcl60.patch
%patch36 -p1 -b .oooXXXXX.vcl.honourcairofont.patch
%patch37 -p1 -b .rh192588.officecfg.defaultcairooff.patch
%patch38 -p1 -b .workspace.fwk40.patch
-%patch39 -p1 -b .ooo65519.printing.samba.patch
-%patch40 -p1 -b .workspace.sixtyfour06.patch
-%patch41 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
-%patch42 -p1 -b .ooo66851.i18npool.x86_64.patch
-%patch43 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
-%patch44 -p1 -b .workspace.kendy10.patch
-%patch45 -p1 -b .rh187919.gtkunderkde.patch
-%patch46 -p1 -b .ooo67186.sw.eventisULONG.patch
-%patch47 -p0 -b .ooobuild.VBAObjects.patch
-%patch48 -p1 -b .workspace.gcjsix.patch
-%patch49 -p1 -b .ooo67644.sw.spacing.patch
-%patch50 -p1 -b .ooo67656.vcl.tabdialogsminimize.patch
-%patch51 -p1 -b .ooo67658.sfx2.reloadcrash.patch
-%patch52 -p1 -b .ooo67716.svx.overflow.patch
-%patch53 -p1 -b .gccXXXXX.basegfx.crash.patch
-%patch54 -p1 -b .ooo67740.xmlhelp.doublefree.patch
-%patch55 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
-%patch56 -p1 -b .ooo67750.sfx2.dontexpandtitle.patch
-%patch57 -p1 -b .rh200118.filter.xalanbroken.patch
-%patch58 -p1 -b .ooo67779.svx.toolbarcrash.patch
-%patch59 -p1 -b .ooo67793.sw.stickymenu.patch
-%patch60 -p1 -b .ooo67829.dtrans.64bitpaste.patch
-%patch61 -p1 -b .workspace.os84.patch
-%patch62 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
-%patch63 -p1 -b .workspace.configure18.patch
-%patch64 -p1 -b .ooo54603.fontconfig.part2.patch
-%patch65 -p1 -b .ooo67976.svx.macroscrash.patch
-%patch66 -p1 -b .ooo68018.svx.classpathdialog.patch
-%patch67 -p1 -b .ooo68047.vcl.zwj.patch
-%patch68 -p1 -b .ooo68048.vcl.imsurroundtext.patch
+%patch39 -p1 -b .workspace.sixtyfour06.patch
+%patch40 -p1 -b .ooo66018.cppuhelper.dangerousvisibility.patch
+%patch41 -p1 -b .rhXXXXXX.vcl.annoyingbeeps.patch
+%patch42 -p1 -b .workspace.kendy10.patch
+%patch43 -p1 -b .rh187919.gtkunderkde.patch
+%patch44 -p1 -b .ooo67186.sw.eventisULONG.patch
+%patch45 -p0 -b .ooobuild.VBAObjects.patch
+%patch46 -p1 -b .workspace.gcjsix.patch
+%patch47 -p1 -b .ooo67644.sw.spacing.patch
+%patch48 -p1 -b .workspace.vcl63.patch
+%patch49 -p1 -b .ooo67658.sfx2.reloadcrash.patch
+%patch50 -p1 -b .ooo67716.svx.overflow.patch
+%patch51 -p1 -b .gccXXXXX.basegfx.crash.patch
+%patch52 -p1 -b .ooo67740.xmlhelp.doublefree.patch
+%patch53 -p1 -b .ooo67337.sfx2.dontshowbuttons.patch
+%patch54 -p1 -b .workspace.pb17.patch
+%patch55 -p1 -b .rh200118.filter.xalanbroken.patch
+%patch56 -p1 -b .ooo67793.sw.stickymenu.patch
+%patch57 -p1 -b .ooo67829.dtrans.64bitpaste.patch
+%patch58 -p1 -b .workspace.os84.patch
+%patch59 -p1 -b .ooo67781.sc.reloadhiddenrows.patch
+%patch60 -p1 -b .workspace.configure18.patch
+%patch61 -p1 -b .ooo54603.fontconfig.part2.patch
+%patch62 -p1 -b .ooo67976.svx.macroscrash.patch
+%patch63 -p1 -b .ooo68018.svx.classpathdialog.patch
+%patch64 -p1 -b .ooo68047.vcl.zwj.patch
+%patch65 -p1 -b .ooo68048.vcl.imsurroundtext.patch
tar xzf %{SOURCE1}
@@ -3733,9 +3727,18 @@
- rh#200805# replace ooo58663 missing glyph patch -> workspace.icuupgrade
- replace ooo#66510# recentlyused fix -> workspace.kendy10
- replace ooo#66067# embeddedobj crash -> workspace.fwk40
+- replace ooo#65519# samba printing ->> workspace.fwk40
- replace ooo#59997# defaultbullets -> workspace.opensymbol01
- replace ooo#65081# switch layout -> workspace.os84
- replace ooo#65308# notes paste -> workspace.impress96
+- replace ooo#19976# nofocussteal -> workspace.inplaceobjects
+- replace ooo#65318# agg24 -> workspace.thbpp4.patch
+- replace ooo#65767# menu key -> workspace.vcl60.patch
+- replace ooo#66851# x86_64 i18npool ->> workspace.sixtyfour06
+- replace ooo#67656# tabdialogs minimize -> workspace.vcl63
+- replace ooo#67750# dont expand title -> workspace.pb17
+- replace ooo#67750# dont expand title ->> workspace.pb17
+- rh#201143# more Indian langpacks
* Wed Jul 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.3-7.7
- rh#200207# -> openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch
workspace.fwk40.patch:
embeddedobj/source/msole/olepersist.cxx | 9 ++++++++-
sfx2/source/doc/docfile.cxx | 20 ++++++++++++--------
sfx2/source/doc/objmisc.cxx | 3 +++
source/msole/olepersist.cxx | 0
tools/inc/urlobj.hxx | 6 ++++--
tools/source/fsys/urlobj.cxx | 6 ++++++
6 files changed, 33 insertions(+), 11 deletions(-)
Index: workspace.fwk40.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.fwk40.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.fwk40.patch 2 Aug 2006 19:22:48 -0000 1.1
+++ workspace.fwk40.patch 3 Aug 2006 10:22:27 -0000 1.2
@@ -61,3 +61,76 @@
}
}
+diff -rup sfx2/source/doc/objmisc.cxx sfx2/source/doc/objmisc.cxx
+--- openoffice.org.org.orig/sfx2/source/doc/objmisc.cxx 2006-05-18 09:48:27.000000000 +0200
++++ openoffice.org/sfx2/source/doc/objmisc.cxx 2006-05-18 09:49:19.000000000 +0200
+@@ -857,6 +857,9 @@ String SfxObjectShell::GetTitle
+ // ggf. Titel aus Dateiname generieren
+ if ( !pImp->aTitle.Len() )
+ pImp->aTitle = aURL.GetBase();
++
++ if ( !pImp->aTitle.Len() )
++ pImp->aTitle = aURL.GetMainURL( INetURLObject::DECODE_WITH_CHARSET );
+ }
+
+ // ganzer Titel
+diff -rup tools/inc/urlobj.hxx tools/inc/urlobj.hxx
+--- openoffice.org.orig/tools/inc/urlobj.hxx 2006-05-18 09:47:10.000000000 +0200
++++ openoffice.org/tools/inc/urlobj.hxx 2006-05-18 09:47:18.000000000 +0200
+@@ -105,6 +105,7 @@ namespace com { namespace sun { namespac
+ #define INET_DB_SCHEME "db:"
+ #define INET_BUGID_SCHEME "bugid:"
+ #define INET_TELNET_SCHEME "telnet://"
++#define INET_SAMBA_SCHEME "smb://"
+
+ #define URL_PREFIX_PRIV_SOFFICE "private:"
+ enum
+@@ -162,8 +163,9 @@ enum INetProtocol
+ INET_PROT_TELNET = 28,
+ INET_PROT_VND_SUN_STAR_EXPAND = 29,
+ INET_PROT_VND_SUN_STAR_TDOC = 30,
+- INET_PROT_GENERIC = 31,
+- INET_PROT_END = 32
++ INET_PROT_SAMBA = 31,
++ INET_PROT_GENERIC = 32,
++ INET_PROT_END = 33
+ };
+
+ //============================================================================
+diff -rup tools/source/fsys/urlobj.cxx tools/source/fsys/urlobj.cxx
+--- openoffice.org.orig/tools/source/fsys/urlobj.cxx 2006-05-18 09:47:10.000000000 +0200
++++ openoffice.org/tools/source/fsys/urlobj.cxx 2006-05-18 09:47:18.000000000 +0200
+@@ -288,6 +288,8 @@ using namespace com::sun;
+ vnd-sun-star-tdoc-url = "VND.SUN.STAR.TDOC:/" segment *("/" segment)
+ segment = *pchar
+
++ ; private (http://ubiqx.org/cifs/Appendix-D.html)
++ samba-url = smb://[[[authdomain;]user@]host[:port][/share[/path][/name]]][?context]
+
+ ; private
+ unknown-url = scheme ":" 1*uric
+@@ -452,6 +454,8 @@ static INetURLObject::SchemeInfo const a
+ false, false, false, false, false },
+ { "vnd.sun.star.tdoc", "vnd.sun.star.tdoc:", 0, false, false, false,
+ false, false, false, true, false },
++ { "smb", "smb://", 139, true, true, false, true, true, true, true,
++ false },
+ { "", "", 0, false, false, false, false, false, false, false, false } };
+
+ // static
+@@ -2086,6 +2090,7 @@ INetURLObject::getPrefix(sal_Unicode con
+ INET_PROT_PRIV_SOFFICE, PrefixInfo::INTERNAL },
+ { "slot:", "staroffice.slot:", INET_PROT_SLOT,
+ PrefixInfo::INTERNAL },
++ { "smb:", 0, INET_PROT_SAMBA, PrefixInfo::OFFICIAL },
+ { "staroffice.component:", ".component:", INET_PROT_COMPONENT,
+ PrefixInfo::EXTERNAL },
+ { "staroffice.db:", "db:", INET_PROT_DB, PrefixInfo::EXTERNAL },
+@@ -2472,6 +2477,7 @@ bool INetURLObject::parsePath(INetProtoc
+ return false;
+
+ case INET_PROT_FTP:
++ case INET_PROT_SAMBA:
+ case INET_PROT_IMAP:
+ if (pPos < pEnd && *pPos != '/')
+ return false;
workspace.sixtyfour06.patch:
breakiterator/xdictionary.cxx | 12 +++---
fpicker/source/unx/gnome/SalGtkFilePicker.cxx | 8 ++--
fpicker/source/unx/gnome/SalGtkFolderPicker.cxx | 2 -
inc/solar.h | 0
source/breakiterator/xdictionary.cxx | 0
tools/inc/solar.h | 3 -
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 46 ++++++++++++------------
7 files changed, 34 insertions(+), 37 deletions(-)
Index: workspace.sixtyfour06.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/workspace.sixtyfour06.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- workspace.sixtyfour06.patch 27 Jun 2006 15:26:36 -0000 1.1
+++ workspace.sixtyfour06.patch 3 Aug 2006 10:22:27 -0000 1.2
@@ -287,3 +287,33 @@
#ifdef _SOLAR__PRIVATE
#undef _SOLAR__PRIVATE
#endif
+Index: source/breakiterator/xdictionary.cxx
+===================================================================
+RCS file: /cvs/l10n/i18npool/source/breakiterator/xdictionary.cxx,v
+retrieving revision 1.11
+diff -u -r1.11 xdictionary.cxx
+--- openoffice.org.orig/i18npoolsource/breakiterator/xdictionary.cxx 1 Nov 2005 14:52:31 -0000 1.11
++++ openoffice.org/i18npool/source/breakiterator/xdictionary.cxx 29 Jun 2006 09:29:14 -0000
+@@ -67,16 +70,16 @@
+ aBuf.appendAscii( "dict_" ).appendAscii( lang ).appendAscii( SAL_DLLEXTENSION );
+ hModule = osl_loadModule( aBuf.makeStringAndClear().pData, SAL_LOADMODULE_DEFAULT );
+ if( hModule ) {
+- int (*func)();
+- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
++ sal_IntPtr (*func)();
++ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getExistMark").pData );
+ existMark = (sal_uInt8*) (*func)();
+- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
++ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex1").pData );
+ index1 = (sal_Int16*) (*func)();
+- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
++ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getIndex2").pData );
+ index2 = (sal_Int32*) (*func)();
+- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
++ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getLenArray").pData );
+ lenArray = (sal_Int32*) (*func)();
+- func = (int(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
++ func = (sal_IntPtr(*)()) osl_getSymbol( hModule, OUString::createFromAscii("getDataArea").pData );
+ dataArea = (sal_Unicode*) (*func)();
+ }
+ else
--- openoffice.org-2.0.1-ooo19976.framework.nofocussteal.patch DELETED ---
--- openoffice.org-2.0.3.ooo65318.agg24.canvas.patch DELETED ---
--- openoffice.org-2.0.3.ooo65519.printing.samba.patch DELETED ---
--- openoffice.org-2.0.3.ooo65767.vcl.removemenukey.patch DELETED ---
--- openoffice.org-2.0.3.ooo66851.i18npool.x86_64.patch DELETED ---
--- openoffice.org-2.0.3.ooo67656.vcl.tabdialogsminimize.patch DELETED ---
--- openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch DELETED ---
--- openoffice.org-2.0.3.ooo67779.svx.toolbarcrash.patch DELETED ---
More information about the fedora-cvs-commits
mailing list