rpms/openoffice.org/devel workspace.gtkmenuimages.patch, NONE, 1.1 workspace.transogl03redux.patch, NONE, 1.1 openoffice.org-1.9.87.rh151357.setlangtolocale.patch, 1.29, 1.30 openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch, 1.54, 1.55 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.13, 1.14 openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch, 1.4, 1.5 openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch, 1.2, 1.3 openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch, 1.3, 1.4 openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch, 1.3, 1.4 openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch, 1.1, 1.2 openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch, 1.1, 1.2 openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch, 1.1, 1.2 openoffice.org.spec, 1.1791, 1.1792 openoffice.org-3.0.0.ooo95318.system-showicons.patch, 1.2, NONE workspace.cmcfixes48.patch, 1.7, NONE workspace.cmcfixes49.patch, 1.5, NONE workspace.cmcfixes50.patch, 1.7, NONE workspace.cmcfixes51.patch, 1.1, NONE workspace.configuretoplevel.patch, 1.1, NONE workspace.fpicker8.patch, 1.1, NONE workspace.fwk92.patch, 1.1, NONE workspace.fwk99.patch, 1.1, NONE workspace.gcc44.patch, 1.3, NONE workspace.hb12.patch, 1.2, NONE workspace.i18n45.patch, 1.2, NONE workspace.impressfontsize.patch, 1.4, NONE workspace.impressfontsize.tar.gz, 1.1, NONE workspace.locales31.patch, 1.1, NONE workspace.sb101.patch, 1.1, NONE workspace.selinux01.patch, 1.1, NONE workspace.sw31bf02.patch, 1.2, NONE workspace.tkr16.patch, 1.1, NONE workspace.transogl03.patch, 1.2, NONE workspace.vcl94.patch, 1.2, NONE workspace.vcl95.patch, 1.2, NONE workspace.vcl96.patch, 1.1, NONE workspace.vcl97.patch, 1.4, NONE workspace.vcl98.patch, 1.6, NONE
Caolan McNamara
caolanm at fedoraproject.org
Thu Feb 12 14:25:04 UTC 2009
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27580
Modified Files:
openoffice.org-1.9.87.rh151357.setlangtolocale.patch
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
openoffice.org.spec
Added Files:
workspace.gtkmenuimages.patch workspace.transogl03redux.patch
Removed Files:
openoffice.org-3.0.0.ooo95318.system-showicons.patch
workspace.cmcfixes48.patch workspace.cmcfixes49.patch
workspace.cmcfixes50.patch workspace.cmcfixes51.patch
workspace.configuretoplevel.patch workspace.fpicker8.patch
workspace.fwk92.patch workspace.fwk99.patch
workspace.gcc44.patch workspace.hb12.patch
workspace.i18n45.patch workspace.impressfontsize.patch
workspace.impressfontsize.tar.gz workspace.locales31.patch
workspace.sb101.patch workspace.selinux01.patch
workspace.sw31bf02.patch workspace.tkr16.patch
workspace.transogl03.patch workspace.vcl94.patch
workspace.vcl95.patch workspace.vcl96.patch
workspace.vcl97.patch workspace.vcl98.patch
Log Message:
move to 3.1.0, drop integrated patches
workspace.gtkmenuimages.patch:
--- NEW FILE workspace.gtkmenuimages.patch ---
Index: sfx2/source/menu/mnuitem.cxx
===================================================================
--- sfx2/source/menu/mnuitem.cxx (.../tags/DEV300_m41) (revision 267661)
+++ sfx2/source/menu/mnuitem.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -452,7 +452,7 @@
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_nSymbolsStyle = rSettings.GetSymbolsStyle();
m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark();
- m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ m_bShowMenuImages = rSettings.GetUseImagesInMenus();
Reference<com::sun::star::lang::XMultiServiceFactory> aXMultiServiceFactory(::comphelper::getProcessServiceFactory());
::framework::MenuConfiguration aConf( aXMultiServiceFactory );
@@ -478,7 +478,7 @@
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
- BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
if (( nSymbolsStyle != m_nSymbolsStyle ) ||
( bIsHiContrastMode != m_bWasHiContrastMode ) ||
Index: sfx2/source/menu/virtmenu.cxx
===================================================================
--- sfx2/source/menu/virtmenu.cxx (.../tags/DEV300_m41) (revision 267661)
+++ sfx2/source/menu/virtmenu.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -443,7 +443,7 @@
pMnuCtrl->Bind( this, nSlotId, pSVMenu->GetItemText(nSlotId),
pSVMenu->GetHelpText(nSlotId), *pBindings);
- if ( aOptions.IsMenuIconsEnabled() )
+ if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
@@ -540,7 +540,7 @@
pMnuCtrl->Bind( this, nSlotId, pSVMenu->GetItemText(nSlotId), pSVMenu->GetHelpText(nSlotId), *pBindings);
}
- if ( aOptions.IsMenuIconsEnabled() )
+ if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
{
Image aImage;
if ( bIsAddonPopupMenu || framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
@@ -611,10 +611,9 @@
IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
{
- SvtMenuOptions aOptions;
USHORT nItemCount = pSVMenu->GetItemCount();
SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame();
- BOOL bIcons = aOptions.IsMenuIconsEnabled();
+ BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
BOOL bIsHiContrastMode = IsHiContrastMode();
Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame()->GetFrameInterface() );
@@ -681,8 +680,7 @@
void SfxVirtualMenu::UpdateImages()
{
- SvtMenuOptions aOptions;
- BOOL bIcons = aOptions.IsMenuIconsEnabled();
+ BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
if ( bIcons )
{
@@ -731,10 +729,9 @@
if ( !pMenu )
return;
- SvtMenuOptions aOptions;
framework::AddonsOptions aAddonOptions;
- BOOL bIcons = aOptions.IsMenuIconsEnabled();
+ BOOL bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
if ( bIcons )
{
BOOL bIsHiContrastMode = IsHiContrastMode();
@@ -929,7 +926,7 @@
pMenu->InsertItem( SID_ADDONS, aAddonsTitle );
pMenu->SetPopupMenu( SID_ADDONS, pAddonMenu );
- if ( SvtMenuOptions().IsMenuIconsEnabled() )
+ if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
{
rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
Index: sfx2/source/toolbox/tbxitem.cxx
===================================================================
--- sfx2/source/toolbox/tbxitem.cxx (.../tags/DEV300_m41) (revision 267661)
+++ sfx2/source/toolbox/tbxitem.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -1511,7 +1511,7 @@
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_nSymbolsStyle = rSettings.GetSymbolsStyle();
m_bWasHiContrastMode = rSettings.GetMenuColor().IsDark();
- m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ m_bShowMenuImages = rSettings.GetUseImagesInMenus();
SetImage( String() );
}
@@ -1787,7 +1787,7 @@
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
ULONG nSymbolsStyle = rSettings.GetSymbolsStyle();
BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
- BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
if (( nSymbolsStyle != m_nSymbolsStyle ) ||
( bIsHiContrastMode != m_bWasHiContrastMode ) ||
Index: vcl/source/window/window.cxx
===================================================================
--- vcl/source/window/window.cxx (.../tags/DEV300_m41) (revision 267661)
+++ vcl/source/window/window.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -497,24 +497,6 @@
}
}
- // Detect if images in menus are allowed or not
- {
- sal_Bool bTmp = sal_False, bUseImagesInMenus = sal_True;
- utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
- vcl::unohelper::GetMultiServiceFactory(),
- OUString::createFromAscii( "org.openoffice.Office.Common/View/Menu" ) ); // note: case sensisitive !
- if ( aNode.isValid() )
- {
- ::com::sun::star::uno::Any aValue = aNode.getNodeValue( OUString::createFromAscii( "ShowIconsInMenues" ) );
- if( aValue >>= bTmp )
- bUseImagesInMenus = bTmp;
- }
-
- aStyleSettings = rSettings.GetStyleSettings();
- aStyleSettings.SetUseImagesInMenus( bUseImagesInMenus );
- rSettings.SetStyleSettings( aStyleSettings );
- }
-
#ifdef DBG_UTIL
// Evt. AppFont auf Fett schalten, damit man feststellen kann,
// ob fuer die Texte auf anderen Systemen genuegend Platz
Index: vcl/aqua/source/window/salframe.cxx
===================================================================
--- vcl/aqua/source/window/salframe.cxx (.../tags/DEV300_m41) (revision 267661)
+++ vcl/aqua/source/window/salframe.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -1175,6 +1175,9 @@
// set scrollbar size
aStyleSettings.SetScrollBarSize( [NSScroller scrollerWidth] );
+
+ // images in menus false for MacOSX
+ aStyleSettings.SetUseImagesInMenus( false );
rSettings.SetStyleSettings( aStyleSettings );
Index: vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
===================================================================
--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx (.../tags/DEV300_m41) (revision 267661)
+++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -96,6 +96,7 @@
GtkWidget * gMenuItemMenuWidget;
GtkWidget * gMenuItemCheckMenuWidget;
GtkWidget * gMenuItemRadioMenuWidget;
+ GtkWidget * gImageMenuItem;
GtkWidget * gTooltipPopup;
GtkWidget * gProgressBar;
GtkWidget * gTreeView;
@@ -131,6 +132,7 @@
gMenuItemMenuWidget( NULL ),
gMenuItemCheckMenuWidget( NULL ),
gMenuItemRadioMenuWidget( NULL ),
+ gImageMenuItem( NULL ),
gTooltipPopup( NULL ),
gProgressBar( NULL ),
gTreeView( NULL ),
@@ -3402,6 +3404,11 @@
else
aStyleSet.SetCursorBlinkTime( STYLE_CURSOR_NOBLINKTIME );
+ gboolean showmenuicons = true;
+ pSettings = gtk_widget_get_settings( gWidgetData[m_nScreen].gImageMenuItem );
+ g_object_get( pSettings, "gtk-menu-images", &showmenuicons, (char *)NULL );
+ aStyleSet.SetUseImagesInMenus( showmenuicons );
+
// set scrollbar settings
gint slider_width = 14;
gint trough_border = 1;
@@ -3841,10 +3848,12 @@
gWidgetData[nScreen].gMenuItemMenuWidget = gtk_menu_item_new_with_label( "b" );
gWidgetData[nScreen].gMenuItemCheckMenuWidget = gtk_check_menu_item_new_with_label( "b" );
gWidgetData[nScreen].gMenuItemRadioMenuWidget = gtk_radio_menu_item_new_with_label( NULL, "b" );
+ gWidgetData[nScreen].gImageMenuItem = gtk_image_menu_item_new();
gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemMenuWidget );
gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemCheckMenuWidget );
gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gMenuItemRadioMenuWidget );
+ gtk_menu_shell_append( GTK_MENU_SHELL( gWidgetData[nScreen].gMenuWidget ), gWidgetData[nScreen].gImageMenuItem );
// do what NWAddWidgetToCacheWindow does except adding to def container
gtk_widget_realize( gWidgetData[nScreen].gMenuWidget );
@@ -3859,10 +3868,14 @@
gtk_widget_realize( gWidgetData[nScreen].gMenuItemRadioMenuWidget );
gtk_widget_ensure_style( gWidgetData[nScreen].gMenuItemRadioMenuWidget );
+ gtk_widget_realize( gWidgetData[nScreen].gImageMenuItem );
+ gtk_widget_ensure_style( gWidgetData[nScreen].gImageMenuItem );
+
gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuWidget );
gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemMenuWidget );
gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemCheckMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemCheckMenuWidget );
gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gMenuItemRadioMenuWidget ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gMenuItemRadioMenuWidget );
+ gWidgetDefaultFlags[ (long)gWidgetData[nScreen].gImageMenuItem ] = GTK_WIDGET_FLAGS( gWidgetData[nScreen].gImageMenuItem );
}
}
Index: framework/source/uielement/newmenucontroller.cxx
===================================================================
--- framework/source/uielement/newmenucontroller.cxx (.../tags/DEV300_m41) (revision 267661)
+++ framework/source/uielement/newmenucontroller.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -491,7 +491,7 @@
if ( pPopupMenu )
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- sal_Bool bShowImages( SvtMenuOptions().IsMenuIconsEnabled() );
+ sal_Bool bShowImages( rSettings.GetUseImagesInMenus() );
sal_Bool bHiContrast( rSettings.GetMenuColor().IsDark() );
PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
@@ -617,10 +617,12 @@
m_xFrame = xFrame;
m_aCommandURL = aCommandURL;
m_bInitialized = sal_True;
- m_bShowImages = SvtMenuOptions().IsMenuIconsEnabled();
-
+
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- m_bHiContrast = rSettings.GetMenuColor().IsDark();
+
+ m_bShowImages = rSettings.GetUseImagesInMenus();
+ m_bHiContrast = rSettings.GetMenuColor().IsDark();
+
m_bNewMenu = m_aCommandURL.equalsAscii( ".uno:AddDirect" );
}
}
Index: framework/source/uielement/menubarmanager.cxx
===================================================================
--- framework/source/uielement/menubarmanager.cxx (.../tags/DEV300_m41) (revision 267661)
+++ framework/source/uielement/menubarmanager.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -1060,7 +1060,8 @@
{
// set/unset hiding disabled menu entries
sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
- sal_Bool bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+ sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
sal_Bool bHasDisabledEntries = SvtCommandOptions().HasEntries( SvtCommandOptions::CMDOPTION_DISABLED );
ResetableGuard aGuard( m_aLock );
@@ -1084,7 +1085,6 @@
UpdateSpecialWindowMenu( pMenu );
// Check if some modes have changed so we have to update our menu images
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
sal_Bool bIsHiContrast = rSettings.GetMenuColor().IsDark();
sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
@@ -1592,7 +1592,7 @@
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bWasHiContrast = rSettings.GetMenuColor().IsDark();
- m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ m_bShowMenuImages = rSettings.GetUseImagesInMenus();
m_bRetrieveImages = sal_False;
sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
Index: framework/source/uielement/controlmenucontroller.cxx
===================================================================
--- framework/source/uielement/controlmenucontroller.cxx (.../tags/DEV300_m41) (revision 267661)
+++ framework/source/uielement/controlmenucontroller.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -229,7 +229,8 @@
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bWasHiContrast = rSettings.GetMenuColor().IsDark();
- m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ m_bShowMenuImages = rSettings.GetUseImagesInMenus();
+
}
ControlMenuController::~ControlMenuController()
@@ -404,7 +405,7 @@
// Check if some modes have changed so we have to update our menu images
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
sal_Bool bIsHiContrast = rSettings.GetMenuColor().IsDark();
- sal_Bool bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
sal_Bool bUpdateImages = (( m_bWasHiContrast != bIsHiContrast ) || ( bShowMenuImages != m_bShowMenuImages ));
if ( bUpdateImages )
Index: framework/source/uielement/toolbarsmenucontroller.cxx
===================================================================
--- framework/source/uielement/toolbarsmenucontroller.cxx (.../tags/DEV300_m41) (revision 267661)
+++ framework/source/uielement/toolbarsmenucontroller.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -213,7 +213,7 @@
Image aImage;
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- if ( SvtMenuOptions().IsMenuIconsEnabled() )
+ if ( rSettings.GetUseImagesInMenus() )
aImage = GetImageFromURL( m_xFrame, rCommandURL, FALSE, rSettings.GetMenuColor().IsDark() );
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXPopupMenu::GetImplementation( rPopupMenu );
Index: framework/source/classes/bmkmenu.cxx
===================================================================
--- framework/source/classes/bmkmenu.cxx (.../tags/DEV300_m41) (revision 267661)
+++ framework/source/classes/bmkmenu.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -175,14 +175,15 @@
aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_NEWMENU );
else if ( m_nType == BmkMenu::BMK_WIZARDMENU )
aDynamicMenuEntries = SvtDynamicMenuOptions().GetMenu( E_WIZARDMENU );
- BOOL bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+ BOOL bShowMenuImages = rSettings.GetUseImagesInMenus();
+
::rtl::OUString aTitle;
::rtl::OUString aURL;
::rtl::OUString aTargetFrame;
::rtl::OUString aImageId;
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
BOOL bIsHiContrastMode = rSettings.GetMenuColor().IsDark();
UINT32 i, nCount = aDynamicMenuEntries.getLength();
Index: framework/source/classes/menumanager.cxx
===================================================================
--- framework/source/classes/menumanager.cxx (.../tags/DEV300_m41) (revision 267661)
+++ framework/source/classes/menumanager.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -160,7 +160,7 @@
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
m_bWasHiContrast = rSettings.GetMenuColor().IsDark();
- m_bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ m_bShowMenuImages = rSettings.GetUseImagesInMenus();
sal_Int32 nAddonsURLPrefixLength = ADDONSPOPUPMENU_URL_PREFIX.getLength();
::std::vector< USHORT > aQueryLabelItemIdVector;
@@ -1150,7 +1150,8 @@
{
// set/unset hiding disabled menu entries
sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled();
- sal_Bool bShowMenuImages = SvtMenuOptions().IsMenuIconsEnabled();
+ const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
+ sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
sal_uInt16 nFlag = pMenu->GetMenuFlags();
if ( bDontHide )
@@ -1181,7 +1182,6 @@
UpdateSpecialWindowMenu( pMenu );
// Check if some modes have changed so we have to update our menu images
- const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
sal_Bool bIsHiContrast = rSettings.GetMenuColor().IsDark();
if ( m_bWasHiContrast != bIsHiContrast || bShowMenuImages != m_bShowMenuImages )
Index: desktop/source/app/app.cxx
===================================================================
--- desktop/source/app/app.cxx (.../tags/DEV300_m41) (revision 267661)
+++ desktop/source/app/app.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -123,6 +123,7 @@
#include <svtools/languageoptions.hxx>
#include <svtools/internaloptions.hxx>
#include <svtools/miscopt.hxx>
+#include <svtools/menuoptions.hxx>
#include <svtools/syslocaleoptions.hxx>
#include <svtools/folderrestriction.hxx>
#include <unotools/tempfile.hxx>
@@ -1772,7 +1773,25 @@
hMouseSettings.SetFollow( aAppearanceCfg.IsMenuMouseFollow() ? (nFollow|MOUSE_FOLLOW_MENU) : (nFollow&~MOUSE_FOLLOW_MENU));
rSettings.SetMouseSettings(hMouseSettings);
- sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle();
+ BOOL bUseImagesInMenus = hStyleSettings.GetUseImagesInMenus();
+
+ SvtMenuOptions aMenuOpt;
+ nGet = aMenuOpt.GetMenuIconsState();
+ switch ( nGet )
+ {
+ case 0:
+ bUseImagesInMenus = FALSE;
+ break;
+ case 1:
+ bUseImagesInMenus = TRUE;
+ break;
+ case 2:
+ default:
+ break;
+ }
+ hStyleSettings.SetUseImagesInMenus(bUseImagesInMenus);
+
+ sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle();
nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE;
if( aAppearanceCfg.IsSingleLineTabCtrl() )
nTabStyle |=STYLE_TABCONTROL_SINGLELINE;
Index: officecfg/registry/schema/org/openoffice/Office/Common.xcs
===================================================================
--- officecfg/registry/schema/org/openoffice/Office/Common.xcs (.../tags/DEV300_m41) (revision 267661)
+++ officecfg/registry/schema/org/openoffice/Office/Common.xcs (.../cws/gtkmenuimages) (revision 267661)
@@ -2706,6 +2706,13 @@
</info>
<value>true</value>
</prop>
+ <prop oor:name="IsSystemIconsInMenus" oor:type="xs:boolean">
+ <info>
+ <author>CMC</author>
+ <desc>Indicates whether icons in the office menus should shown/hidden by following the System theme.</desc>
+ </info>
+ <value>true</value>
+ </prop>
<prop oor:name="ShowIconsInMenues" oor:type="xs:boolean">
<!-- OldPath: General/View -->
<!-- UIHints: Tools Options - General View [Section] Options -->
Index: officecfg/registry/data/org/openoffice/Office/Common.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/Office/Common.xcu (.../tags/DEV300_m41) (revision 267661)
+++ officecfg/registry/data/org/openoffice/Office/Common.xcu (.../cws/gtkmenuimages) (revision 267661)
@@ -103,11 +103,6 @@
<value xml:lang="zh-TW">13</value>
</prop>
</node>
- <node oor:name="Menu">
- <prop oor:name="ShowIconsInMenues" install:module="macosx">
- <value>false</value>
- </prop>
- </node>
</node>
<node oor:name="Help">
<node oor:name="StartCenter">
Index: svx/source/dialog/optgdlg.cxx
===================================================================
--- svx/source/dialog/optgdlg.cxx (.../tags/DEV300_m41) (revision 267661)
+++ svx/source/dialog/optgdlg.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -678,7 +678,7 @@
aAAPointLimitUnits ( this, SVX_RES( FT_POINTLIMIT_UNIT )),
#endif
aMenuFL ( this, SVX_RES( FL_MENU ) ),
- aMenuIconsCB ( this, SVX_RES( CB_MENU_ICONS )),
+ aMenuIconsLB ( this, SVX_RES( LB_MENU_ICONS )),
aFontListsFL ( this, SVX_RES( FL_FONTLISTS) ),
aFontShowCB ( this, SVX_RES( CB_FONT_SHOW ) ),
aFontHistoryCB ( this, SVX_RES( CB_FONT_HISTORY ) ),
@@ -734,7 +734,7 @@
Control* pMiscOptions[] =
{
&aMenuFL, &aFontShowCB,
- &aFontListsFL, &aFontHistoryCB, &aMenuIconsCB
+ &aFontListsFL, &aFontHistoryCB, &aMenuIconsLB
};
// temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos)
@@ -915,23 +915,18 @@
}
#endif
- if ( bAppearanceChanged )
- {
- pAppearanceCfg->Commit();
- pAppearanceCfg->SetApplicationDefaults ( GetpApp() );
- }
-
if ( aFontShowCB.IsChecked() != aFontShowCB.GetSavedValue() )
{
aFontOpt.EnableFontWYSIWYG( aFontShowCB.IsChecked() );
bModified = TRUE;
}
- if(aMenuIconsCB.IsChecked() != aMenuIconsCB.GetSavedValue())
+ if(aMenuIconsLB.GetSelectEntryPos() != aMenuIconsLB.GetSavedValue())
{
- aMenuOpt.SetMenuIconsState( aMenuIconsCB.IsChecked() );
+ aMenuOpt.SetMenuIconsState( aMenuIconsLB.GetSelectEntryPos() == 0 ? 2 : aMenuIconsLB.GetSelectEntryPos() - 1);
bModified = TRUE;
bMenuOptModified = TRUE;
+ bAppearanceChanged = TRUE;
}
if ( aFontHistoryCB.IsChecked() != aFontHistoryCB.GetSavedValue() )
@@ -984,7 +979,6 @@
// Set changed settings to the application instance
AllSettings aAllSettings = Application::GetSettings();
StyleSettings aStyleSettings = aAllSettings.GetStyleSettings();
- aStyleSettings.SetUseImagesInMenus( aMenuIconsCB.IsChecked() );
if( m_aSystemFont.IsEnabled() )
aStyleSettings.SetUseSystemUIFonts( m_aSystemFont.IsChecked() );
aAllSettings.SetStyleSettings(aStyleSettings);
@@ -992,6 +986,12 @@
Application::SetSettings(aAllSettings);
}
+ if ( bAppearanceChanged )
+ {
+ pAppearanceCfg->Commit();
+ pAppearanceCfg->SetApplicationDefaults ( GetpApp() );
+ }
+
return bModified;
}
@@ -1049,8 +1049,8 @@
SvtFontOptions aFontOpt;
aFontShowCB.Check( aFontOpt.IsFontWYSIWYGEnabled() );
SvtMenuOptions aMenuOpt;
- aMenuIconsCB.Check(aMenuOpt.IsMenuIconsEnabled());
- aMenuIconsCB.SaveValue();
+ aMenuIconsLB.SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1);
+ aMenuIconsLB.SaveValue();
aFontHistoryCB.Check( aFontOpt.IsFontHistoryEnabled() );
{ // #i95644# HW accel (unified to disable mechanism)
Index: svx/source/dialog/optgdlg.hrc
===================================================================
--- svx/source/dialog/optgdlg.hrc (.../tags/DEV300_m41) (revision 267661)
+++ svx/source/dialog/optgdlg.hrc (.../cws/gtkmenuimages) (revision 267661)
@@ -72,8 +72,8 @@
#define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW_FL_MENU (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X)
-#define ROW_CB_MENU_ICONS (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
-#define ROW_FL_FONTLISTS (ROW_CB_MENU_ICONS + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_FLGR_SPACE_X)
+#define ROW_LB_MENU_ICONS (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
+#define ROW_FL_FONTLISTS (ROW_LB_MENU_ICONS + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_FLGR_SPACE_X)
#define ROW_CB_FONT_SHOW (ROW_FL_FONTLISTS + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE)
#define ROW_CB_FONT_HISTORY (ROW_CB_FONT_SHOW + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE)
@@ -125,7 +125,7 @@
#define FT_MOUSEMIDDLE 33
#define LB_MOUSEMIDDLE 34
-#define CB_MENU_ICONS 40
+#define LB_MENU_ICONS 40
#define FL_MENU 41
#define FL_FONTLISTS 42
Index: svx/source/dialog/optgdlg.src
===================================================================
--- svx/source/dialog/optgdlg.src (.../tags/DEV300_m41) (revision 267661)
+++ svx/source/dialog/optgdlg.src (.../cws/gtkmenuimages) (revision 267661)
@@ -298,12 +298,19 @@
Size = MAP_APPFONT ( 120 , 8 ) ;
Text [ en-US ] = "Menu" ;
};
- CheckBox CB_MENU_ICONS
+ ListBox LB_MENU_ICONS
{
+ Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ;
+ Size = MAP_APPFONT ( 45 , 60 ) ;
+ DropDown = TRUE ;
+ Border = TRUE ;
TabStop = TRUE ;
- Pos = MAP_APPFONT ( 12 , ROW_CB_MENU_ICONS ) ;
- Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ;
- Text [ en-US ] = "Show icons in menus";
+ StringList [ en-US ] =
+ {
+ < "Automatic" ; > ;
+ < "Hide Icons" ; > ;
+ < "Show Icons" ; > ;
+ };
};
FixedLine FL_FONTLISTS
{
Index: svx/source/dialog/optgdlg.hxx
===================================================================
--- svx/source/dialog/optgdlg.hxx (.../tags/DEV300_m41) (revision 267661)
+++ svx/source/dialog/optgdlg.hxx (.../cws/gtkmenuimages) (revision 267661)
@@ -112,7 +112,7 @@
#endif
FixedLine aMenuFL;
- CheckBox aMenuIconsCB;
+ ListBox aMenuIconsLB;
FixedLine aFontListsFL;
CheckBox aFontShowCB;
Index: svtools/source/uno/contextmenuhelper.cxx
===================================================================
--- svtools/source/uno/contextmenuhelper.cxx (.../tags/DEV300_m41) (revision 267661)
+++ svtools/source/uno/contextmenuhelper.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -610,7 +610,7 @@
// Retrieve some settings necessary to display complete context
// menu correctly.
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- bool bShowMenuImages( SvtMenuOptions().IsMenuIconsEnabled() );
+ bool bShowMenuImages( rSettings.GetUseImagesInMenus() );
bool bIsHiContrast( rSettings.GetMenuColor().IsDark() );
if ( pMenu )
Index: svtools/source/config/menuoptions.cxx
===================================================================
--- svtools/source/config/menuoptions.cxx (.../tags/DEV300_m41) (revision 267661)
+++ svtools/source/config/menuoptions.cxx (.../cws/gtkmenuimages) (revision 267661)
@@ -43,6 +43,7 @@
#include <tools/debug.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Sequence.hxx>
+#include <vcl/svapp.hxx>
#include <rtl/logfile.hxx>
#include "itemholder1.hxx"
@@ -63,17 +64,19 @@
#define ROOTNODE_MENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Common/View/Menu" ))
#define DEFAULT_DONTHIDEDISABLEDENTRIES sal_False
#define DEFAULT_FOLLOWMOUSE sal_True
-#define DEFAULT_MENUICONS sal_True
+#define DEFAULT_MENUICONS 2
#define PROPERTYNAME_DONTHIDEDISABLEDENTRIES OUString(RTL_CONSTASCII_USTRINGPARAM("DontHideDisabledEntry" ))
#define PROPERTYNAME_FOLLOWMOUSE OUString(RTL_CONSTASCII_USTRINGPARAM("FollowMouse" ))
#define PROPERTYNAME_SHOWICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("ShowIconsInMenues" ))
+#define PROPERTYNAME_SYSTEMICONSINMENUES OUString(RTL_CONSTASCII_USTRINGPARAM("IsSystemIconsInMenus" ))
#define PROPERTYHANDLE_DONTHIDEDISABLEDENTRIES 0
#define PROPERTYHANDLE_FOLLOWMOUSE 1
#define PROPERTYHANDLE_SHOWICONSINMENUES 2
+#define PROPERTYHANDLE_SYSTEMICONSINMENUES 3
-#define PROPERTYCOUNT 3
+#define PROPERTYCOUNT 4
#include <tools/link.hxx>
#include <tools/list.hxx>
@@ -93,7 +96,7 @@
LinkList aList;
sal_Bool m_bDontHideDisabledEntries ; /// cache "DontHideDisabledEntries" of Menu section
sal_Bool m_bFollowMouse ; /// cache "FollowMouse" of Menu section
- sal_Bool m_bMenuIcons ; /// cache "MenuIcons" of Menu section
+ sal_Int16 m_nMenuIcons ; /// cache "MenuIcons" of Menu section
//-------------------------------------------------------------------------------------------------------------
// public methods
@@ -169,8 +172,8 @@
sal_Bool IsFollowMouseEnabled() const
{ return m_bFollowMouse; }
- sal_Bool IsMenuIconsEnabled() const
- { return m_bMenuIcons; }
+ sal_Int16 GetMenuIconsState() const
+ { return m_nMenuIcons; }
void SetEntryHidingState ( sal_Bool bState )
{
@@ -190,9 +193,9 @@
Commit();
}
- void SetMenuIconsState ( sal_Bool bState )
+ void SetMenuIconsState ( sal_Int16 bState )
{
- m_bMenuIcons = bState;
+ m_nMenuIcons = bState;
SetModified();
for ( USHORT n=0; n<aList.Count(); n++ )
aList.GetObject(n)->Call( this );
@@ -234,7 +237,7 @@
// Init member then.
, m_bDontHideDisabledEntries ( DEFAULT_DONTHIDEDISABLEDENTRIES )
, m_bFollowMouse ( DEFAULT_FOLLOWMOUSE )
- , m_bMenuIcons ( DEFAULT_MENUICONS )
+ , m_nMenuIcons ( DEFAULT_MENUICONS )
{
// Use our static list of configuration keys to get his values.
Sequence< OUString > seqNames = impl_GetPropertyNames();
@@ -245,6 +248,9 @@
// Follow assignment use order of values in relation to our list of key names!
DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nI miss some values of configuration keys!\n" );
+ sal_Bool bMenuIcons = true;
+ sal_Bool bSystemMenuIcons = true;
+
// Copy values from list in right order to ouer internal member.
sal_Int32 nPropertyCount = seqValues.getLength() ;
sal_Int32 nProperty = 0 ;
@@ -268,12 +274,19 @@
break;
case PROPERTYHANDLE_SHOWICONSINMENUES : {
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
- seqValues[nProperty] >>= m_bMenuIcons;
+ seqValues[nProperty] >>= bMenuIcons;
}
break;
+ case PROPERTYHANDLE_SYSTEMICONSINMENUES : {
+ DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
+ seqValues[nProperty] >>= bSystemMenuIcons;
+ }
+ break;
}
}
+ m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+
EnableNotification( seqNames );
}
@@ -303,6 +316,10 @@
// Safe impossible cases.
// We need values from ALL notified configuration keys.
DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtMenuOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
+
+ sal_Bool bMenuIcons = true;
+ sal_Bool bSystemMenuIcons = true;
+
// Step over list of property names and get right value from coreesponding value list to set it on internal members!
sal_Int32 nCount = seqPropertyNames.getLength();
for( sal_Int32 nProperty=0; nProperty<nCount; ++nProperty )
@@ -312,22 +329,29 @@
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\View\\Menu\\DontHideDisabledEntry\"?" );
seqValues[nProperty] >>= m_bDontHideDisabledEntries;
}
- else
- if( seqPropertyNames[nProperty] == PROPERTYNAME_FOLLOWMOUSE )
+ else if( seqPropertyNames[nProperty] == PROPERTYNAME_FOLLOWMOUSE )
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::Notify()\nWho has changed the value type of \"Office.Common\\View\\Menu\\FollowMouse\"?" );
seqValues[nProperty] >>= m_bFollowMouse;
}
- if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWICONSINMENUES )
+ else if( seqPropertyNames[nProperty] == PROPERTYNAME_SHOWICONSINMENUES )
{
DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\ShowIconsInMenues\"?" );
- seqValues[nProperty] >>= m_bMenuIcons;
+ seqValues[nProperty] >>= bMenuIcons;
}
+ else if( seqPropertyNames[nProperty] == PROPERTYNAME_SYSTEMICONSINMENUES )
+ {
+ DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtMenuOptions_Impl::SvtMenuOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Menu\\IsSystemIconsInMenus\"?" );
+ seqValues[nProperty] >>= bSystemMenuIcons;
+ }
+
#if OSL_DEBUG_LEVEL > 1
else DBG_ASSERT( sal_False, "SvtMenuOptions_Impl::Notify()\nUnkown property detected ... I can't handle these!\n" );
#endif
}
+ m_nMenuIcons = bSystemMenuIcons ? 2 : bMenuIcons;
+
for ( USHORT n=0; n<aList.Count(); n++ )
aList.GetObject(n)->Call( this );
}
@@ -354,10 +378,15 @@
seqValues[nProperty] <<= m_bFollowMouse;
}
break;
+ //Output cache of current setting as possibly modified by System Theme for older version
case PROPERTYHANDLE_SHOWICONSINMENUES : {
- seqValues[nProperty] <<= m_bMenuIcons;
+ seqValues[nProperty] <<=(sal_Bool)(Application::GetSettings().GetStyleSettings().GetUseImagesInMenus());
}
break;
+ case PROPERTYHANDLE_SYSTEMICONSINMENUES : {
+ seqValues[nProperty] <<= (m_nMenuIcons == 2 ? sal_True : sal_False) ;
+ }
+ break;
}
}
// Set properties in configuration.
@@ -374,7 +403,8 @@
{
PROPERTYNAME_DONTHIDEDISABLEDENTRIES ,
PROPERTYNAME_FOLLOWMOUSE ,
- PROPERTYNAME_SHOWICONSINMENUES
+ PROPERTYNAME_SHOWICONSINMENUES ,
+ PROPERTYNAME_SYSTEMICONSINMENUES
};
// Initialize return sequence with these list ...
static const Sequence< OUString > seqPropertyNames( pProperties, PROPERTYCOUNT );
@@ -483,16 +513,16 @@
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-sal_Bool SvtMenuOptions::IsMenuIconsEnabled() const
+sal_Int16 SvtMenuOptions::GetMenuIconsState() const
{
MutexGuard aGuard( GetOwnStaticMutex() );
- return m_pDataContainer->IsMenuIconsEnabled();
+ return m_pDataContainer->GetMenuIconsState();
}
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-void SvtMenuOptions::SetMenuIconsState( sal_Bool bState )
+void SvtMenuOptions::SetMenuIconsState( sal_Int16 bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
m_pDataContainer->SetMenuIconsState( bState );
Index: svtools/inc/svtools/menuoptions.hxx
===================================================================
--- svtools/inc/svtools/menuoptions.hxx (.../tags/DEV300_m41) (revision 267661)
+++ svtools/inc/svtools/menuoptions.hxx (.../cws/gtkmenuimages) (revision 267661)
@@ -122,11 +122,11 @@
sal_Bool IsEntryHidingEnabled() const;
sal_Bool IsFollowMouseEnabled() const;
- sal_Bool IsMenuIconsEnabled() const;
+ sal_Int16 GetMenuIconsState() const;
void SetEntryHidingState( sal_Bool bState );
void SetFollowMouseState( sal_Bool bState );
- void SetMenuIconsState( sal_Bool bState );
+ void SetMenuIconsState( sal_Int16 bState );
//-------------------------------------------------------------------------------------------------------------
// private methods
workspace.transogl03redux.patch:
--- NEW FILE workspace.transogl03redux.patch ---
Index: slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx
===================================================================
--- slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx (.../tags/DEV300_m41) (revision 0)
+++ slideshow/source/engine/OGLTrans/OGLTrans_Shaders.cxx (.../cws/transogl03redux) (revision 267662)
@@ -0,0 +1,143 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: $
+ * $Revision: $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#include <osl/diagnose.hxx>
+
+#include "OGLTrans_Shaders.hxx"
+
+namespace unx
+{
+#include <GL/glx.h>
+#include <GL/glxext.h>
+}
+
+bool OGLShaders::cbInitialized = false;
+
+#ifdef GL_VERSION_2_0
+
+PFNGLCREATESHADERPROC OGLShaders::glCreateShader = NULL;
+PFNGLSHADERSOURCEPROC OGLShaders::glShaderSource = NULL;
+PFNGLCOMPILESHADERPROC OGLShaders::glCompileShader = NULL;
+PFNGLGETSHADERIVPROC OGLShaders::glGetShaderiv = NULL;
+PFNGLGETSHADERINFOLOGPROC OGLShaders::glGetShaderInfoLog = NULL;
+PFNGLDELETESHADERPROC OGLShaders::glDeleteShader = NULL;
+PFNGLCREATEPROGRAMPROC OGLShaders::glCreateProgram = NULL;
+PFNGLATTACHSHADERPROC OGLShaders::glAttachShader = NULL;
+PFNGLLINKPROGRAMPROC OGLShaders::glLinkProgram = NULL;
+PFNGLGETPROGRAMIVPROC OGLShaders::glGetProgramiv = NULL;
+PFNGLGETPROGRAMINFOLOGPROC OGLShaders::glGetProgramInfoLog = NULL;
+PFNGLUSEPROGRAMPROC OGLShaders::glUseProgram = NULL;
+PFNGLDELETEPROGRAMPROC OGLShaders::glDeleteProgram = NULL;
+PFNGLGETUNIFORMLOCATIONPROC OGLShaders::glGetUniformLocation = NULL;
+PFNGLUNIFORM1IPROC OGLShaders::glUniform1i = NULL;
+PFNGLUNIFORM1FPROC OGLShaders::glUniform1f = NULL;
+#endif
+
+bool OGLShaders::Initialize()
+{
+#ifdef GL_VERSION_2_0
+ if( !cbInitialized ) {
+ glCreateShader = (PFNGLCREATESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateShader" );
+ glShaderSource = (PFNGLSHADERSOURCEPROC) unx::glXGetProcAddress( (unsigned char *) "glShaderSource" );
+ glCompileShader = (PFNGLCOMPILESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glCompileShader" );
+ glGetShaderiv = (PFNGLGETSHADERIVPROC) unx::glXGetProcAddress( (unsigned char *) "glGetShaderiv" );
+ glGetShaderInfoLog = (PFNGLGETSHADERINFOLOGPROC) unx::glXGetProcAddress( (unsigned char *) "glGetShaderInfoLog" );
+ glDeleteShader = (PFNGLDELETESHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glDeleteShader" );
+ glCreateProgram = (PFNGLCREATEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glCreateProgram" );
+ glAttachShader = (PFNGLATTACHSHADERPROC) unx::glXGetProcAddress( (unsigned char *) "glAttachShader" );
+ glLinkProgram = (PFNGLLINKPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glLinkProgram" );
+ glGetProgramiv = (PFNGLGETPROGRAMIVPROC) unx::glXGetProcAddress( (unsigned char *) "glGetProgramiv" );
+ glGetProgramInfoLog = (PFNGLGETPROGRAMINFOLOGPROC) unx::glXGetProcAddress( (unsigned char *) "glGetProgramInfoLog" );
+ glUseProgram = (PFNGLUSEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glUseProgram" );
+ glDeleteProgram = (PFNGLDELETEPROGRAMPROC) unx::glXGetProcAddress( (unsigned char *) "glDeleteProgram" );
+ glGetUniformLocation = (PFNGLGETUNIFORMLOCATIONPROC) unx::glXGetProcAddress( (unsigned char *) "glGetUniformLocation" );
+ glUniform1i = (PFNGLUNIFORM1IPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1i" );
+ glUniform1f = (PFNGLUNIFORM1FPROC) unx::glXGetProcAddress( (unsigned char *) "glUniform1f" );
+ cbInitialized = true;
+ }
+
+ return glCreateShader != NULL;
+#else
+ return false;
+#endif
+}
+
+GLuint OGLShaders::LinkProgram( const char *vertexShader, const char *fragmentShader )
+{
+#ifdef GL_VERSION_2_0
+ if( !Initialize() )
+ return 0;
+
+ GLhandleARB vertexObject, fragmentObject, programObject;
+ GLint vertexCompiled, fragmentCompiled, programLinked;
+ char log[1024];
+
+ vertexObject = glCreateShader( GL_VERTEX_SHADER );
+ fragmentObject = glCreateShader( GL_FRAGMENT_SHADER );
+ OSL_TRACE("checkpoint 1: shaders created (%d) vertex: %d fragment: %d", glGetError() == GL_NO_ERROR, vertexObject, fragmentObject );
+
+
+ glShaderSource( vertexObject, 1, &vertexShader, NULL );
+ glShaderSource( fragmentObject, 1, &fragmentShader, NULL );
+
+ glCompileShader( vertexObject );
+ glGetShaderInfoLog( vertexObject, sizeof( log ), NULL, log );
+ OSL_TRACE("vertex compile log: %s", log);
+ glGetShaderiv( vertexObject, GL_COMPILE_STATUS, &vertexCompiled );
+ glCompileShader( fragmentObject );
+ glGetShaderInfoLog( fragmentObject, sizeof( log ), NULL, log );
+ OSL_TRACE("fragment compile log: %s", log);
+ glGetShaderiv( fragmentObject, GL_COMPILE_STATUS, &fragmentCompiled );
+
+ if( !vertexCompiled || !fragmentCompiled )
+ return 0;
+
+ OSL_TRACE("checkpoint 2: shaders compiled (%d)", glGetError() == GL_NO_ERROR);
+
+ programObject = glCreateProgram();
+ glAttachShader( programObject, vertexObject );
+ glAttachShader( programObject, fragmentObject );
+
+ glLinkProgram( programObject );
+ glGetProgramInfoLog( programObject, sizeof( log ), NULL, log );
+ OSL_TRACE("program link log: %s", log);
+ glGetProgramiv( programObject, GL_LINK_STATUS, &programLinked );
+
+ if( !programLinked )
+ return 0;
+
+ OSL_TRACE("checkpoint 3: program linked (%d)", glGetError() == GL_NO_ERROR);
+
+ return programObject;
+#else
+ return 0;
+#endif
+}
+
Index: slideshow/source/engine/OGLTrans/makefile.mk
===================================================================
--- slideshow/source/engine/OGLTrans/makefile.mk (.../tags/DEV300_m41) (revision 267662)
+++ slideshow/source/engine/OGLTrans/makefile.mk (.../cws/transogl03redux) (revision 267662)
@@ -51,8 +51,10 @@
SLOFILES = \
$(SLO)$/OGLTrans_TransitionImpl.obj \
+ $(SLO)$/OGLTrans_Shaders.obj \
$(SLO)$/OGLTrans_TransitionerImpl.obj
-
+
+DLLPRE=
SHL1TARGET=$(TARGET).uno
.IF "$(GUI)"=="UNX"
Index: slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx
===================================================================
--- slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx (.../tags/DEV300_m41) (revision 267662)
+++ slideshow/source/engine/OGLTrans/OGLTrans_TransitionImpl.cxx (.../cws/transogl03redux) (revision 267662)
@@ -27,9 +27,11 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+
#include "OGLTrans_TransitionImpl.hxx"
-
+#include "OGLTrans_Shaders.hxx"
#include <GL/gl.h>
+#include <math.h>
void OGLTransitionImpl::clear()
@@ -42,6 +44,33 @@
for(unsigned int i(0); i < maSceneObjects.size(); ++i)
delete maSceneObjects[i];
maSceneObjects.clear();
+
+ mbReflectSlides = false;
+
+#ifdef GL_VERSION_2_0
+ if( mProgramObject ) {
+ OGLShaders::glDeleteProgram( mProgramObject );
+ mProgramObject = 0;
+ }
+
+ if( mVertexObject ) {
+ OGLShaders::glDeleteShader( mVertexObject );
+ mVertexObject = 0;
+ }
+
[...30713 lines suppressed...]
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -29475,21 +29903,28 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
;;
@@ -29504,7 +29939,12 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
# Unfortunately, on DOS this fails, as config.log is still kept open
@@ -29525,6 +29965,10 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
chmod a+x set_soenv
Index: officecfg/registry/data/org/openoffice/Office/Impress.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/Office/Impress.xcu (.../tags/DEV300_m41) (revision 267662)
+++ officecfg/registry/data/org/openoffice/Office/Impress.xcu (.../cws/transogl03redux) (revision 267662)
@@ -156,4 +156,9 @@
</node>
</node>
</node>
+ <node oor:name="Misc">
+ <prop oor:name="TransitionFiles" install:module="ogltrans">
+ <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value>
+ </prop>
+ </node>
</oor:component-data>
Index: officecfg/registry/data/org/openoffice/Office/makefile.mk
===================================================================
--- officecfg/registry/data/org/openoffice/Office/makefile.mk (.../tags/DEV300_m41) (revision 267662)
+++ officecfg/registry/data/org/openoffice/Office/makefile.mk (.../cws/transogl03redux) (revision 267662)
@@ -88,6 +88,7 @@
Writer-defaultfontarial.xcu \
Writer-directcursor.xcu \
Writer-javamail.xcu \
+ Impress-ogltrans.xcu \
Embedding-calc.xcu \
Embedding-chart.xcu \
Embedding-draw.xcu \
Index: officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
===================================================================
--- officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu (.../tags/DEV300_m41) (revision 267662)
+++ officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu (.../cws/transogl03redux) (revision 267662)
@@ -1922,6 +1922,76 @@
</prop>
</node>
+ <node oor:name="tile-flip" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Flipping tiles</value>
+ </prop>
+ </node>
+ <node oor:name="outside-cube" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Outside turning cube</value>
+ </prop>
+ </node>
+ <node oor:name="revolving-circles" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Revolving circles</value>
+ </prop>
+ </node>
+ <node oor:name="turning-helix" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Turning helix</value>
+ </prop>
+ </node>
+ <node oor:name="inside-cube" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Inside turning cube</value>
+ </prop>
+ </node>
+ <node oor:name="fall" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fall</value>
+ </prop>
+ </node>
+ <node oor:name="turn-around" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Turn around</value>
+ </prop>
+ </node>
+ <node oor:name="iris" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Iris</value>
+ </prop>
+ </node>
+ <node oor:name="turn-down" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Turn down</value>
+ </prop>
+ </node>
+ <node oor:name="rochade" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rochade</value>
+ </prop>
+ </node>
+ <node oor:name="venetian3dv" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Venetian Blinds 3D Vertical</value>
+ </prop>
+ </node>
+ <node oor:name="venetian3dh" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Venetian Blinds 3D Horizontal</value>
+ </prop>
+ </node>
+ <node oor:name="static" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Static</value>
+ </prop>
+ </node>
+ <node oor:name="finedissolve" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fine Dissolve</value>
+ </prop>
+ </node>
</node>
</node>
<node oor:name="Presets">
Index: setup_native/source/packinfo/packinfo_office.txt
===================================================================
--- setup_native/source/packinfo/packinfo_office.txt (.../tags/DEV300_m41) (revision 267662)
+++ setup_native/source/packinfo/packinfo_office.txt (.../cws/transogl03redux) (revision 267662)
@@ -875,3 +875,17 @@
packageversion = "0.5.0.2"
End
+Start
+module = "gid_Module_Optional_OGLTrans"
+solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-ogltrans"
+solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-impress"
+packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-ogltrans"
+freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
+requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-impress"
+copyright = "1999-2007 by OpenOffice.org"
+solariscopyright = "solariscopyrightfile"
+vendor = "OpenOffice.org"
+description = "OpenGL slide transitions module for OpenOffice.org %OOOBASEVERSION"
+destpath = "/opt"
+packageversion = "%OOOPACKAGEVERSION"
+End
openoffice.org-1.9.87.rh151357.setlangtolocale.patch:
Index: openoffice.org-1.9.87.rh151357.setlangtolocale.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.setlangtolocale.patch,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- openoffice.org-1.9.87.rh151357.setlangtolocale.patch 1 Sep 2008 12:09:07 -0000 1.29
+++ openoffice.org-1.9.87.rh151357.setlangtolocale.patch 12 Feb 2009 14:25:01 -0000 1.30
@@ -154,7 +154,7 @@
diff -u -p -u -r1.10 LetterWizardDialogImpl.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 20 May 2005 15:42:29 -0000 1.10
+++ openoffice.org/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 13 Jul 2005 11:22:44 -0000
-@@ -787,12 +787,32 @@
+@@ -985,6 +985,15 @@
int oL = 0;
boolean found = false;
String OfficeLinguistic = Configuration.getOfficeLinguistic(xMSF);
@@ -167,13 +167,13 @@
+ {
+ OfficeLinguistic = "en-GB";
+ }
- for (int i = 0; i < Norms.length; i++){
- if (Norms[i].equalsIgnoreCase(OfficeLinguistic)) {
- oL = i;
- found = true;
+ for (int i = 0; i < Norms.length; i++)
+ {
+ if (Norms[i].equalsIgnoreCase(OfficeLinguistic))
+@@ -994,6 +1003,17 @@
break;
}
-+ }
+ }
+ if (!found) {
+ String[] portions = OfficeLinguistic.split("-");
+ OfficeLinguistic = portions[0];
@@ -184,8 +184,9 @@
+ break;
+ }
+ }
- }
- if (!found) {
++ }
+ if (!found)
+ {
//fall back to English:
Index: com/sun/star/wizards/letter/LetterWizardDialogResources.java
===================================================================
@@ -194,15 +195,15 @@
diff -u -p -u -r1.5 LetterWizardDialogResources.java
--- openoffice.org.orig/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java 3 May 2005 14:23:44 -0000 1.5
+++ openoffice.org/wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.java 13 Jul 2005 11:22:44 -0000
-@@ -17,7 +17,7 @@
+@@ -48,7 +48,7 @@
protected String[] RoadmapLabels = new String[7];
protected String[] SalutationLabels = new String[3];
protected String[] GreetingLabels = new String[3];
- protected String[] LanguageLabels = new String[16];
+ protected String[] LanguageLabels = new String[18];
-
String resOverwriteWarning;
String resTemplateDescription;
+ String resLetterWizardDialog_title;
Index: source/formwizard/dbwizres.src
===================================================================
RCS file: /cvs/installation/wizards/source/formwizard/dbwizres.src,v
@@ -592,8 +593,8 @@
diff -u -p -r1.37 resmgr.cxx
--- openoffice.org.orig/tools/source/rc/resmgr.cxx 18 Mar 2005 17:45:56 -0000 1.37
+++ openoffice.org/tools/source/rc/resmgr.cxx 29 Mar 2005 14:56:58 -0000
-@@ -372,6 +372,21 @@ void ResMgrContainer::init()
- #endif
+@@ -281,6 +281,21 @@
+ MsLangId::convertLanguageToLocale(nLang, m_aDefLocale);
}
+namespace
@@ -614,7 +615,7 @@
InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
com::sun::star::lang::Locale& rLocale,
bool bForceNewInstance
-@@ -414,7 +429,7 @@ InternalResMgr* ResMgrContainer::getResM
+@@ -331,7 +346,7 @@
}
break;
}
@@ -623,7 +624,7 @@
{
// locale fallback failed
// fallback to en-US locale
-@@ -503,7 +518,7 @@ InternalResMgr* ResMgrContainer::getNext
+@@ -448,7 +463,7 @@
aLocale.Variant = OUString();
else if( aLocale.Country.getLength() )
aLocale.Country = OUString();
openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch:
Index: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 10 Feb 2009 23:08:05 -0000 1.54
+++ openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch 12 Feb 2009 14:25:02 -0000 1.55
@@ -809,7 +809,7 @@
struct SvtPrinterImpl
{
-@@ -116,8 +155,10 @@
+@@ -116,8 +156,10 @@
maBtnCancel ( this, SvtResId( BTN_CANCEL ) ),
maBtnHelp ( this, SvtResId( BTN_HELP ) ),
mbWithSheetsAndCells( bWithSheetsAndCells ),
@@ -822,7 +822,7 @@
{
FreeResource();
-@@ -753,6 +794,304 @@
+@@ -751,6 +793,304 @@
// -----------------------------------------------------------------------
@@ -1127,348 +1127,352 @@
short PrintDialog::Execute()
{
if ( !mpPrinter || mpPrinter->IsPrinting() || mpPrinter->IsJobActive() )
-@@ -775,15 +1094,333 @@
- ImplInitControls();
+@@ -775,16 +1115,334 @@
+ maNumCopies.SetSelection( Selection( 0, maNumCopies.GetText().Len() ) );
ImplModifyControlHdl( NULL );
- // Dialog starten
- short nRet = ModalDialog::Execute();
-+ short nRet = false;
-
+-
- // Wenn Dialog mit OK beendet wurde, dann die Daten updaten
- if( nRet == TRUE )
-+ if (
-+ SvtMiscOptions().UseSystemFileDialog() &&
-+ !Application::GetDesktopEnvironment().equalsIgnoreAsciiCaseAscii("kde")
-+ )
- {
+- {
- if ( TEMPPRINTER() )
- mpPrinter->SetPrinterProps( TEMPPRINTER() );
- ImplFillDialogData();
-+ unsigned long handle = GetParent() ? GetParent()->GetNativeHandle() : 0;
-+ GtkWindow *parent = handle ? GTK_WINDOW(handle) : NULL;
-+
-+ lcl_setGTKLanguage(::comphelper::getProcessServiceFactory());
-+ ourhandle aHandle;
-+ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, parent);
-+
-+ 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);
-+
-+ rtl::OUString aProperties(maBtnProperties.GetText());
-+ aProperties = aProperties.copy(0, aProperties.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(("...")))));
-+ aProperties = aProperties.replaceAt(aProperties.indexOf('~'), 1, OUString());
-+
-+ gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog),
-+ GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
-+ GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS));
-+
-+ GtkWidget *box = gtk_vbox_new(FALSE, 18);
-+ gtk_container_set_border_width (GTK_CONTAINER (box), 12);
-+
-+ GtkWidget *tablewidget = gtk_table_new (2, 2, FALSE);
-+ gtk_table_set_row_spacings (GTK_TABLE (tablewidget), 6);
-+ gtk_table_set_col_spacings (GTK_TABLE (tablewidget), 12);
-+
-+ gtk_box_pack_start (GTK_BOX (box), tablewidget, FALSE, FALSE, 0);
-+
-+
-+ aHandle.orientwidget = gtk_combo_box_new_text();
-+ aHandle.paperwidget = gtk_combo_box_new_text();
-+
-+ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
-+ rtl::OUStringToOString(maOrientationStr, RTL_TEXTENCODING_UTF8).getStr()),
-+ 0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
-+ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.orientwidget, 1, 2, 0, 1,
-+ GTK_FILL, GTK_EXPAND, 0, 0);
-+ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
-+ rtl::OUStringToOString(maPaperFormatStr, RTL_TEXTENCODING_UTF8).getStr()),
-+ 0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
-+ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.paperwidget, 1, 2, 1, 2,
-+ GTK_FILL, GTK_EXPAND, 0, 0);
-+
-+ gtk_widget_show_all(box);
-+
-+ rtl::OString sProperties(OUStringToOString(aProperties, RTL_TEXTENCODING_UTF8));
-+ gtk_print_unix_dialog_add_custom_tab(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), box,
-+ gtk_label_new(sProperties.getStr()));
-+
-+ g_object_get(G_OBJECT(box),"parent", &aHandle.notebook,NULL);
-+
-+ //make this the child of the OOo document window, and make it
-+ //the parent of the future OOo options window
-+ if (parent) gtk_window_set_transient_for(GTK_WINDOW(aHandle.pDialog), parent);
-+ mnNativeHandle = reinterpret_cast<unsigned long>(aHandle.pDialog);
-+
-+ GtkPrintSettings* pTempSettings = gtk_print_settings_new_from_file(getPrintDialogSettings().getStr(), NULL);
-+ if (!pTempSettings)
-+ pTempSettings = gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
-+ if (const QueueInfo* pInfo = (const QueueInfo*)(maLbName.GetEntryData(maLbName.GetSelectEntryPos())))
-+ {
-+ gtk_print_settings_set_printer(pTempSettings, rtl::OUStringToOString(pInfo->GetPrinterName(),
-+ RTL_TEXTENCODING_UTF8).getStr());
-+ }
-+
-+ gtk_print_settings_set_int(pTempSettings, "n-copies", GetCopyCount());
-+ gtk_print_settings_set_collate(pTempSettings, IsCollateEnabled() && IsCollateChecked());
-+ if (mbRange)
-+ {
-+ GtkPageRange page_ranges;
-+ page_ranges.start = page_ranges.end = maRangeText.ToInt32()-1;
-+ gtk_print_settings_set_page_ranges(pTempSettings, &page_ranges, 1);
-+ gtk_print_unix_dialog_set_current_page(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), page_ranges.start);
-+ }
-+ gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), pTempSettings);
-+ g_object_unref(pTempSettings);
-+
-+ aHandle.pPrinter = mpPrinter;
-+
-+ SetProperties(aHandle, true);
-+
-+ gulong nHID_PageChange=0;
-+ if (aHandle.notebook && GTK_IS_NOTEBOOK(aHandle.notebook))
-+ {
-+ gtk_notebook_set_current_page(GTK_NOTEBOOK(aHandle.notebook), 0);
-+ nHID_PageChange = g_signal_connect(G_OBJECT(aHandle.notebook), "switch-page", G_CALLBACK(switch_page_cb), &aHandle);
-+ }
-+
-+ bool bContinue = true;
-+ while(bContinue)
-+ {
-+ bContinue = false;
-+ gint nStatus = gtk_dialog_run( GTK_DIALOG( aHandle.pDialog ) );
-+ switch( nStatus )
-+ {
-+ case GTK_RESPONSE_HELP:
-+ ClickOptionsHdl();
-+ bContinue = true;
-+ break;
-+ case GTK_RESPONSE_OK:
-+ {
-+ GtkPrintSettings* pSettings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
-+
-+ rtl::OUString sPath;
-+ if (const gchar *uri = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_URI))
-+ {
-+ if (gchar *pFile = g_filename_from_uri (uri, NULL, NULL))
-+ {
-+ sPath = rtl::OUString((const sal_Char *)pFile, strlen((const sal_Char*)(pFile)), osl_getThreadTextEncoding());
-+ g_free(pFile);
-+ }
-+ }
-+ const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
-+ if (pStr && !strcmp(pStr, "ranges"))
-+ {
-+ maRangeText = String();
-+ gint num_ranges;
-+ const GtkPageRange* pRanges = gtk_print_settings_get_page_ranges(pSettings, &num_ranges);
-+ for (gint i = 0; i < num_ranges; ++i)
-+ {
-+ maRangeText.Append(String::CreateFromInt32(pRanges[i].start+1));
-+ if (pRanges[i].start != pRanges[i].end)
-+ {
-+ maRangeText.AppendAscii("-");
-+ maRangeText.Append(String::CreateFromInt32(pRanges[i].end+1));
-+ }
-+
-+ if (i != num_ranges-1)
-+ maRangeText.AppendAscii(",");
-+ }
-+ meCheckRange = PRINTDIALOG_RANGE;
-+ }
-+ else if (pStr && !strcmp(pStr, "current"))
-+ {
-+ meCheckRange = PRINTDIALOG_RANGE;
-+
-+ try
-+ {
-+ Reference < XFramesSupplier > xDesktop = Reference < XFramesSupplier >(
-+ ::comphelper::getProcessServiceFactory()->
-+ createInstance( ASCII_STR("com.sun.star.frame.Desktop") ), UNO_QUERY );
-+ Reference < XFrame > xFrame( xDesktop->getActiveFrame() );
-+ if ( !xFrame.is() )
-+ xFrame = Reference < XFrame >( xDesktop, UNO_QUERY );
-+
-+ Reference< XController > xController;
-+ Reference< XSpreadsheetView > xSpreadsheetView;
-+ Reference< XSpreadsheet> xSheet;
-+ Reference< XSpreadsheetDocument > xSheetDoc;
-+ Reference< XIndexAccess > xSheets;
-+ Reference< XNamed > xName;
-+
-+ if (xFrame.is())
-+ xController = xFrame->getController();
-+ if (xController.is())
-+ xSpreadsheetView = Reference< XSpreadsheetView >(xController, UNO_QUERY);
-+ if (xSpreadsheetView.is())
-+ xSheet = Reference< XSpreadsheet>(xSpreadsheetView->getActiveSheet());
-+ if (xSheet.is())
-+ xName = Reference < XNamed >(xSheet, UNO_QUERY);
-+ if (xName.is())
-+ xSheetDoc = Reference< XSpreadsheetDocument >(xController->getModel(), UNO_QUERY);
-+ if (xSheetDoc.is())
-+ xSheets = Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY);
-+ if (xSheets.is())
-+ {
-+ const rtl::OUString &rName = xName->getName();
-+
-+ sal_Int32 i;
-+
-+ for( i = 0; i < xSheets->getCount(); ++i)
-+ {
-+ Reference < XNamed > xItem =
-+ Reference < XNamed >(xSheets->getByIndex(i), UNO_QUERY);
-+ if (rName == xItem->getName())
-+ break;
-+ }
-+
-+ if (i < xSheets->getCount())
-+ maRangeText = String::CreateFromInt32( i + 1 );
-+ }
-+ }
-+ catch (...) {}
-+ }
-+ else
-+ meCheckRange = PRINTDIALOG_ALL;
-+
-+ //Tell OOo to only print 1 simple copy, we'll stick everything
-+ //else through cups
-+ SetCopyCount(1);
-+ EnableCollate(false);
-+ CheckCollate(false);
-+
-+ pStr = 0;
-+
-+ if (sPath.getLength())
-+ pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT);
-+
-+ if (pStr && !strcmp(pStr, "pdf"))
-+ {
-+ gtk_widget_hide( aHandle.pDialog );
-+ rtl::OUString sFileURL;
-+ FileBase::getFileURLFromSystemPath(sPath, sFileURL);
-+ ExportAsPDF(sFileURL, meCheckRange, maRangeText);
-+ }
-+ else
-+ {
-+ nRet = TRUE;
-+ rtl::OUString sNewPrinterName(mpPrinter->GetName());
-+
-+ if (sPath.getLength())
-+ sNewPrinterName = ASCII_STR("Generic Printer");
-+ else if (GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog)))
-+ {
-+ pStr = gtk_print_settings_get(pSettings, "lpr-commandline");
-+ if (pStr && *pStr)
-+ {
-+ sNewPrinterName = ASCII_STR("Generic Printer");
-+ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
-+ psp::PrinterInfo aInfo(rManager.getPrinterInfo(sNewPrinterName));
-+ aInfo.m_aCommand = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
-+ rManager.changePrinterInfo(sNewPrinterName, aInfo);
-+ }
-+ else
-+ {
-+ pStr = gtk_printer_get_name(pPrinter);
-+ sNewPrinterName = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
-+ }
-+ }
-+
-+ OUString sOldPrinterName(mpPrinter->GetName());
-+ if (sNewPrinterName != sOldPrinterName)
-+ {
-+ for (int i = 0; i < 2; ++i)
-+ {
-+ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false ))
-+ {
-+ Printer aTempPrinter(*pInfo);
-+ mpPrinter->SetPrinterProps(&aTempPrinter);
-+ break;
-+ }
-+ else
-+ {
-+ if (!i)
-+ {
-+ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
-+ rManager.stopsearch();
-+ rManager.startsearch();
-+ rManager.checkPrintersChanged(true);
-+ ImplDeletePrnQueueList();
-+ }
-+ else
-+ {
-+ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n",
-+ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr());
-+ }
-+ }
-+ }
-+ }
-+ mpPrinter->Reset();
-+
-+ if (sPath.getLength())
-+ {
-+ mpPrinter->EnablePrintFile(true);
-+ mpPrinter->SetPrintFile(sPath);
-+ }
-+
-+ if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
-+ mpPrinter->SetOrientation(ORIENTATION_LANDSCAPE);
-+ else
-+ mpPrinter->SetOrientation(ORIENTATION_PORTRAIT);
-+ gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter);
-+
-+ mpPrinter->SetOrientation(ORIENTATION_PORTRAIT);
-+
-+ int nPapers = mpPrinter->GetPaperInfoCount();
-+ pStr = gtk_combo_box_get_active_text(GTK_COMBO_BOX(aHandle.paperwidget));
-+ if ( pStr && nPapers )
-+ {
-+ rtl::OUString sPaper((const sal_Char*)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
-+ for (int i = 0; i < nPapers; ++i)
-+ {
-+ const vcl::PaperInfo &rInfo = mpPrinter->GetPaperInfo(i);
-+ if (rtl::OUString(rInfo.m_aPaperName) == sPaper)
-+ {
-+ mpPrinter->SetPaperFromInfo(rInfo);
-+ break;
-+ }
-+ }
-+ }
+- }
++ short nRet = false;
+
-+ if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
-+ mpPrinter->SetOrientation(ORIENTATION_LANDSCAPE);
-+ }
-+ gtk_print_settings_to_file(pSettings, getPrintDialogSettings().getStr(), NULL);
-+ g_object_unref(pSettings);
-+ }
-+ break;
-+ default:
-+ break;
-+ }
-+ }
-+ gtk_widget_hide( aHandle.pDialog );
-+ if (nHID_PageChange)
-+ g_signal_handler_disconnect(G_OBJECT(aHandle.notebook), nHID_PageChange);
-+ gtk_widget_destroy( aHandle.pDialog );
-+ }
-+ else
++ if (
++ SvtMiscOptions().UseSystemFileDialog() &&
++ !Application::GetDesktopEnvironment().equalsIgnoreAsciiCaseAscii("kde")
++ )
+ {
-+ // Dialog starten
-+ nRet = ModalDialog::Execute();
++ unsigned long handle = GetParent() ? GetParent()->GetNativeHandle() : 0;
++ GtkWindow *parent = handle ? GTK_WINDOW(handle) : NULL;
++
++ lcl_setGTKLanguage(::comphelper::getProcessServiceFactory());
++ ourhandle aHandle;
++ aHandle.pDialog = gtk_print_unix_dialog_new (NULL, parent);
++
++ 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);
++
++ rtl::OUString aProperties(maBtnProperties.GetText());
++ aProperties = aProperties.copy(0, aProperties.lastIndexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(("...")))));
++ aProperties = aProperties.replaceAt(aProperties.indexOf('~'), 1, OUString());
++
++ gtk_print_unix_dialog_set_manual_capabilities(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog),
++ GtkPrintCapabilities(GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE |
++ GTK_PRINT_CAPABILITY_REVERSE|GTK_PRINT_CAPABILITY_GENERATE_PDF|GTK_PRINT_CAPABILITY_GENERATE_PS));
++
++ GtkWidget *box = gtk_vbox_new(FALSE, 18);
++ gtk_container_set_border_width (GTK_CONTAINER (box), 12);
++
++ GtkWidget *tablewidget = gtk_table_new (2, 2, FALSE);
++ gtk_table_set_row_spacings (GTK_TABLE (tablewidget), 6);
++ gtk_table_set_col_spacings (GTK_TABLE (tablewidget), 12);
++
++ gtk_box_pack_start (GTK_BOX (box), tablewidget, FALSE, FALSE, 0);
++
++
++ aHandle.orientwidget = gtk_combo_box_new_text();
++ aHandle.paperwidget = gtk_combo_box_new_text();
++
++ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
++ rtl::OUStringToOString(maOrientationStr, RTL_TEXTENCODING_UTF8).getStr()),
++ 0, 1, 0, 1, GTK_FILL, GTK_EXPAND, 0, 0);
++ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.orientwidget, 1, 2, 0, 1,
++ GTK_FILL, GTK_EXPAND, 0, 0);
++ gtk_table_attach(GTK_TABLE(tablewidget), gtk_label_new(
++ rtl::OUStringToOString(maPaperFormatStr, RTL_TEXTENCODING_UTF8).getStr()),
++ 0, 1, 1, 2, GTK_FILL, GTK_EXPAND, 0, 0);
++ gtk_table_attach(GTK_TABLE(tablewidget), aHandle.paperwidget, 1, 2, 1, 2,
++ GTK_FILL, GTK_EXPAND, 0, 0);
++
++ gtk_widget_show_all(box);
++
++ rtl::OString sProperties(OUStringToOString(aProperties, RTL_TEXTENCODING_UTF8));
++ gtk_print_unix_dialog_add_custom_tab(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), box,
++ gtk_label_new(sProperties.getStr()));
+
-+ // Wenn Dialog mit OK beendet wurde, dann die Daten updaten
-+ if( nRet == TRUE )
-+ {
-+ if ( TEMPPRINTER() )
-+ mpPrinter->SetPrinterProps( TEMPPRINTER() );
-+ ImplFillDialogData();
-+ }
- }
++ g_object_get(G_OBJECT(box),"parent", &aHandle.notebook,NULL);
++
++ //make this the child of the OOo document window, and make it
++ //the parent of the future OOo options window
++ if (parent) gtk_window_set_transient_for(GTK_WINDOW(aHandle.pDialog), parent);
++ mnNativeHandle = reinterpret_cast<unsigned long>(aHandle.pDialog);
++
++ GtkPrintSettings* pTempSettings = gtk_print_settings_new_from_file(getPrintDialogSettings().getStr(), NULL);
++ if (!pTempSettings)
++ pTempSettings = gtk_print_unix_dialog_get_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
++ if (const QueueInfo* pInfo = (const QueueInfo*)(maLbName.GetEntryData(maLbName.GetSelectEntryPos())))
++ {
++ gtk_print_settings_set_printer(pTempSettings, rtl::OUStringToOString(pInfo->GetPrinterName(),
++ RTL_TEXTENCODING_UTF8).getStr());
++ }
++
++ gtk_print_settings_set_int(pTempSettings, "n-copies", GetCopyCount());
++ gtk_print_settings_set_collate(pTempSettings, IsCollateEnabled() && IsCollateChecked());
++ if (mbRange)
++ {
++ GtkPageRange page_ranges;
++ page_ranges.start = page_ranges.end = maRangeText.ToInt32()-1;
++ gtk_print_settings_set_page_ranges(pTempSettings, &page_ranges, 1);
++ gtk_print_unix_dialog_set_current_page(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), page_ranges.start);
++ }
++ gtk_print_unix_dialog_set_settings(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog), pTempSettings);
++ g_object_unref(pTempSettings);
++
++ aHandle.pPrinter = mpPrinter;
++
++ SetProperties(aHandle, true);
++
++ gulong nHID_PageChange=0;
++ if (aHandle.notebook && GTK_IS_NOTEBOOK(aHandle.notebook))
++ {
++ gtk_notebook_set_current_page(GTK_NOTEBOOK(aHandle.notebook), 0);
++ nHID_PageChange = g_signal_connect(G_OBJECT(aHandle.notebook), "switch-page", G_CALLBACK(switch_page_cb), &aHandle);
++ }
++
++ bool bContinue = true;
++ while(bContinue)
++ {
++ bContinue = false;
++ gint nStatus = gtk_dialog_run( GTK_DIALOG( aHandle.pDialog ) );
++ switch( nStatus )
++ {
++ case GTK_RESPONSE_HELP:
++ ClickOptionsHdl();
++ bContinue = true;
++ break;
++ case GTK_RESPONSE_OK:
++ {
++ GtkPrintSettings* pSettings = gtk_print_unix_dialog_get_settings (GTK_PRINT_UNIX_DIALOG(aHandle.pDialog));
++
++ rtl::OUString sPath;
++ if (const gchar *uri = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_URI))
++ {
++ if (gchar *pFile = g_filename_from_uri (uri, NULL, NULL))
++ {
++ sPath = rtl::OUString((const sal_Char *)pFile, strlen((const sal_Char*)(pFile)), osl_getThreadTextEncoding());
++ g_free(pFile);
++ }
++ }
++ const gchar *pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES);
++ if (pStr && !strcmp(pStr, "ranges"))
++ {
++ maRangeText = String();
++ gint num_ranges;
++ const GtkPageRange* pRanges = gtk_print_settings_get_page_ranges(pSettings, &num_ranges);
++ for (gint i = 0; i < num_ranges; ++i)
++ {
++ maRangeText.Append(String::CreateFromInt32(pRanges[i].start+1));
++ if (pRanges[i].start != pRanges[i].end)
++ {
++ maRangeText.AppendAscii("-");
++ maRangeText.Append(String::CreateFromInt32(pRanges[i].end+1));
++ }
++
++ if (i != num_ranges-1)
++ maRangeText.AppendAscii(",");
++ }
++ meCheckRange = PRINTDIALOG_RANGE;
++ }
++ else if (pStr && !strcmp(pStr, "current"))
++ {
++ meCheckRange = PRINTDIALOG_RANGE;
++
++ try
++ {
++ Reference < XFramesSupplier > xDesktop = Reference < XFramesSupplier >(
++ ::comphelper::getProcessServiceFactory()->
++ createInstance( ASCII_STR("com.sun.star.frame.Desktop") ), UNO_QUERY );
++ Reference < XFrame > xFrame( xDesktop->getActiveFrame() );
++ if ( !xFrame.is() )
++ xFrame = Reference < XFrame >( xDesktop, UNO_QUERY );
++
++ Reference< XController > xController;
++ Reference< XSpreadsheetView > xSpreadsheetView;
++ Reference< XSpreadsheet> xSheet;
++ Reference< XSpreadsheetDocument > xSheetDoc;
++ Reference< XIndexAccess > xSheets;
++ Reference< XNamed > xName;
++
++ if (xFrame.is())
++ xController = xFrame->getController();
++ if (xController.is())
++ xSpreadsheetView = Reference< XSpreadsheetView >(xController, UNO_QUERY);
++ if (xSpreadsheetView.is())
++ xSheet = Reference< XSpreadsheet>(xSpreadsheetView->getActiveSheet());
++ if (xSheet.is())
++ xName = Reference < XNamed >(xSheet, UNO_QUERY);
++ if (xName.is())
++ xSheetDoc = Reference< XSpreadsheetDocument >(xController->getModel(), UNO_QUERY);
++ if (xSheetDoc.is())
++ xSheets = Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY);
++ if (xSheets.is())
++ {
++ const rtl::OUString &rName = xName->getName();
++
++ sal_Int32 i;
++
++ for( i = 0; i < xSheets->getCount(); ++i)
++ {
++ Reference < XNamed > xItem =
++ Reference < XNamed >(xSheets->getByIndex(i), UNO_QUERY);
++ if (rName == xItem->getName())
++ break;
++ }
++
++ if (i < xSheets->getCount())
++ maRangeText = String::CreateFromInt32( i + 1 );
++ }
++ }
++ catch (...) {}
++ }
++ else
++ meCheckRange = PRINTDIALOG_ALL;
++
++ //Tell OOo to only print 1 simple copy, we'll stick everything
++ //else through cups
++ SetCopyCount(1);
++ EnableCollate(false);
++ CheckCollate(false);
++
++ pStr = 0;
++
++ if (sPath.getLength())
++ pStr = gtk_print_settings_get(pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT);
++
++ if (pStr && !strcmp(pStr, "pdf"))
++ {
++ gtk_widget_hide( aHandle.pDialog );
++ rtl::OUString sFileURL;
++ FileBase::getFileURLFromSystemPath(sPath, sFileURL);
++ ExportAsPDF(sFileURL, meCheckRange, maRangeText);
++ }
++ else
++ {
++ nRet = TRUE;
++ rtl::OUString sNewPrinterName(mpPrinter->GetName());
++
++ if (sPath.getLength())
++ sNewPrinterName = ASCII_STR("Generic Printer");
++ else if (GtkPrinter* pPrinter = gtk_print_unix_dialog_get_selected_printer(GTK_PRINT_UNIX_DIALOG(aHandle.pDialog)))
++ {
++ pStr = gtk_print_settings_get(pSettings, "lpr-commandline");
++ if (pStr && *pStr)
++ {
++ sNewPrinterName = ASCII_STR("Generic Printer");
++ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
++ psp::PrinterInfo aInfo(rManager.getPrinterInfo(sNewPrinterName));
++ aInfo.m_aCommand = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++ rManager.changePrinterInfo(sNewPrinterName, aInfo);
++ }
++ else
++ {
++ pStr = gtk_printer_get_name(pPrinter);
++ sNewPrinterName = rtl::OUString((const sal_Char *)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++ }
++ }
++
++ OUString sOldPrinterName(mpPrinter->GetName());
++ if (sNewPrinterName != sOldPrinterName)
++ {
++ for (int i = 0; i < 2; ++i)
++ {
++ if (const QueueInfo* pInfo = Printer::GetQueueInfo( sNewPrinterName, false ))
++ {
++ Printer aTempPrinter(*pInfo);
++ mpPrinter->SetPrinterProps(&aTempPrinter);
++ break;
++ }
++ else
++ {
++ if (!i)
++ {
++ psp::PrinterInfoManager& rManager( psp::PrinterInfoManager::get() );
++ rManager.stopsearch();
++ rManager.startsearch();
++ rManager.checkPrintersChanged(true);
++ ImplDeletePrnQueueList();
++ }
++ else
++ {
++ fprintf(stderr, "OOo UNKNOWN PRINTER \"%s\"\n",
++ rtl::OUStringToOString(sNewPrinterName, RTL_TEXTENCODING_UTF8).getStr());
++ }
++ }
++ }
++ }
++ mpPrinter->Reset();
++
++ if (sPath.getLength())
++ {
++ mpPrinter->EnablePrintFile(true);
++ mpPrinter->SetPrintFile(sPath);
++ }
++
++ if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
++ mpPrinter->SetOrientation(ORIENTATION_LANDSCAPE);
++ else
++ mpPrinter->SetOrientation(ORIENTATION_PORTRAIT);
++ gtk_print_settings_foreach(pSettings, setcupskey, mpPrinter);
++
++ mpPrinter->SetOrientation(ORIENTATION_PORTRAIT);
++
++ int nPapers = mpPrinter->GetPaperInfoCount();
++ pStr = gtk_combo_box_get_active_text(GTK_COMBO_BOX(aHandle.paperwidget));
++ if ( pStr && nPapers )
++ {
++ rtl::OUString sPaper((const sal_Char*)pStr, strlen((const sal_Char*)(pStr)), RTL_TEXTENCODING_UTF8);
++ for (int i = 0; i < nPapers; ++i)
++ {
++ const vcl::PaperInfo &rInfo = mpPrinter->GetPaperInfo(i);
++ if (rtl::OUString(rInfo.m_aPaperName) == sPaper)
++ {
++ mpPrinter->SetPaperFromInfo(rInfo);
++ break;
++ }
++ }
++ }
++
++ if (1 == gtk_combo_box_get_active(GTK_COMBO_BOX(aHandle.orientwidget)))
++ mpPrinter->SetOrientation(ORIENTATION_LANDSCAPE);
++ }
++ gtk_print_settings_to_file(pSettings, getPrintDialogSettings().getStr(), NULL);
++ g_object_unref(pSettings);
++ }
++ break;
++ default:
++ break;
++ }
++ }
++ gtk_widget_hide( aHandle.pDialog );
++ if (nHID_PageChange)
++ g_signal_handler_disconnect(G_OBJECT(aHandle.notebook), nHID_PageChange);
++ gtk_widget_destroy( aHandle.pDialog );
++ }
++ else
++ {
++ // Dialog starten
++ nRet = ModalDialog::Execute();
++
++ // Wenn Dialog mit OK beendet wurde, dann die Daten updaten
++ if( nRet == TRUE )
++ {
++ if ( TEMPPRINTER() )
++ mpPrinter->SetPrinterProps( TEMPPRINTER() );
++ ImplFillDialogData();
++ }
++ }
maStatusTimer.Stop();
-@@ -798,4 +1435,3 @@
+
+@@ -798,4 +1456,3 @@
mpPrinterImpl->m_bHelpDisabled = sal_True;
maBtnHelp.Disable();
}
@@ -1604,10 +1608,10 @@
diff -u -r1.80.24.1 window.hxx
--- 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
- */
- void doLazyDelete();
+@@ -1133,6 +1133,9 @@
+
+ virtual XubString GetSurroundingText() const;
+ virtual Selection GetSurroundingTextSelection() const;
+
+ virtual unsigned long GetNativeHandle() const;
+ virtual void SetNativeParent(unsigned long nParent);
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/devel/openoffice.org-2.2.0.ooo68717.gstreamer.video.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 18 Dec 2008 18:40:27 -0000 1.13
+++ openoffice.org-2.2.0.ooo68717.gstreamer.video.patch 12 Feb 2009 14:25:02 -0000 1.14
@@ -213,25 +213,17 @@
"MPEG Video", "mpg;mpeg;mpv;mp4",
"Ogg bitstream", "ogg",
"Quicktime Video", "mov",
---- config_office-orig/configure.in 2006-08-17 10:43:11.000000000 +0200
-+++ config_office/configure.in 2006-08-17 10:48:43.000000000 +0200
-@@ -832,6 +832,7 @@
- solaris*)
- test_gtk=yes
- build_cairo=yes
-+ build_gstreamer=yes
- test_kde=yes
- test_cups=yes
- test_randr=yes
-@@ -859,6 +860,7 @@
+--- configure.in.orig 2006-08-17 10:43:11.000000000 +0200
++++ configure.in 2006-08-17 10:48:43.000000000 +0200
+@@ -908,6 +908,7 @@
linux-gnu*)
test_gtk=yes
- build_cairo=yes
+ test_cairo=yes
+ build_gstreamer=yes
test_kde=yes
test_cups=yes
test_randr=yes
-@@ -5406,6 +5411,26 @@
+@@ -5688,6 +5689,26 @@
AC_SUBST(JCOMMON_SERIALIZER_JAR)
dnl ===================================================================
@@ -258,16 +250,16 @@
dnl Check whether the Qt and KDE libraries are available.
dnl ===================================================================
---- config_office-orig/set_soenv.in 2006-08-17 10:43:11.000000000 +0200
-+++ config_office/set_soenv.in 2006-08-17 11:05:37.000000000 +0200
-@@ -1733,6 +1733,7 @@
+--- set_soenv.in.orig 2006-08-17 10:43:11.000000000 +0200
++++ set_soenv.in 2006-08-17 11:05:37.000000000 +0200
+@@ -1748,6 +1748,7 @@
ToFile( "SYSTEM_SERVLETAPI", "@SYSTEM_SERVLETAPI@", "e" );
ToFile( "SERVLETAPI_JAR", "@SERVLETAPI_JAR@", "e" );
ToFile( "ENABLE_DBUS", "@ENABLE_DBUS@", "e" );
+ToFile( "ENABLE_GSTREAMER", "@ENABLE_GSTREAMER@", "e" );
+ ToFile( "ENABLE_GCONF", "@ENABLE_GCONF@", "e" );
ToFile( "ENABLE_GNOMEVFS", "@ENABLE_GNOMEVFS@", "e" );
ToFile( "ENABLE_GIO", "@ENABLE_GIO@", "e" );
- ToFile( "ENABLE_KDE", "@ENABLE_KDE@", "e" );
diff -rup scp2-orig/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
--- scp2-orig/source/ooo/file_library_ooo.scp 2006-08-17 16:08:34.000000000 +0200
+++ scp2/source/ooo/file_library_ooo.scp 2006-08-17 16:11:26.000000000 +0200
@@ -3181,15 +3173,15 @@
diff -u -r1.5 LocaleCodes.java
--- wizards.orig/com/sun/star/wizards/letter/LocaleCodes.java 23 Nov 2007 16:52:56 -0000 1.5
+++ wizards/com/sun/star/wizards/letter/LocaleCodes.java 5 Feb 2008 08:57:11 -0000
-@@ -12,7 +12,7 @@
-
- public LocaleCodes (XMultiServiceFactory xmsf) {
+@@ -45,7 +45,7 @@
+ public LocaleCodes(XMultiServiceFactory xmsf)
+ {
super(xmsf, UNIT_NAME, MODULE_NAME);
- allLanguageStrings = getStringList(16300); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+ allLanguageStrings = getStringList(16302); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
}
-
- public String getLanguageString(String MSID) {
+
+ public String getLanguageString(String MSID)
diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.cxx source/gstreamer/gstplayer.cxx
--- avmedia.orig/source/gstreamer/gstplayer.cxx 2007-08-07 19:50:02.000000000 +0100
+++ avmedia/source/gstreamer/gstplayer.cxx 2007-08-07 17:14:52.000000000 +0100
openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch:
Index: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 15 Apr 2008 18:04:28 -0000 1.4
+++ openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch 12 Feb 2009 14:25:02 -0000 1.5
@@ -11,7 +11,7 @@
diff -ru sd/sdi/TaskPaneViewShell.sdi sd/sdi/TaskPaneViewShell.sdi
--- openoffice.org.orig/sd/sdi/TaskPaneViewShell.sdi 2008-02-05 17:05:16.000000000 +0000
+++ openoffice.org/sd/sdi/TaskPaneViewShell.sdi 2008-02-05 20:30:12.000000000 +0000
-@@ -159,6 +159,31 @@
+@@ -154,6 +154,31 @@
GroupId = GID_VIEW;
]
@@ -40,10 +40,10 @@
+ GroupId = GID_VIEW;
+]
+
- SfxVoidItem InsertPage SID_INSERTPAGE_LAYOUT_MENU
+ SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU
[
/* flags: */
-@@ -212,6 +237,11 @@
+@@ -207,6 +232,11 @@
ExecMethod = Execute ;
StateMethod = GetState ;
]
@@ -111,7 +111,7 @@
diff -ru sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx 2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.cxx 2008-02-06 16:28:56.000000000 +0000
-@@ -39,6 +39,7 @@
+@@ -34,6 +34,7 @@
#include "CurrentMasterPagesSelector.hxx"
#include "PreviewValueSet.hxx"
#include "ViewShellBase.hxx"
@@ -119,10 +119,10 @@
#include "drawdoc.hxx"
#include "sdpage.hxx"
#include "MasterPageContainer.hxx"
-@@ -243,5 +244,12 @@
- return 0;
+@@ -328,6 +329,13 @@
}
+
+void CurrentMasterPagesSelector::GetState (SfxItemSet& rItemSet)
+{
+ MasterPagesSelector::GetState (rItemSet);
@@ -131,6 +131,7 @@
+ rItemSet.DisableItem (SID_TP_EDIT_MASTER);
+}
+
} } } // end of namespace ::sd::toolpanel::controls
diff -ru sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/CurrentMasterPagesSelector.hxx 2008-02-05 17:05:15.000000000 +0000
@@ -184,18 +185,6 @@
case SID_CUT:
case SID_COPY:
case SID_PASTE:
-diff -ru sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
---- openoffice.org.orig/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx 2008-02-05 17:05:15.000000000 +0000
-+++ openoffice.org/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx 2008-02-06 13:56:58.000000000 +0000
-@@ -106,7 +106,7 @@
- virtual sal_Int32 GetMinimumWidth (void);
-
- void Execute (SfxRequest& rRequest);
-- void GetState (SfxItemSet& rItemSet);
-+ virtual void GetState (SfxItemSet& rItemSet);
-
- /** Update the selection of previews according to whatever
- influences them appart from mouse and keyboard. If, for
diff -ru sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx
--- openoffice.org.orig/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx 2008-02-05 17:05:15.000000000 +0000
+++ openoffice.org/sd/source/ui/toolpanel/controls/RecentMasterPagesSelector.cxx 2008-02-06 14:01:57.000000000 +0000
openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch:
Index: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 1 Sep 2008 12:09:08 -0000 1.2
+++ openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch 12 Feb 2009 14:25:02 -0000 1.3
@@ -5,16 +5,16 @@
diff -u -r1.24 salplug.cxx
--- openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx 15 Oct 2007 13:07:38 -0000 1.24
+++ openoffice.org.orig/vcl/unx/source/plugadapt/salplug.cxx 10 Jan 2008 18:00:21 -0000
-@@ -444,7 +444,7 @@
- else if( desktop == desktop_strings[DESKTOP_KDE] )
- pRet = "kde";
- else
-- pRet = "gen";
-+ pRet = "gtk";
-
- #if OSL_DEBUG_LEVEL > 1
- std::fprintf( stderr, "plugin autodetection: %s\n", pRet );
-@@ -496,7 +496,7 @@
+@@ -434,7 +434,7 @@
+ static const char* autodetect_plugin()
+ {
+ const char * desktop = get_desktop_environment();
+- const char * pRet = "gen";
++ const char * pRet = "gtk";
+
+ // no server at all: dummy plugin
+ if ( desktop == desktop_strings[DESKTOP_NONE] )
+@@ -502,7 +502,7 @@
// fallback to gen
if( ! pInst )
openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch:
Index: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 18 Nov 2008 12:14:09 -0000 1.3
+++ openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch 12 Feb 2009 14:25:02 -0000 1.4
@@ -15,7 +15,7 @@
diff -ru psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
--- openoffice.org.orig/psprint/source/fontmanager/fontconfig.cxx 2008-05-26 15:48:28.000000000 +0100
+++ openoffice.org/psprint/source/fontmanager/fontconfig.cxx 2008-05-26 16:07:30.000000000 +0100
-@@ -581,6 +581,72 @@
+@@ -560,6 +560,72 @@
return true;
}
@@ -88,7 +88,7 @@
int PrintFontManager::countFontconfigFonts()
{
int nFonts = 0;
-@@ -709,47 +775,11 @@
+@@ -687,47 +753,11 @@
pUpdate->m_nFamilyName = nFamilyName;
}
if( eWeightRes == FcResultMatch )
@@ -139,7 +139,7 @@
if( eStyleRes == FcResultMatch )
{
pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
-@@ -888,8 +918,8 @@
+@@ -867,8 +897,8 @@
rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
rtl::OUString& rMissingCodes, const rtl::OString &rLangAttrib,
@@ -150,7 +150,7 @@
{
rtl::OUString aName;
FontCfgWrapper& rWrapper = FontCfgWrapper::get();
-@@ -932,7 +962,7 @@
+@@ -903,7 +933,7 @@
rWrapper.FcCharSetDestroy( unicodes );
}
@@ -158,8 +158,8 @@
+ addtopattern(rWrapper, pPattern, rItalic, rWeight, rWidth, rPitch);
// query fontconfig for a substitute
- rWrapper.FcConfigSubstitute( rWrapper.getDefConfig(), pPattern, FcMatchPattern );
-@@ -969,6 +999,17 @@
+ rWrapper.FcConfigSubstitute( rWrapper.FcConfigGetCurrent(), pPattern, FcMatchPattern );
+@@ -940,6 +970,17 @@
if (aI != rWrapper.m_aFontNameToLocalized.end())
sFamily = aI->second;
aName = rtl::OStringToOUString( sFamily, RTL_TEXTENCODING_UTF8 );
openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch:
Index: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 1 Sep 2008 12:09:08 -0000 1.3
+++ openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch 12 Feb 2009 14:25:02 -0000 1.4
@@ -57,15 +57,15 @@
diff -ru vcl/source/window/winproc.cxx vcl/source/window/winproc.cxx
--- openoffice.org.orig/vcl/source/window/winproc.cxx 2008-04-15 08:44:34.000000000 +0100
+++ openoffice.org/vcl/source/window/winproc.cxx 2008-04-15 16:40:53.000000000 +0100
-@@ -78,6 +78,7 @@
- extern void MyOutputDebugString( char *s);
- #endif
- #endif
+@@ -64,6 +64,7 @@
+ #include <vcl/dockwin.hxx>
+ #include <vcl/salgdi.hxx>
+ #include <vcl/menu.hxx>
+#include <vcl/glyphcache.hxx>
-
- //#define USE_NEW_RTL_IMPLEMENTATION
-@@ -2225,9 +2226,14 @@
+ #include <dndlcon.hxx>
+ #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
+@@ -2217,9 +2218,14 @@
nType = DATACHANGED_DISPLAY;
break;
case SALEVENT_FONTCHANGED:
openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch:
Index: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch 16 Apr 2008 12:55:16 -0000 1.1
+++ openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch 12 Feb 2009 14:25:02 -0000 1.2
@@ -20,16 +20,7 @@
diff -u -r1.54.216.1 output2.cxx
--- openoffice.org.orig/sc/source/ui/view/output2.cxx 18 Jan 2008 12:02:36 -0000 1.54.216.1
+++ openoffice.org/sc/source/ui/view/output2.cxx 16 Apr 2008 12:19:34 -0000
-@@ -83,6 +83,8 @@
- #include "scmod.hxx"
- #include "fillinfo.hxx"
-
-+#include <stdio.h>
-+
- //! Autofilter-Breite mit column.cxx zusammenfassen
- #define DROPDOWN_BITMAP_SIZE 17
-
-@@ -2003,6 +2005,21 @@
+@@ -1907,6 +1907,21 @@
}
}
@@ -51,7 +42,7 @@
void ScOutputData::DrawEdit(BOOL bPixelToLogic)
{
vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() );
-@@ -2694,13 +2711,8 @@
+@@ -2524,13 +2539,8 @@
(ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE);
BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1;
@@ -67,7 +58,7 @@
bClip = TRUE;
else
bSimClip = TRUE;
-@@ -2750,6 +2762,18 @@
+@@ -2580,6 +2590,18 @@
#endif
Rectangle aLogicClip;
@@ -86,7 +77,7 @@
if (bClip || bSimClip)
{
// Clip marks are already handled in GetOutputArea
-@@ -2805,10 +2829,20 @@
+@@ -2635,10 +2657,20 @@
}
else
{
openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch:
Index: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch 5 Jan 2009 10:58:17 -0000 1.1
+++ openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch 12 Feb 2009 14:25:02 -0000 1.2
@@ -5,112 +5,133 @@
diff -u -r1.113.44.3 ww8atr.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8atr.cxx 12 Dec 2008 11:12:04 -0000 1.113.44.3
+++ openoffice.org/sw/source/filter/ww8/ww8atr.cxx 5 Jan 2009 10:47:18 -0000
-@@ -2112,57 +2112,72 @@
+@@ -2141,76 +2141,73 @@
if( nsSwTOXElement::TOX_OUTLINELEVEL & pTOX->GetCreateType() )
{
-+ // Take the TOC value of the max level to evaluate to as
-+ // the starting point for the \o flag, but reduce it to the
-+ // value of the highest outline level filled by a *standard*
-+ // Heading 1 - 9 style because \o "Builds a table of
-+ // contents from paragraphs formatted with built-in heading
-+ // styles". And afterward fill in any outline styles left
-+ // uncovered by that range to the \t flag
-+ //
-+ // i.e. for
-+ // Heading 1
-+ // Heading 2
-+ // custom-style
-+ // Heading 4
-+ // output
-+ // \o 1-2 \tcustom-style,3,Heading 3,4
++ // Take the TOC value of the max level to evaluate to as
++ // the starting point for the \o flag, but reduce it to the
++ // value of the highest outline level filled by a *standard*
++ // Heading 1 - 9 style because \o "Builds a table of
++ // contents from paragraphs formatted with built-in heading
++ // styles". And afterward fill in any outline styles left
++ // uncovered by that range to the \t flag
++ //
++ // i.e. for
++ // Heading 1
++ // Heading 2
++ // custom-style
++ // Heading 4
++ // output
++ // \o 1-2 \tcustom-style,3,Heading 3,4
+
// Search over all the outline styles used and figure out
- // what is the minimum outline level we need to display
- // (ignoring headline styles 1-9)
-- BYTE nLvl = 0, nMinLvl = 0;
-+ // what is the minimum outline level (if any) filled by a
-+ // non-standard style for that level, i.e. ignore headline
-+ // styles 1-9 and find the lowest valid outline level
+- //BYTE nLvl = 0, nMinLvl = 0; //#outline level, removed by zhaojianwei
+- int nLvl = 0, nMinLvl = 0; //<-end,add by zhaojianwei
++ // what is the minimum outline level (if any) filled by a
++ // non-standard style for that level, i.e. ignore headline
++ // styles 1-9 and find the lowest valid outline level
+ BYTE nPosOfLowestNonStandardLvl = MAXLEVEL;
const SwTxtFmtColls& rColls = *pDoc->GetTxtFmtColls();
-- const SwTxtFmtColl* pColl;
+ const SwTxtFmtColl* pColl;
for( n = rColls.Count(); n; )
{
- pColl = rColls[ --n ];
-- nLvl = pColl->GetOutlineLevel();
+- //nLvl = pColl->GetOutlineLevel(); //#outline level,zhaojianwei
+- //USHORT nPoolId = pColl->GetPoolFmtId();
+- //if( MAXLEVEL > nLvl && nMinLvl < nLvl && //<-end, ->add by zhaojianwei
+ const SwTxtFmtColl* pColl = rColls[ --n ];
+ BYTE nTestLvl = pColl->GetOutlineLevel();
- USHORT nPoolId = pColl->GetPoolFmtId();
-- if( MAXLEVEL > nLvl && nMinLvl < nLvl &&
+ USHORT nPoolId = pColl->GetPoolFmtId();
+- if( pColl->IsAssignedToListLevelOfOutlineStyle() &&
+- nMinLvl < (nLvl = pColl->GetAssignedOutlineStyleLevel()) && //<-end,zhaojianwei
- ( RES_POOLCOLL_HEADLINE1 > nPoolId ||
- RES_POOLCOLL_HEADLINE9 < nPoolId ))
-- {
--
+ if (
+ (RES_POOLCOLL_HEADLINE1 > nPoolId || RES_POOLCOLL_HEADLINE9 < nPoolId) && //Is a Non-Standard Outline Style
+ (nTestLvl < MAXLEVEL) && //Has a valid outline level
+ (nTestLvl < nPosOfLowestNonStandardLvl) // Is less than the lowest known non-standard level
+ )
-+ {
-+ nPosOfLowestNonStandardLvl = nTestLvl;
-+ }
-+ }
-
-- // If we are using the default heading styles then use nTOXLvl
-- if(!nMinLvl)
-- nLvl = static_cast< BYTE >(nTOXLvl);
-- else
-- nLvl = nMinLvl < nTOXLvl ? nMinLvl : (BYTE)nTOXLvl;
+ {
+- // If we are using the default heading styles then use nTOXLvl
+- if(!nMinLvl)
+- nLvl = nTOXLvl;
+- else
+- nLvl = nMinLvl < nTOXLvl ? nMinLvl : (BYTE)nTOXLvl;
- nMinLvl = nLvl;
-- }
-- }
-+ BYTE nMaxMSAutoEvaluate = nPosOfLowestNonStandardLvl < nTOXLvl ? nPosOfLowestNonStandardLvl : (BYTE)nTOXLvl;
-
-- if( nLvl )
-+ //output \o 1-X where X is the highest normal outline style to be included in the toc
-+ if( nMaxMSAutoEvaluate )
- {
-- USHORT nTmpLvl = nLvl + 1;
++ nPosOfLowestNonStandardLvl = nTestLvl;
+ }
+ }
+
+- // --> OD 2008-12-19 #i70748#
+- // Correction: in the above loop the <nMinLvl> is set != 0,
+- // if a to outline style assigned paragraph style exists,
+- // which does not belong to the default ones.
+- // It has to be considered that the last checked
+- // to outline style assigned paragraph style could have
+- // assigned outline style level == 0.
+- // Thus, check on and export of <nMinLvl> instead of <nLvl>.
+-// if( nLvl )
+- if ( nMinLvl > 0 )
+- {
+- int nTmpLvl = nMinLvl + 1;
- if (nTmpLvl > WW8ListManager::nMaxLevel)
- nTmpLvl = WW8ListManager::nMaxLevel;
-+ if (nMaxMSAutoEvaluate > WW8ListManager::nMaxLevel)
-+ nMaxMSAutoEvaluate = WW8ListManager::nMaxLevel;
++ BYTE nMaxMSAutoEvaluate = nPosOfLowestNonStandardLvl < nTOXLvl ? nPosOfLowestNonStandardLvl : (BYTE)nTOXLvl;
- sStr.APPEND_CONST_ASC( "\\o \"1-" );
+- sStr.APPEND_CONST_ASC( "\\o \"1-" );
- sStr += String::CreateFromInt32( nTmpLvl );
-+ sStr += String::CreateFromInt32( nMaxMSAutoEvaluate );
- sStr.AppendAscii(sEntryEnd);
-
+- sStr.AppendAscii(sEntryEnd);
++ //output \o 1-X where X is the highest normal outline style to be included in the toc
++ if ( nMaxMSAutoEvaluate )
++ {
++ if (nMaxMSAutoEvaluate > WW8ListManager::nMaxLevel)
++ nMaxMSAutoEvaluate = WW8ListManager::nMaxLevel;
+
++ sStr.APPEND_CONST_ASC( "\\o \"1-" );
++ sStr += String::CreateFromInt32( nMaxMSAutoEvaluate );
++ sStr.AppendAscii(sEntryEnd);
}
+- // <--
-- if( nLvl != nMinLvl )
-+ //collect up any other styles in the writer TOC which will
-+ //not already appear in the MS TOC and place then into the
-+ //\t option
+- // --> OD 2008-12-19 #i70748#
+- // See above, checking <nLvl != nMinLvl> does not make sense.
+-// if( nLvl != nMinLvl )
+- if( nMinLvl > 0 )
+- // <--
++ //collect up any other styles in the writer TOC which will
++ //not already appear in the MS TOC and place then into the
++ //\t option
+ if( nMaxMSAutoEvaluate < nTOXLvl )
{
-- // collect this templates into the \t otion
+ // collect this templates into the \t otion
for( n = rColls.Count(); n;)
{
- pColl = rColls[--n];
-- nLvl = pColl->GetOutlineLevel();
-- if (MAXLEVEL > nLvl && nMinLvl <= nLvl)
-+ const SwTxtFmtColl* pColl = rColls[ --n ];
-+ BYTE nTestLvl = pColl->GetOutlineLevel();
-+ if (nTestLvl < nTOXLvl && nTestLvl >= nMaxMSAutoEvaluate)
- {
- if( sTOption.Len() )
+- //nLvl = pColl->GetOutlineLevel(); //#outline level, removed by zhaojianwei
+- //if (MAXLEVEL > nLvl && nMinLvl <= nLvl)
+- //{ //<-end, ->add by zhaojianwei
+- if( pColl->IsAssignedToListLevelOfOutlineStyle() &&
+- nMinLvl <= ( nLvl = pColl->GetAssignedOutlineStyleLevel()))
+- { //<-end,zhaojianwei
+- if( sTOption.Len() )
- sTOption += ';';
- (( sTOption += pColl->GetName() ) += ';' )
- += String::CreateFromInt32( nLvl + 1 );
++ const SwTxtFmtColl* pColl = rColls[ --n ];
++ BYTE nTestLvl = pColl->GetOutlineLevel();
++ if (nTestLvl < nTOXLvl && nTestLvl >= nMaxMSAutoEvaluate)
++ {
++ if( sTOption.Len() )
+ sTOption += ',';
+ (( sTOption += pColl->GetName() ) += ',' )
+ += String::CreateFromInt32( nTestLvl + 1 );
}
}
}
-@@ -2175,16 +2190,21 @@
+@@ -2223,16 +2220,21 @@
if( rStyles.Len() )
{
xub_StrLen nPos = 0;
openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch:
Index: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 12 Jan 2009 09:02:58 -0000 1.1
+++ openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch 12 Feb 2009 14:25:02 -0000 1.2
@@ -5,7 +5,7 @@
diff -u -r1.21 urp_environment.cxx
--- openoffice.org.orig/bridges/source/remote/urp/urp_environment.cxx 11 Apr 2008 11:14:42 -0000 1.21
+++ openoffice.org/bridges/source/remote/urp/urp_environment.cxx 12 Jan 2009 08:56:26 -0000
-@@ -182,6 +184,7 @@
+@@ -182,6 +182,7 @@
{
~StaticSingleton()
{
@@ -13,7 +13,7 @@
g_bStaticDestructorsCalled = sal_True;
}
};
-@@ -269,8 +272,11 @@
+@@ -267,8 +268,11 @@
}
// in case, that the static destructors already have been called, no
// tiding up is done.
@@ -25,19 +25,18 @@
// TODO : not threadsafe
// synchronization with dispatch methods needed !
-@@ -341,9 +347,12 @@
+@@ -335,8 +339,12 @@
+ pImpl->m_pReader = 0;
}
- pImpl->m_pReader = 0;
- // delete the stubs
- releaseStubs( pEnvRemote );
--
-+ ::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
-+ if (!g_bStaticDestructorsCalled)
-+ {
-+ // delete the stubs
-+ releaseStubs( pEnvRemote );
-+ }
++ ::osl::MutexGuard static_dtor_mutex( ::osl::Mutex::getGlobalMutex() );
++ if (!g_bStaticDestructorsCalled)
++ {
++ // delete the stubs
++ releaseStubs( pEnvRemote );
++ }
+
}
}
-
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1791
retrieving revision 1.1792
diff -u -r1.1791 -r1.1792
--- openoffice.org.spec 10 Feb 2009 23:17:30 -0000 1.1791
+++ openoffice.org.spec 12 Feb 2009 14:25:02 -0000 1.1792
@@ -1,6 +1,6 @@
-%define oootag OOO300
-%define ooomilestone 15
-%define rh_rpm_release 8
+%define oootag OOO310
+%define ooomilestone 1
+%define rh_rpm_release 1
# rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
%define __jar_repack %{nil}
@@ -34,7 +34,7 @@
Summary: OpenOffice.org comprehensive office suite.
Name: openoffice.org
-Version: 3.0.1
+Version: 3.1.0
Release: %{ooomilestone}.%{rh_rpm_release}%{?dist}
Epoch: 1
License: LGPLv3 and LGPLv2+ and MPLv1.1 and BSD
@@ -79,68 +79,46 @@
Patch8: openoffice.org-2.0.2.rh188467.printingdefaults.patch
Patch9: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
Patch10: openoffice.org-2.0.4.rhXXXXXX.padmin.nospadmin.patch
-Patch11: workspace.i18n45.patch
-Patch12: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
-Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
-Patch14: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch15: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
-Patch16: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
-Patch17: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
-Patch18: workspace.selinux01.patch
-Patch19: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
-Patch20: workspace.impressfontsize.patch
-Patch21: workspace.impressfontsize.tar.gz
-Patch22: openoffice.org-2.3.0.ooo76649.httpencoding.patch
-Patch23: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
-Patch24: workspace.cmcfixes48.patch
-Patch25: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
-Patch26: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
-Patch27: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
-Patch28: workspace.mba31issues01.patch
-Patch29: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
-Patch30: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
-Patch31: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
-Patch32: workspace.tl66.patch
-Patch33: workspace.locales31.patch
-Patch34: workspace.fpicker8.patch
-Patch35: workspace.cmcfixes49.patch
-Patch36: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
-Patch37: workspace.cmcfixes50.patch
-Patch38: workspace.vcl94.patch
-Patch39: workspace.vcl95.patch
-Patch40: workspace.jl115.patch
-Patch41: workspace.mhu17.patch
-Patch42: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
-Patch43: openoffice.org-3.0.0.ooo95318.system-showicons.patch
-Patch44: workspace.vcl96.patch
-Patch45: workspace.hb12.patch
-Patch46: workspace.fwk92.patch
-Patch47: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
-Patch48: workspace.sb101.patch
-Patch49: workspace.sw31bf02.patch
-Patch50: workspace.cmcfixes51.patch
-Patch51: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
-Patch52: workspace.tkr16.patch
-Patch53: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
-Patch54: workspace.transogl03.patch
-Patch55: workspace.vcl97.patch
-Patch56: workspace.vcl98.patch
-Patch57: workspace.configuretoplevel.patch
-Patch58: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
-Patch59: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
-Patch60: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
-Patch61: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
-Patch62: workspace.fwk99.patch
-Patch63: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
-Patch64: workspace.fwk102.patch
-Patch65: workspace.cmcfixes54.patch
-Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
-Patch67: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
-Patch68: workspace.gcc44.patch
-Patch69: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
-Patch70: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
-Patch71: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
-Patch72: openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch
+Patch11: openoffice.org-2.1.0.ooo65491.psprint.enablenups.patch
+Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
+Patch13: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
+Patch14: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch15: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
+Patch16: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
+Patch17: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
+Patch18: openoffice.org-2.3.0.ooo76649.httpencoding.patch
+Patch19: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
+Patch20: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
+Patch21: openoffice.org-2.4.0.ooo85921.sd.editmasterundermouse.patch
+Patch22: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
+Patch23: workspace.mba31issues01.patch
+Patch24: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
+Patch25: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch26: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch27: workspace.tl66.patch
+Patch28: openoffice.org-3.0.0.ooo91924.svx.consistentordering.patch
+Patch29: workspace.jl115.patch
+Patch30: workspace.mhu17.patch
+Patch31: openoffice.org-3.0.0.ooo95018.sal.fdwarnings.patch
+Patch32: workspace.gtkmenuimages.patch
+# review to see if fixed in new impl
+# Patch33: openoffice.org-3.0.0.ooo95834.dontset-nonfunctional-forward.patch
+Patch34: openoffice.org-3.0.0.ooo96279.swext.mediawiki.proxies.patch
+Patch35: openoffice.org-3.0.1.ooo97088.sd.accel-fallback.patch
+Patch36: workspace.transogl03redux.patch
+Patch37: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+Patch38: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
+Patch39: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch40: openoffice.org-3.0.1.oooXXXXX.fpicker.allformatsonsave.patch
+Patch41: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
+Patch42: workspace.fwk102.patch
+Patch43: workspace.cmcfixes54.patch
+Patch44: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch45: openoffice.org-3.0.1.ooo98649.svtools.missingUI.patch
+Patch46: openoffice.org-3.0.1.ooo98885.sw.safeindex.patch
+Patch47: openoffice.org-3.0.1.ooo98909.sfx2.missingplugins.patch
+Patch48: openoffice.org-3.0.1.ooo99050.sw.htmlload.patch
+Patch49: openoffice.org-3.0.1.ooo99081.vcl.dont.release.before-reuse.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1546,76 +1524,52 @@
%patch8 -p1
%patch9 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
%patch10 -p1 -b .rhXXXXXX.padmin.nospadmin.patch
-%patch11 -p1 -b .workspace.i18n45.patch
-%patch12 -p1 -b .ooo65491.psprint.enablenups.patch
-cat %{PATCH13} >> svtools/source/dialogs/localize.sdf
-%patch14 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
-%patch15 -p0 -b .ooo68717.gstreamer.video.patch
-%patch16 -p1 -b .ooo63159.sal.dtype.patch
-%patch17 -p1 -b .ooo76393.sal.dynamicsection.patch
-%patch18 -p1 -b .workspace.selinux01.patch
-%patch19 -p1 -b .ooo7065.sw.titlepagedialog.patch
-%patch20 -p1 -b .workspace.impressfontsize.patch
-tar xzf %{PATCH21}
-%patch22 -p1 -b .ooo76649.httpencoding.patch
-%patch23 -p1 -b .ooo83878.unopkg.enablelinking.patch
-%patch24 -p1
-%patch25 -p1 -b .rh133741.alwaysgtk.vcl.patch
-%patch26 -p1 -b .ooo85921.sd.editmasterundermouse.patch
-%patch27 -p1 -b .ooo86080.unopkg.bodge.patch
-%patch28 -p1 -b .workspace.mba31issues01.patch
-%patch29 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
-%patch30 -p1 -b .ooo88341.sc.verticalboxes.patch
-%patch31 -p1 -b .ooo87970.vcl.samenamesubs.patch
-%patch32 -p1 -b .workspace.tl66.patch
-%patch33 -p1 -b .workspace.locales31.patch
-%patch34 -p1 -b .workspace.fpicker8.patch
-%patch35 -p0 -b .workspace.cmcfixes49.patch
-%patch36 -p1 -b .ooo91924.svx.consistentordering.patch
-%patch37 -p1 -b .workspace.cmcfixes50.patch
-%patch38 -p1 -b .workspace.vcl94.patch
-%patch39 -p1 -b .workspace.vcl95.patch
-%patch40 -p1 -b .workspace.jl115.patch
-%patch41 -p1 -b .workspace.mhu17.patch
-%patch42 -p1 -b .ooo95018.sal.fdwarnings.patch
-%patch43 -p1 -b .ooo95318.system-showicons.patch
-%patch44 -p1 -b .workspace.vcl96.patch
-%patch45 -p1 -b .workspace.hb12.patch
-%patch46 -p1 -b .workspace.fwk92.patch
-%patch47 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
-%patch48 -p1 -b .workspace.sb101.patch
-%patch49 -p1 -b .workspace.sw31bf02.patch
-%patch50 -p1 -b .workspace.cmcfixes51.patch
-%patch51 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
-%patch52 -p1 -b .workspace.tkr16.patch
-%patch53 -p1
-%patch54 -p0 -b .workspace.transogl03.patch
-%patch55 -p1 -b .workspace.vcl97.patch
-%patch56 -p1 -b .workspace.vcl98.patch
-%patch57 -p1 -b .workspace.configuretoplevel.patch
-%patch58 -p1 -b .oooXXXXX.extensions.npapi.patch
-%patch59 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
-%patch60 -p1 -b .ooo97488.sw.ww8toc.patch
-%patch61 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
-%patch62 -p1 -b .workspace.fwk99.patch
-%patch63 -p1 -b .ooo98137.filter.redeclared-variables.patch
-%patch64 -p1 -b .workspace.fwk102.patch
-%patch65 -p1 -b .workspace.cmcfixes54.patch
-%patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
-%patch67 -p1 -b .ooo98649.svtools.missingUI.patch
-%patch68 -p1 -b .workspace.gcc44.patch
-%patch69 -p1 -b .ooo98885.sw.safeindex.patch
-%patch70 -p1 -b .ooo98909.sfx2.missingplugins.patch
-%patch71 -p1 -R -b .ooo99050.sw.htmlload.patch
-%patch72 -p1 -b .ooo99081.vcl.dont.release.before-reuse.patch
+%patch11 -p1 -b .ooo65491.psprint.enablenups.patch
+cat %{PATCH12} >> svtools/source/dialogs/localize.sdf
+%patch13 -p1 -b .ooo74188.sw.cursorinsideglyph.patch
+%patch14 -p0 -b .ooo68717.gstreamer.video.patch
+%patch15 -p1 -b .ooo63159.sal.dtype.patch
+%patch16 -p1 -b .ooo76393.sal.dynamicsection.patch
+%patch17 -p1 -b .ooo7065.sw.titlepagedialog.patch
+%patch18 -p1 -b .ooo76649.httpencoding.patch
+%patch19 -p1 -b .ooo83878.unopkg.enablelinking.patch
+%patch20 -p1 -b .rh133741.alwaysgtk.vcl.patch
+%patch21 -p1 -b .ooo85921.sd.editmasterundermouse.patch
+%patch22 -p1 -b .ooo86080.unopkg.bodge.patch
+%patch23 -p1 -b .workspace.mba31issues01.patch
+%patch24 -p1 -b .ooo64508.vcl.honourfontconfighinting.patch
+%patch25 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch26 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch27 -p1 -b .workspace.tl66.patch
+%patch28 -p1 -b .ooo91924.svx.consistentordering.patch
+%patch29 -p1 -b .workspace.jl115.patch
+%patch30 -p1 -b .workspace.mhu17.patch
+%patch31 -p1 -b .ooo95018.sal.fdwarnings.patch
+%patch32 -p0 -b .workspace.gtkmenuimages.patch
+# review to see if fixed in new impl
+# %patch33 -p1 -b .ooo95834.dontset-nonfunctional-forward.patch
+%patch34 -p1 -b .ooo96279.swext.mediawiki.proxies.patch
+%patch35 -p1
+%patch36 -p0 -b .workspace.transogl03redux.patch
+%patch37 -p1 -b .oooXXXXX.extensions.npapi.patch
+%patch38 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
+%patch39 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch40 -p1 -b .oooXXXXX.fpicker.allformatsonsave.patch
+%patch41 -p1 -b .ooo98137.filter.redeclared-variables.patch
+%patch42 -p1 -b .workspace.fwk102.patch
+%patch43 -p1 -b .workspace.cmcfixes54.patch
+%patch44 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch45 -p1 -b .ooo98649.svtools.missingUI.patch
+%patch46 -p1 -b .ooo98885.sw.safeindex.patch
+%patch47 -p1 -b .ooo98909.sfx2.missingplugins.patch
+%patch48 -p1 -R -b .ooo99050.sw.htmlload.patch
+%patch49 -p1 -b .ooo99081.vcl.dont.release.before-reuse.patch
%build
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`
-cd config_office
autoconf
-export PATH=$PATH:/usr/sbin
%configure \
--with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \
--with-use-shell=bash --disable-ldap --disable-crashdump --disable-epm \
@@ -1632,7 +1586,6 @@
--without-agg --without-ppds --without-afms --without-writer2latex \
%{stlflags} --with-lang="%{langpack_langs}" \
--with-poor-help-localizations="$POORHELPS"
-cd ..
./bootstrap
source ./Linux*Env.Set.sh
#unneccessary to build for both hash types
@@ -4105,6 +4058,30 @@
unopkg list --shared > /dev/null 2>&1 || :
%changelog
+* Thu Feb 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-1.1
+- drop integrated workspace.selinux01.patch (finally)
+- drop integrated workspace.impressfontsize.patch
+- drop integrated workspace.cmcfixes48.patch
+- drop integrated workspace.locales31.patch
+- drop integrated workspace.fpicker8.patch
+- drop integrated workspace.cmcfixes49.patch
+- drop integrated workspace.cmcfixes50.patch
+- drop integrated workspace.cmcfixes51.patch
+- drop integrated workspace.vcl94.patch
+- drop integrated workspace.vcl95.patch
+- drop integrated workspace.vcl96.patch
+- drop integrated workspace.vcl97.patch
+- drop integrated workspace.vcl98.patch
+- drop integrated workspace.hb12.patch
+- drop integrated workspace.fwk92.patch
+- drop integrated workspace.sb101.patch
+- drop integrated workspace.sw31bf02.patch
+- drop integrated workspace.configuretoplevel.patch
+- drop integrated workspace.gcc44.patch
+- drop integrated workspace.fwk99.patch
+- drop integrated workspace.tkr16.patch
+- drop integrated workspace.i18n45.patch
+
* Tue Feb 10 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.8
- culmus-fonts => culmus-nachlieli-clm-fonts
- Resolves: rhbz#483890 revert bad change, cure worse than disease
--- openoffice.org-3.0.0.ooo95318.system-showicons.patch DELETED ---
--- workspace.cmcfixes48.patch DELETED ---
--- workspace.cmcfixes49.patch DELETED ---
--- workspace.cmcfixes50.patch DELETED ---
--- workspace.cmcfixes51.patch DELETED ---
--- workspace.configuretoplevel.patch DELETED ---
--- workspace.fpicker8.patch DELETED ---
--- workspace.fwk92.patch DELETED ---
--- workspace.fwk99.patch DELETED ---
--- workspace.gcc44.patch DELETED ---
--- workspace.hb12.patch DELETED ---
--- workspace.i18n45.patch DELETED ---
--- workspace.impressfontsize.patch DELETED ---
--- workspace.impressfontsize.tar.gz DELETED ---
--- workspace.locales31.patch DELETED ---
--- workspace.sb101.patch DELETED ---
--- workspace.selinux01.patch DELETED ---
--- workspace.sw31bf02.patch DELETED ---
--- workspace.tkr16.patch DELETED ---
--- workspace.transogl03.patch DELETED ---
--- workspace.vcl94.patch DELETED ---
--- workspace.vcl95.patch DELETED ---
--- workspace.vcl96.patch DELETED ---
--- workspace.vcl97.patch DELETED ---
--- workspace.vcl98.patch DELETED ---
More information about the fedora-extras-commits
mailing list