rpms/openoffice.org/devel openoffice.org.spec, 1.1240, 1.1241 workspace.unifysound01.patch, 1.2, 1.3
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Wed Aug 8 10:56:59 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1595
Modified Files:
openoffice.org.spec workspace.unifysound01.patch
Log Message:
get patch to apply to 2.2.1
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1240
retrieving revision 1.1241
diff -u -r1.1240 -r1.1241
--- openoffice.org.spec 8 Aug 2007 10:01:34 -0000 1.1240
+++ openoffice.org.spec 8 Aug 2007 10:56:27 -0000 1.1241
@@ -1070,7 +1070,7 @@
%patch64 -p1 -b .ooo75329.xdguserdir.patch
%patch65 -p1 -b .rh232389.tango.patch
%if %{linkopt}
-%patch65 -p1 -b .ooo53397.linkopt.patch
+%patch66 -p1 -b .ooo53397.linkopt.patch
%endif
%patch67 -p1 -b .ooo75790.sc.pa-IN.translate.patch
%patch68 -p1 -b .ooo76393.sal.dynamicsection.patch
workspace.unifysound01.patch:
Index: workspace.unifysound01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.unifysound01.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.unifysound01.patch 8 Aug 2007 10:01:34 -0000 1.2
+++ workspace.unifysound01.patch 8 Aug 2007 10:56:27 -0000 1.3
@@ -877,9 +877,7 @@
mbMuted( false ),
mbLooping( false ),
mbInitialized( false ),
-@@ -132,8 +133,9 @@
-
- switch( GST_MESSAGE_TYPE( message ) ) {
+@@ -140,6 +141,7 @@
case GST_MESSAGE_EOS:
//DBG( "EOS, reset state to NULL" );
gst_element_set_state( mpPlaybin, GST_STATE_READY );
@@ -887,7 +885,7 @@
break;
case GST_MESSAGE_STATE_CHANGED:
if( message->src == GST_OBJECT( mpPlaybin ) ) {
-@@ -151,6 +156,9 @@
+@@ -151,6 +153,9 @@
pendingstate == GST_STATE_VOID_PENDING &&
mpXOverlay )
gst_x_overlay_expose( mpXOverlay );
@@ -897,7 +895,7 @@
}
default:
break;
-@@ -250,6 +260,7 @@
+@@ -250,6 +255,7 @@
if( mpPlaybin != NULL ) {
gst_element_set_state( mpPlaybin, GST_STATE_NULL );
@@ -905,7 +903,7 @@
g_object_unref( mpPlaybin );
}
-@@ -281,6 +293,7 @@
+@@ -281,6 +287,7 @@
preparePlaybin( rURL, true );
gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
@@ -913,8 +911,7 @@
bRet = true;
}
-@@ -304,7 +318,8 @@
- // set the pipeline state to READY and run the loop
+@@ -305,6 +312,7 @@
if( mbInitialized && NULL != mpPlaybin )
{
gst_element_set_state( mpPlaybin, GST_STATE_PLAYING );
@@ -922,7 +919,7 @@
}
}
-@@ -317,6 +336,7 @@
+@@ -317,6 +325,7 @@
if( mpPlaybin )
gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
@@ -930,7 +927,7 @@
DBG( "stop %p", mpPlaybin );
}
-@@ -325,7 +346,7 @@
+@@ -325,10 +334,10 @@
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
@@ -943,25 +940,6 @@
{
bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin );
}
-@@ -369,7 +390,10 @@
- GST_SEEK_TYPE_SET, gst_position,
- GST_SEEK_TYPE_NONE, 0 );
- if( !isPlaying() )
-+ {
- gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
-+ mbPlayPending = false;
-+ }
-
- DBG( "seek to: %lld ns original: %lf s", gst_position, fTime );
- }
-@@ -537,6 +562,7 @@
- g_object_set( G_OBJECT( mpPlaybin ), "video-sink", NULL, NULL );
- gst_element_set_state( mpPlaybin, GST_STATE_READY );
- gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
-+ mbPlayPending = false;
- }
-
- DBG( "%p Player::getPreferredPlayerWindowSize after waitCondition %d, member %d x %d", this, aResult, mnWidth, mnHeight );
diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.hxx source/gstreamer/gstplayer.hxx
--- openoffice.org.orig/avmedia/source/gstreamer/gstplayer.hxx 2007-08-07 19:50:02.000000000 +0100
+++ openoffice.org/avmedia/source/gstreamer/gstplayer.hxx 2007-08-07 10:30:45.000000000 +0100
@@ -991,7 +969,7 @@
diff -u -r1.22 SalGtkFilePicker.cxx
--- openoffice.org.orig/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 10 May 2007 13:02:50 -0000 1.22
+++ openoffice.org/fpicker/source/unx/gnome/SalGtkFilePicker.cxx 8 Aug 2007 09:29:19 -0000
-@@ -192,7 +192,10 @@
+@@ -193,7 +193,10 @@
}
for( i = 0; i < BUTTON_LAST; i++ )
@@ -1002,8 +980,8 @@
for( i = 0; i < LIST_LAST; i++ )
{
-@@ -259,27 +262,6 @@
- gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pToggles[i], FALSE, FALSE, 0 );
+@@ -252,27 +255,6 @@
+ gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pToggles[i], FALSE, TRUE, 0 );
}
- for( i = 0; i < BUTTON_LAST; i++ )
@@ -1024,13 +1002,13 @@
- break;
- }
-
-- gtk_box_pack_end( GTK_BOX( pThinVBox ), m_pButtons[i], FALSE, TRUE, 0 );
+- gtk_box_pack_end( GTK_BOX( m_pVBox ), m_pButtons[i], FALSE, TRUE, 0 );
- }
-
for( i = 0; i < LIST_LAST; i++ )
{
m_pHBoxs[i] = gtk_hbox_new( FALSE, 0 );
-@@ -1119,6 +1101,16 @@
+@@ -1106,6 +1088,16 @@
retVal = ExecutableDialogResults::CANCEL;
break;
@@ -1047,7 +1025,7 @@
default:
retVal = 0;
break;
-@@ -1409,14 +1401,12 @@
+@@ -1396,14 +1388,12 @@
OSL_TRACE("enable unknown control %d\n", nControlId );
}
@@ -1063,7 +1041,7 @@
GType tType;
GtkWidget *pWidget;
-@@ -1425,7 +1415,18 @@
+@@ -1412,7 +1402,18 @@
OSL_TRACE("Set label on unknown control %d\n", nControlId);
return;
}
@@ -1083,7 +1061,7 @@
g_object_set( pWidget, "label", aTxt.getStr(),
"use_underline", TRUE, (char *)NULL );
else
-@@ -1723,6 +1724,7 @@
+@@ -1710,6 +1711,7 @@
case FILEOPEN_PLAY:
eAction = GTK_FILE_CHOOSER_ACTION_OPEN;
first_button_text = GTK_STOCK_OPEN;
@@ -1091,7 +1069,7 @@
// TODO
break;
case FILEOPEN_READONLY_VERSION:
-@@ -1763,7 +1766,13 @@
+@@ -1750,7 +1752,13 @@
gtk_file_chooser_set_action( GTK_FILE_CHOOSER( m_pDialog ), eAction);
dialog_remove_buttons( GTK_DIALOG( m_pDialog ) );
gtk_dialog_add_button( GTK_DIALOG( m_pDialog ), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL );
@@ -1105,7 +1083,7 @@
gtk_dialog_set_default_response( GTK_DIALOG (m_pDialog), GTK_RESPONSE_ACCEPT );
// Setup special flags
-@@ -2028,9 +2037,6 @@
+@@ -2015,9 +2023,6 @@
for( i = 0; i < TOGGLE_LAST; i++ )
gtk_widget_destroy( m_pToggles[i] );
@@ -1199,7 +1177,7 @@
diff -u -r1.38 registerservices.cxx
--- openoffice.org.orig/framework/source/register/registerservices.cxx 17 Jul 2007 13:25:41 -0000 1.38
+++ openoffice.org/framework/source/register/registerservices.cxx 8 Aug 2007 09:09:49 -0000
-@@ -89,10 +89,6 @@
+@@ -92,10 +92,6 @@
#include <jobs/jobexecutor.hxx>
#endif
@@ -1210,18 +1188,18 @@
#ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_
#include <recording/dispatchrecordersupplier.hxx>
#endif
-@@ -281,7 +277,6 @@
- COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer )
+@@ -285,7 +281,6 @@
COMPONENTINFO( ::framework::Desktop )
COMPONENTINFO( ::framework::Frame )
+ COMPONENTINFO( ::framework::DocumentProperties )
- COMPONENTINFO( ::framework::SoundHandler )
COMPONENTINFO( ::framework::JobExecutor )
COMPONENTINFO( ::framework::DispatchRecorderSupplier )
COMPONENTINFO( ::framework::DispatchRecorder )
-@@ -334,7 +329,6 @@
- COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else
+@@ -344,7 +339,6 @@
IFFACTORY( ::framework::Desktop ) else
IFFACTORY( ::framework::Frame ) else
+ IFFACTORY( ::framework::DocumentProperties ) else
- IFFACTORY( ::framework::SoundHandler ) else
IFFACTORY( ::framework::JobExecutor ) else
IFFACTORY( ::framework::DispatchRecorderSupplier ) else
@@ -1298,7 +1276,7 @@
diff -ru SRC680_m224/sd/source/ui/animations/CustomAnimationDialog.cxx SRC680_m223/sd/source/ui/animations/CustomAnimationDialog.cxx
--- openoffice.org.orig/sd/source/ui/animations/CustomAnimationDialog.cxx 2007-08-03 09:27:54.000000000 +0100
+++ openoffice.org/sd/source/ui/animations/CustomAnimationDialog.cxx 2007-08-02 14:10:26.000000000 +0100
-@@ -178,6 +178,8 @@
+@@ -180,6 +180,8 @@
#include "STLPropertySet.hxx"
#endif
@@ -1307,7 +1285,7 @@
#include "filedlg.hxx"
#include "strings.hrc"
#include "helpids.h"
-@@ -1280,7 +1282,6 @@
+@@ -1282,7 +1284,6 @@
FixedText* mpFTTextDelay;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > mxPlayer;
@@ -1315,23 +1293,27 @@
};
-@@ -1940,15 +1941,6 @@
+@@ -1942,19 +1943,6 @@
mpLBSound->SelectEntryPos( (USHORT) nPos );
}
-// TODO(Q3): This breaks encapsulation. Either export
-// these strings from avmedia, or provide an XManager
-// factory there
+-#ifdef GSTREAMER
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+-#else
-#ifdef WNT
-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
-#else
-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
+-#endif
-#endif
-
void CustomAnimationEffectTabPage::onSoundPreview()
{
const USHORT nPos = mpLBSound->GetSelectEntryPos();
-@@ -1956,18 +1948,7 @@
+@@ -1962,18 +1950,7 @@
if( nPos >= 2 ) try
{
const OUString aSoundURL( *(String*)maSoundList.GetObject( nPos-2 ) );
@@ -1339,38 +1321,31 @@
- if( !mxManager.is() )
- {
- uno::Reference<lang::XMultiServiceFactory> xFac( ::comphelper::getProcessServiceFactory() );
--
+-
- mxManager.set(
-- xFac->createInstance(
+- xFac->createInstance(
- ::rtl::OUString::createFromAscii( AVMEDIA_MANAGER_SERVICE_NAME ) ),
- uno::UNO_QUERY_THROW );
- }
-
- mxPlayer.set( mxManager->createPlayer( aSoundURL ), uno::UNO_QUERY_THROW );
-+ mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL ) );
++ mxPlayer.set( avmedia::MediaWindow::createPlayer( aSoundURL ) );
mxPlayer->start();
}
catch( uno::Exception& e )
diff -ru SRC680_m224/sd/source/ui/dlg/filedlg.cxx SRC680_m223/sd/source/ui/dlg/filedlg.cxx
--- openoffice.org.orig/sd/source/ui/dlg/filedlg.cxx 2007-08-03 09:27:54.000000000 +0100
+++ openoffice.org/sd/source/ui/dlg/filedlg.cxx 2007-08-03 16:38:06.000000000 +0100
-@@ -107,10 +107,15 @@
+@@ -106,7 +106,7 @@
+ #endif
#include <svx/impgrf.hxx>
-
-+#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HPP_
-+#include <com/sun/star/media/XPlayer.hpp>
-+#endif
+-
+#include <avmedia/mediawindow.hxx>
-+
#include "filedlg.hxx"
#include "sdresid.hxx"
#include "strings.hrc"
-
-
-
- //-----------------------------------------------------------------------------
-@@ -133,16 +140,19 @@
+@@ -129,16 +129,19 @@
css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess;
@@ -1393,7 +1368,7 @@
public:
SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection );
-@@ -182,16 +192,20 @@
+@@ -178,16 +181,20 @@
// ------------------------------------------------------------------------
IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG )
{
@@ -1418,7 +1393,7 @@
try
{
mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
-@@ -209,27 +223,25 @@
+@@ -205,27 +212,25 @@
else
{
// switch from not playing to playing of current file
@@ -1463,7 +1438,7 @@
{
try
{
-@@ -245,45 +257,40 @@
+@@ -241,45 +246,40 @@
#endif
}
}
@@ -1530,7 +1505,7 @@
}
// check whether to disable the "selection" checkbox
-@@ -315,14 +322,15 @@
+@@ -311,9 +311,10 @@
FileDialogHelper( nDialogType, 0 ),
mnPlaySoundEvent( 0 ),
mbUsableSelection( bUsableSelection ),
@@ -1538,16 +1513,11 @@
- mbDuringPreparePlaying(FALSE)
+ mbLabelPlaying(FALSE)
{
-+ maUpdateTimer.SetTimeoutHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
++ maUpdateTimer.SetTimeoutHdl(LINK(this, SdFileDialog_Imp, IsMusicStoppedHdl));
+
css::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > xFileDlg = GetFilePicker();
// get the control access
- mxControlAccess = css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > ( xFileDlg, css::uno::UNO_QUERY );
-
- if( mxControlAccess.is() )
- {
- if( nDialogType ==
diff -ru SRC680_m224/sd/source/ui/func/fusel.cxx SRC680_m223/sd/source/ui/func/fusel.cxx
--- openoffice.org.orig/sd/source/ui/func/fusel.cxx 2007-08-03 09:27:55.000000000 +0100
+++ openoffice.org/sd/source/ui/func/fusel.cxx 2007-08-02 14:14:13.000000000 +0100
@@ -1699,7 +1669,7 @@
diff -ru SRC680_m224/sd/source/ui/slideshow/slideshowimpl.cxx SRC680_m223/sd/source/ui/slideshow/slideshowimpl.cxx
--- openoffice.org.orig/sd/source/ui/slideshow/slideshowimpl.cxx 2007-08-03 09:27:57.000000000 +0100
+++ openoffice.org/sd/source/ui/slideshow/slideshowimpl.cxx 2007-08-02 14:08:33.000000000 +0100
-@@ -116,15 +116,7 @@
+@@ -119,19 +119,7 @@
#include "slideshow.hrc"
#include "canvas/elapsedtime.hxx"
#include "canvas/prioritybooster.hxx"
@@ -1707,16 +1677,20 @@
-// TODO(Q3): This breaks encapsulation. Either export
-// these strings from avmedia, or provide an XManager
-// factory there
+-#ifdef GSTREAMER
+-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+-#else
-#ifdef WNT
-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
-#else
-# define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
-#endif
+-#endif
+#include "avmedia/mediawindow.hxx"
using ::com::sun::star::uno::UNO_QUERY;
using ::com::sun::star::uno::UNO_QUERY_THROW;
-@@ -1694,17 +1686,7 @@
+@@ -1691,17 +1679,7 @@
{
try
{
@@ -1780,8 +1754,8 @@
RCS file: /cvs/gsl/vcl/inc/vcl/salinst.hxx,v
retrieving revision 1.2
diff -u -r1.2 salinst.hxx
---- openoffice.org.orig/vcl/inc/vcl/salinst.hxx 11 Apr 2007 18:07:19 -0000 1.2
-+++ openoffice.org/vcl/inc/vcl/salinst.hxx 8 Aug 2007 09:48:33 -0000
+--- openoffice.org.orig/vcl/inc/salinst.hxx 11 Apr 2007 18:07:19 -0000 1.2
++++ openoffice.org/vcl/inc/salinst.hxx 8 Aug 2007 09:48:33 -0000
@@ -60,7 +60,6 @@
class SalGraphics;
class SalFrame;
@@ -1804,8 +1778,8 @@
RCS file: /cvs/gsl/vcl/inc/vcl/settings.hxx,v
retrieving revision 1.3
diff -u -r1.3 settings.hxx
---- openoffice.org.orig/vcl/inc/vcl/settings.hxx 4 Jun 2007 14:57:34 -0000 1.3
-+++ openoffice.org/vcl/inc/vcl/settings.hxx 8 Aug 2007 09:48:36 -0000
+--- openoffice.org.orig/vcl/inc/settings.hxx 4 Jun 2007 14:57:34 -0000 1.3
++++ openoffice.org/vcl/inc/settings.hxx 8 Aug 2007 09:48:36 -0000
@@ -1019,55 +1019,6 @@
{ return !(*this == rSet); }
};
@@ -1887,14 +1861,14 @@
RCS file: /cvs/gsl/vcl/inc/vcl/sound.hxx,v
retrieving revision 1.2
diff -u -r1.2 sound.hxx
---- openoffice.org.orig/vcl/inc/vcl/sound.hxx 11 Apr 2007 18:11:10 -0000 1.2
-+++ openoffice.org/vcl/inc/vcl/sound.hxx 8 Aug 2007 09:48:36 -0000
+--- openoffice.org.orig/vcl/inc/sound.hxx 11 Apr 2007 18:11:10 -0000 1.2
++++ openoffice.org/vcl/inc/sound.hxx 8 Aug 2007 09:48:36 -0000
@@ -53,14 +53,9 @@
#ifndef _TIME_HXX
#include <tools/time.hxx>
#endif
-#ifndef _SV_SALSTYPE_HXX
--#include <vcl/salstype.hxx>
+-#include <salstype.hxx>
-#endif
class Window;
@@ -1930,12 +1904,12 @@
- Sound( const Sound& rSound );
- Sound& operator=( const Sound& rSound );
-
--//#if 0 // _SOLAR__PRIVATE
- public:
-- SAL_DLLPRIVATE void ImplNotify( SoundNotification eNotification, ULONG nError );
--//#endif // __PRIVATE
--
+-#if _SOLAR__PRIVATE
-public:
+- SAL_DLLPRIVATE void ImplNotify( SoundNotification eNotification, ULONG nError );
+-#endif // __PRIVATE
+-
+ public:
- Sound( Window* pWindow = NULL );
- virtual ~Sound();
-
@@ -1967,7 +1941,7 @@
- const Link& GetNotifyHdl() const { return maNotifyHdl; }
-
static void Beep( SoundType eType = SOUND_DEFAULT, Window* pWindow = NULL );
--
+-
- static void SetSoundPath( const XubString& rSoundPath );
- static const XubString& GetSoundPath();
-
@@ -1975,19 +1949,6 @@
};
#endif // _SV_SOUND_HXX
-Index: prj/build.lst
-===================================================================
-RCS file: /cvs/gsl/vcl/prj/build.lst,v
-retrieving revision 1.54
-diff -u -r1.54 build.lst
---- openoffice.org.orig/vcl/prj/build.lst 24 Jul 2007 10:40:56 -0000 1.54
-+++ openoffice.org/vcl/prj/build.lst 8 Aug 2007 09:48:41 -0000
-@@ -1,4 +1,4 @@
--vc vcl : BOOST:boost NAS:nas FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp SNDFILE:sndfile PORTAUDIO:portaudio transex3 NULL
-+vc vcl : BOOST:boost FREETYPE:freetype psprint rsc sot ucbhelper unotools ICU:icu i18npool unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp transex3 NULL
- vc vcl usr1 - all vc_mkout NULL
- vc vcl\inc nmake - all vc_inc NULL
- vc vcl\source\glyphs nmake - all vc_glyphs vc_inc NULL
Index: source/app/salvtables.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/app/salvtables.cxx,v
@@ -1996,13 +1957,13 @@
--- openoffice.org.orig/vcl/source/app/salvtables.cxx 24 Jul 2007 10:04:17 -0000 1.8
+++ openoffice.org/vcl/source/app/salvtables.cxx 8 Aug 2007 09:48:45 -0000
@@ -41,7 +41,6 @@
- #include <vcl/salvd.hxx>
- #include <vcl/salprn.hxx>
- #include <vcl/saltimer.hxx>
--#include <vcl/salsound.hxx>
- #include <vcl/salogl.hxx>
- #include <vcl/salimestatus.hxx>
- #include <vcl/salsys.hxx>
+ #include <salvd.hxx>
+ #include <salprn.hxx>
+ #include <saltimer.hxx>
+-#include <salsound.hxx>
+ #include <salogl.hxx>
+ #include <salimestatus.hxx>
+ #include <salsys.hxx>
@@ -61,10 +60,6 @@
{
}
@@ -2175,23 +2136,23 @@
#include <svsys.h>
#endif
-#ifndef _SV_SALSOUND_HXX
--#include <vcl/salsound.hxx>
+-#include <salsound.hxx>
-#endif
#ifndef _SV_SALFRAME_HXX
- #include <vcl/salframe.hxx>
+ #include <salframe.hxx>
#endif
@@ -63,9 +60,6 @@
#ifndef _SV_WINDOW_HXX
- #include <vcl/window.hxx>
+ #include <window.hxx>
#endif
-#ifndef _SV_SALSOUND_HXX
--#include <vcl/salsound.hxx>
+-#include <salsound.hxx>
-#endif
#ifndef _SV_SALBTYPE_HXX
- #include <vcl/salbtype.hxx>
+ #include <salbtype.hxx>
#endif
@@ -76,194 +70,6 @@
- #include <vcl/salinst.hxx>
+ #include <salinst.hxx>
#endif
-
@@ -2460,7 +2421,7 @@
#include <vcl/salinst.hxx>
#endif
-#ifndef _SV_SALSOUND_HXX
--#include <vcl/salsound.hxx>
+-#include <salsound.hxx>
-#endif
#ifndef _SV_SALOGL_HXX
#include <vcl/salogl.hxx>
More information about the fedora-extras-commits
mailing list