[Libreoffice-commits] .: 2 commits - sd/inc sd/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Oct 10 19:40:54 PDT 2010
sd/inc/pch/precompiled_sd.hxx | 3 -
sd/source/ui/dlg/filedlg.cxx | 34 +++++++++++-----------
sd/source/ui/toolpanel/TaskPaneControlFactory.cxx | 2 -
3 files changed, 19 insertions(+), 20 deletions(-)
New commits:
commit 2de4cbdd84ca3f9f152ade278f35111f686ea486
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Oct 10 21:29:04 2010 -0500
merge vosremoval-thread patch
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 1485c4c..d97162c 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -909,7 +909,6 @@
#include "vos/module.hxx"
#include "vos/mutex.hxx"
#include "vos/process.hxx"
-#include "vos/thread.hxx"
#include "vos/xception.hxx"
//---MARKER---
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index 1acdb9a..3cad870 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -43,7 +43,7 @@
#include <vcl/msgbox.hxx>
#include <sal/types.h>
#include <tools/urlobj.hxx>
-#include <vos/thread.hxx>
+#include <osl/thread.hxx>
#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
#include <sfx2/filedlghelper.hxx>
@@ -79,13 +79,13 @@ private:
BOOL mbLabelPlaying;
void CheckSelectionState();
-
+
DECL_LINK( PlayMusicHdl, void * );
Timer maUpdateTimer;
DECL_LINK( IsMusicStoppedHdl, void * );
-
+
public:
SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection );
~SdFileDialog_Imp();
@@ -101,7 +101,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
- switch( aEvent.ElementId )
+ switch( aEvent.ElementId )
{
case css::ui::dialogs::CommonFilePickerElementIds::LISTBOX_FILTER:
CheckSelectionState();
@@ -110,7 +110,7 @@ void SAL_CALL SdFileDialog_Imp::ControlStateChanged( const css::ui::dialogs::Fil
case css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY:
if( mxControlAccess.is() )
{
- if( mnPlaySoundEvent )
+ if( mnPlaySoundEvent )
Application::RemoveUserEvent( mnPlaySoundEvent );
mnPlaySoundEvent = Application::PostUserEvent( LINK( this, SdFileDialog_Imp, PlayMusicHdl ) );
@@ -126,7 +126,7 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG )
mnPlaySoundEvent = 0;
if (mxPlayer.is())
- {
+ {
if (mxPlayer->isPlaying())
mxPlayer->stop();
mxPlayer.clear();
@@ -136,9 +136,9 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG )
{
try
{
- mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
+ mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
String( SdResId( STR_PLAY ) ) );
-
+
mbLabelPlaying = FALSE;
}
catch( css::lang::IllegalArgumentException )
@@ -170,9 +170,9 @@ IMPL_LINK( SdFileDialog_Imp, PlayMusicHdl, void *, EMPTYARG )
{
try
{
- mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
+ mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
String( SdResId( STR_STOP ) ) );
-
+
mbLabelPlaying = TRUE;
}
catch( css::lang::IllegalArgumentException )
@@ -194,7 +194,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG )
::vos::OGuard aGuard( Application::GetSolarMutex() );
if (
- mxPlayer.is() && mxPlayer->isPlaying() &&
+ mxPlayer.is() && mxPlayer->isPlaying() &&
mxPlayer->getMediaTime() < mxPlayer->getDuration()
)
{
@@ -207,7 +207,7 @@ IMPL_LINK( SdFileDialog_Imp, IsMusicStoppedHdl, void *, EMPTYARG )
{
try
{
- mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
+ mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
String( SdResId( STR_PLAY ) ) );
mbLabelPlaying = FALSE;
}
@@ -247,7 +247,7 @@ void SdFileDialog_Imp::CheckSelectionState()
//-----------------------------------------------------------------------------
SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
- sal_Bool bUsableSelection ) :
+ sal_Bool bUsableSelection ) :
FileDialogHelper( nDialogType, 0 ),
mnPlaySoundEvent( 0 ),
mbUsableSelection( bUsableSelection ),
@@ -267,7 +267,7 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
{
try
{
- mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
+ mxControlAccess->setLabel( css::ui::dialogs::ExtendedFilePickerElementIds::PUSHBUTTON_PLAY,
String( SdResId( STR_PLAY ) ) );
}
catch( css::lang::IllegalArgumentException )
@@ -297,14 +297,14 @@ SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType,
// ------------------------------------------------------------------------
SdFileDialog_Imp::~SdFileDialog_Imp()
{
- if( mnPlaySoundEvent )
+ if( mnPlaySoundEvent )
Application::RemoveUserEvent( mnPlaySoundEvent );
}
// ------------------------------------------------------------------------
ErrCode SdFileDialog_Imp::Execute()
{
- // make sure selection checkbox is disabled if
+ // make sure selection checkbox is disabled if
// HTML is current filter!
CheckSelectionState();
return FileDialogHelper::Execute();
commit 514061d7eb3778f5fa99bd0b9c8bfa9b9449604f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Oct 10 19:46:47 2010 -0500
merge vosremoval-diagnoses patch
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index d2855d9..1485c4c 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -905,7 +905,7 @@
#include "vcl/wintypes.hxx"
#include "vcl/wrkwin.hxx"
-#include "vos/diagnose.hxx"
+#include "osl/diagnose.h"
#include "vos/module.hxx"
#include "vos/mutex.hxx"
#include "vos/process.hxx"
diff --git a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
index c85d2a0..dc5ba8d 100644
--- a/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
+++ b/sd/source/ui/toolpanel/TaskPaneControlFactory.cxx
@@ -30,7 +30,7 @@
#include "taskpane/TaskPaneControlFactory.hxx"
-#include <vos/diagnose.hxx>
+#include <osl/diagnose.h>
namespace sd { namespace toolpanel {
More information about the Libreoffice-commits
mailing list