rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch, NONE, 1.1.2.1 openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch, 1.1.2.1, 1.1.2.2 openoffice.org.spec, 1.1440.2.14, 1.1440.2.15
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Mar 11 13:28:36 UTC 2008
- Previous message (by thread): rpms/vnc/devel Makefile.am,1.1,1.2 vnc.spec,1.184,1.185
- Next message (by thread): rpms/file-roller/devel .cvsignore, 1.66, 1.67 file-roller.spec, 1.116, 1.117 sources, 1.67, 1.68
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26582
Modified Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
openoffice.org.spec
Added Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
Log Message:
merge
openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch:
--- NEW FILE openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch ---
Index: source/misc/imagemgr.cxx
===================================================================
RCS file: /cvs/util/svtools/source/misc/imagemgr.cxx,v
retrieving revision 1.49
diff -u -r1.49 imagemgr.cxx
--- openoffice.org.orig/svtools/source/misc/imagemgr.cxx 18 Jul 2007 08:56:21 -0000 1.49
+++ openoffice.org/svtools/source/misc/imagemgr.cxx 11 Mar 2008 12:14:47 -0000
@@ -614,6 +614,17 @@
static ImageList* _pBigOfficeImgList = NULL;
static ImageList* _pSmallHCOfficeImgList = NULL;
static ImageList* _pBigHCOfficeImgList = NULL;
+ static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
+
+ //If the style has been changed, throw away our cache of the older images
+ if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle())
+ {
+ delete _pSmallOfficeImgList, _pSmallOfficeImgList = NULL;
+ delete _pBigOfficeImgList, _pBigOfficeImgList = NULL;
+ delete _pSmallHCOfficeImgList, _pSmallHCOfficeImgList = NULL;
+ delete _pBigHCOfficeImgList, _pBigHCOfficeImgList = NULL;
+ nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
+ }
// #i21242# MT: For B&W we need the HC Image and must transform.
// bHiContrast is TRUE for all dark backgrounds, but we need HC Images for HC White also,
@@ -682,6 +693,18 @@
static ImageList* _pBigImageList = NULL;
static ImageList* _pSmallHCImageList = NULL;
static ImageList* _pBigHCImageList = NULL;
+ static ULONG nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
+
+ //If the style has been changed, throw away our cache of the older images
+ if (nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle())
+ {
+ delete _pSmallImageList, _pSmallImageList = NULL;
+ delete _pBigImageList, _pBigImageList = NULL;
+ delete _pSmallHCImageList, _pSmallHCImageList = NULL;
+ delete _pBigHCImageList, _pBigHCImageList = NULL;
+ nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle();
+ }
+
if ( bBig )
{
Index: inc/sfx2/mnuitem.hxx
===================================================================
RCS file: /cvs/framework/sfx2/inc/sfx2/mnuitem.hxx,v
retrieving revision 1.2
diff -u -r1.2 mnuitem.hxx
--- openoffice.org.orig/sfx2/inc/sfx2/mnuitem.hxx 11 Apr 2007 21:23:52 -0000 1.2
+++ openoffice.org/sfx2/inc/sfx2/mnuitem.hxx 11 Mar 2008 13:05:47 -0000
@@ -172,6 +172,7 @@
{
PopupMenu* pMenu;
BOOL m_bWasHiContrastMode;
+ ULONG m_nSymbolsStyle;
BOOL m_bShowMenuImages;
protected:
Index: inc/sfx2/tbxctrl.hxx
===================================================================
RCS file: /cvs/framework/sfx2/inc/sfx2/tbxctrl.hxx,v
retrieving revision 1.2
diff -u -r1.2 tbxctrl.hxx
--- openoffice.org.orig/sfx2/inc/sfx2/tbxctrl.hxx 11 Apr 2007 21:31:02 -0000 1.2
+++ openoffice.org/sfx2/inc/sfx2/tbxctrl.hxx 11 Mar 2008 13:05:47 -0000
@@ -419,6 +419,7 @@
BOOL bBigImages;
PopupMenu* pMenu;
BOOL m_bWasHiContrastMode;
+ ULONG m_nSymbolsStyle;
BOOL m_bShowMenuImages;
};
Index: source/menu/mnuitem.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/menu/mnuitem.cxx,v
retrieving revision 1.20
diff -u -r1.20 mnuitem.cxx
--- openoffice.org.orig/sfx2/source/menu/mnuitem.cxx 27 Jun 2007 23:31:17 -0000 1.20
+++ openoffice.org/sfx2/source/menu/mnuitem.cxx 11 Mar 2008 13:05:48 -0000
@@ -512,6 +512,7 @@
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
m_bWasHiContrastMode = bIsHiContrastMode;
+ m_nSymbolsStyle = rSettings.GetSymbolsStyle();
m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory());
@@ -538,11 +539,14 @@
BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
+ BOOL nSymbolsStyle = rSettings.GetSymbolsStyle();
if (( bIsHiContrastMode != m_bWasHiContrastMode ) ||
- ( bShowMenuImages != m_bShowMenuImages ) )
+ ( nSymbolsStyle != m_nSymbolsStyle ) ||
+ ( bShowMenuImages != m_bShowMenuImages ))
{
m_bWasHiContrastMode = bIsHiContrastMode;
+ m_nSymbolsStyle = nSymbolsStyle;
m_bShowMenuImages = bShowMenuImages;
USHORT nCount = pActMenu->GetItemCount();
Index: source/toolbox/tbxitem.cxx
===================================================================
RCS file: /cvs/framework/sfx2/source/toolbox/tbxitem.cxx,v
retrieving revision 1.67
diff -u -r1.67 tbxitem.cxx
--- openoffice.org.orig/sfx2/source/toolbox/tbxitem.cxx 6 Jul 2007 10:17:09 -0000 1.67
+++ openoffice.org/sfx2/source/toolbox/tbxitem.cxx 11 Mar 2008 13:05:49 -0000
@@ -1556,6 +1556,7 @@
// Determine the current background color of the menus
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark();
+ m_nSymbolsStyle = rSettings.GetSymbolsStyle();
m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
SetImage( String() );
@@ -1831,12 +1832,15 @@
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
+ ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
if (( bIsHiContrastMode != m_bWasHiContrastMode ) ||
- ( bShowMenuImages != m_bShowMenuImages ) )
+ ( nSymbolsStyle != m_nSymbolsStyle ) ||
+ ( bShowMenuImages != m_bShowMenuImages))
{
m_bWasHiContrastMode = bIsHiContrastMode;
+ m_nSymbolsStyle = nSymbolsStyle;
m_bShowMenuImages = bShowMenuImages;
USHORT nCount = pActMenu->GetItemCount();
openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch:
Index: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 10 Mar 2008 16:00:23 -0000 1.1.2.1
+++ openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch 11 Mar 2008 13:28:15 -0000 1.1.2.2
@@ -1,97 +1,22 @@
-Index: unx/gtk/window/gtkframe.cxx
+Index: salgeom.hxx
===================================================================
-RCS file: /cvs/gsl/vcl/unx/gtk/window/gtkframe.cxx,v
-retrieving revision 1.72.8.2
-diff -u -r1.72.8.2 gtkframe.cxx
---- openoffice.org.orig/vcl/unx/gtk/window/gtkframe.cxx 23 Jan 2008 17:17:10 -0000 1.72.8.2
-+++ openoffice.org/vcl/unx/gtk/window/gtkframe.cxx 10 Mar 2008 15:32:32 -0000
-@@ -1158,8 +1169,8 @@
+RCS file: /cvs/gsl/vcl/inc/vcl/salgeom.hxx,v
+retrieving revision 1.2
+diff -u -r1.2 salgeom.hxx
+--- openoffice.org.orig/vcl/inc/vcl/salgeom.hxx 11 Apr 2007 18:06:34 -0000 1.2
++++ openoffice.org/vcl/inc/vcl/salgeom.hxx 11 Mar 2008 09:44:47 -0000
+@@ -38,11 +38,11 @@
- if( m_pParent )
- {
-- nX = ((long)m_pParent->maGeometry.nWidth - (long)maGeometry.nWidth)/2;
-- nY = ((long)m_pParent->maGeometry.nHeight - (long)maGeometry.nHeight)/2;
-+ nX = ((int)m_pParent->maGeometry.nWidth - (int)maGeometry.nWidth)/2;
-+ nY = ((int)m_pParent->maGeometry.nHeight - (int)maGeometry.nHeight)/2;
-
- }
- else
-@@ -1191,8 +1202,8 @@
- break;
- }
- }
-- nX = nScreenX + (nScreenWidth - (long)maGeometry.nWidth)/2;
-- nY = nScreenY + (nScreenHeight - (long)maGeometry.nHeight)/2;
-+ nX = nScreenX + (nScreenWidth - (int)maGeometry.nWidth)/2;
-+ nY = nScreenY + (nScreenHeight - (int)maGeometry.nHeight)/2;
- }
- SetPosSize( nX, nY, 0, 0, SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y );
- }
-@@ -1426,25 +1438,25 @@
- Size aScreenSize = GetX11SalData()->GetDisplay()->GetScreenSize( m_nScreen );
- if( ! (m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) )
- {
-- if( nX < (long)maGeometry.nLeftDecoration )
-+ if( nX < (int)maGeometry.nLeftDecoration )
- nX = maGeometry.nLeftDecoration;
-- if( nY < (long)maGeometry.nTopDecoration )
-+ if( nY < (int)maGeometry.nTopDecoration )
- nY = maGeometry.nTopDecoration;
-- if( (nX + (long)maGeometry.nWidth + (long)maGeometry.nRightDecoration) > (long)aScreenSize.Width() )
-+ if( (nX + (int)maGeometry.nWidth + (int)maGeometry.nRightDecoration) > aScreenSize.Width() )
- nX = aScreenSize.Width() - maGeometry.nWidth - maGeometry.nRightDecoration;
-- if( (nY + (long)maGeometry.nHeight + (long)maGeometry.nBottomDecoration) > (long)aScreenSize.Height() )
-+ if( (nY + (int)maGeometry.nHeight + (int)maGeometry.nBottomDecoration) > aScreenSize.Height() )
- nY = aScreenSize.Height() - maGeometry.nHeight - maGeometry.nBottomDecoration;
- }
- else
- {
-- if( nX + (long)maGeometry.nWidth < 10 )
-- nX = 10 - (long)maGeometry.nWidth;
-- if( nY + (long)maGeometry.nHeight < 10 )
-- nY = 10 - (long)maGeometry.nHeight;
-- if( nX > (long)aScreenSize.Width() - 10 )
-- nX = (long)aScreenSize.Width() - 10;
-- if( nY > (long)aScreenSize.Height() - 10 )
-- nY = (long)aScreenSize.Height() - 10;
-+ if( nX + (int)maGeometry.nWidth < 10 )
-+ nX = 10 - (int)maGeometry.nWidth;
-+ if( nY + (int)maGeometry.nHeight < 10 )
-+ nY = 10 - (int)maGeometry.nHeight;
-+ if( nX > aScreenSize.Width() - 10 )
-+ nX = aScreenSize.Width() - 10;
-+ if( nY > aScreenSize.Height() - 10 )
-+ nY = aScreenSize.Height() - 10;
- }
-
- if( nX != maGeometry.nX || nY != maGeometry.nY )
-Index: unx/source/window/salframe.cxx
-===================================================================
-RCS file: /cvs/gsl/vcl/unx/source/window/salframe.cxx,v
-retrieving revision 1.219.110.3
-diff -u -r1.219.110.3 salframe.cxx
---- openoffice.org.orig/vcl/unx/source/window/salframe.cxx 25 Jan 2008 16:37:31 -0000 1.219.110.3
-+++ openoffice.org/unx/source/window/salframe.cxx 10 Mar 2008 15:32:43 -0000
-@@ -1714,14 +1714,14 @@
- }
-
- // adjust position so that frame fits onto screen
-- if( aPosSize.Right()+(long)aGeom.nRightDecoration > aScreenSize.Width()-1 )
-- aPosSize.Move( (long)aScreenSize.Width() - (long)aPosSize.Right() - (long)aGeom.nRightDecoration, 0 );
-- if( aPosSize.Bottom()+(long)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
-- aPosSize.Move( 0, (long)aScreenSize.Height() - (long)aPosSize.Bottom() - (long)aGeom.nBottomDecoration );
-- if( aPosSize.Left() < (long)aGeom.nLeftDecoration )
-- aPosSize.Move( (long)aGeom.nLeftDecoration - (long)aPosSize.Left(), 0 );
-- if( aPosSize.Top() < (long)aGeom.nTopDecoration )
-- aPosSize.Move( 0, (long)aGeom.nTopDecoration - (long)aPosSize.Top() );
-+ if( aPosSize.Right()+(int)aGeom.nRightDecoration > aScreenSize.Width()-1 )
-+ aPosSize.Move( aScreenSize.Width() - aPosSize.Right() - (int)aGeom.nRightDecoration, 0 );
-+ if( aPosSize.Bottom()+(int)aGeom.nBottomDecoration > aScreenSize.Height()-1 )
-+ aPosSize.Move( 0, aScreenSize.Height() - aPosSize.Bottom() - (int)aGeom.nBottomDecoration );
-+ if( aPosSize.Left() < (int)aGeom.nLeftDecoration )
-+ aPosSize.Move( (int)aGeom.nLeftDecoration - aPosSize.Left(), 0 );
-+ if( aPosSize.Top() < (int)aGeom.nTopDecoration )
-+ aPosSize.Move( 0, (int)aGeom.nTopDecoration - aPosSize.Top() );
- }
-
- // resize with new args
+ typedef struct _SalFrameGeometry {
+ // screen position of upper left corner of drawable area in pixel
+- int nX, nY;
++ long nX, nY;
+ // dimensions of the drawable area in pixel
+- unsigned int nWidth, nHeight;
++ unsigned long nWidth, nHeight;
+ // thickness of the decoration in pixel
+- unsigned int nLeftDecoration,
++ unsigned long nLeftDecoration,
+ nTopDecoration,
+ nRightDecoration,
+ nBottomDecoration;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.14
retrieving revision 1.1440.2.15
diff -u -r1.1440.2.14 -r1.1440.2.15
--- openoffice.org.spec 11 Mar 2008 09:18:25 -0000 1.1440.2.14
+++ openoffice.org.spec 11 Mar 2008 13:28:15 -0000 1.1440.2.15
@@ -140,6 +140,7 @@
Patch67: openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
Patch68: openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
Patch69: openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
+Patch70: openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
%define instdir %{_libdir}/openoffice.org
%define OFFICEUPD 300
@@ -1097,6 +1098,7 @@
%patch67 -p1 -b .ooo86588.sw.buildfix.patch
%patch68 -p1 -b .ooo86866.embeddedobj.plusequalsoperator.patch
%patch69 -p1 -b .ooo86882.vcl.unsigned_int_to_long.patch
+%patch70 -p1 -b .ooo86924.sfx2.iconchanges.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -1565,7 +1567,7 @@
# rhbz#156067 don't version the icons
sed -i -e s/$ICONPRODUCTVERSION//g $file
# rhbz#156677 remove the version from Name=
- sed -i -e s/$LONGICONPRODUCTVERSION//g $file
+ sed -i -e s/$LONGICONPRODUCTVERSION //g $file
done
echo "StartupNotify=true" >> base.desktop
echo "TryExec=oobase" >> base.desktop
@@ -2866,7 +2868,7 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Mon Mar 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.1.1
+* Tue Mar 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.1.1
- extend selinux bodge to ia64
- drop integrated workspace.notes2.patch
- drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2878,14 +2880,9 @@
- add workspace.cmcfixes43.patch
- add openoffice.org-3.0.0.ooo86588.sw.buildfix.patch
-* Mon Mar 10 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.2
+* Tue Mar 11 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.2
- Resolves: rhbz#429632 add openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
-
-* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
-- next release candidate
-- rhbz#293791 Restore draw back to the menus and revert to upstream app names
-- drop integrated openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
-- Resolves: rhbz#436518 add openoffice.org-2.3.0.ooo86866.embeddedobj.plusequalsoperator.patch
+- Resolves: rhbz#435590 add openoffice.org-2.4.0.ooo86924.sfx2.iconchanges.patch
* Sun Mar 09 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-10.1
- next release candidate
- Previous message (by thread): rpms/vnc/devel Makefile.am,1.1,1.2 vnc.spec,1.184,1.185
- Next message (by thread): rpms/file-roller/devel .cvsignore, 1.66, 1.67 file-roller.spec, 1.116, 1.117 sources, 1.67, 1.68
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list