diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
| commit | 4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch) | |
| tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/dlg/filedlg.cxx | |
| parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:18 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2764d5adfcd646794593cda200fca9d4988d0d06
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/dlg/filedlg.cxx')
| -rw-r--r-- | sd/source/ui/dlg/filedlg.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx index 3d49fe26dd24..de8eed06370b 100644 --- a/sd/source/ui/dlg/filedlg.cxx +++ b/sd/source/ui/dlg/filedlg.cxx @@ -61,7 +61,7 @@ namespace css = ::com::sun::star; // -------------------------------------------------------------------- -// ----------- SdFileDialog_Imp --------------------------- +// ----------- SdFileDialog_Imp --------------------------- // -------------------------------------------------------------------- class SdFileDialog_Imp : public sfx2::FileDialogHelper { @@ -72,14 +72,14 @@ private: friend class SdOpenSoundFileDialog; - css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; + css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess; css::uno::Reference< css::media::XPlayer > mxPlayer; ULONG mnPlaySoundEvent; - BOOL mbUsableSelection; - BOOL mbLabelPlaying; + BOOL mbUsableSelection; + BOOL mbLabelPlaying; - void CheckSelectionState(); + void CheckSelectionState(); DECL_LINK( PlayMusicHdl, void * ); @@ -88,13 +88,13 @@ private: DECL_LINK( IsMusicStoppedHdl, void * ); public: - SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ); + SdFileDialog_Imp( const short nDialogType, sal_Bool bUsableSelection ); ~SdFileDialog_Imp(); - ErrCode Execute(); + ErrCode Execute(); // overwritten from FileDialogHelper, to receive user feedback - virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); + virtual void SAL_CALL ControlStateChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); }; // ------------------------------------------------------------------------ @@ -228,7 +228,7 @@ void SdFileDialog_Imp::CheckSelectionState() { if( mbUsableSelection && mxControlAccess.is() ) { - String aCurrFilter( GetCurrentFilter() ); + String aCurrFilter( GetCurrentFilter() ); try { @@ -247,8 +247,8 @@ void SdFileDialog_Imp::CheckSelectionState() } //----------------------------------------------------------------------------- -SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, - sal_Bool bUsableSelection ) : +SdFileDialog_Imp::SdFileDialog_Imp( const short nDialogType, + sal_Bool bUsableSelection ) : FileDialogHelper( nDialogType, 0 ), mnPlaySoundEvent( 0 ), mbUsableSelection( bUsableSelection ), @@ -312,7 +312,7 @@ ErrCode SdFileDialog_Imp::Execute() } // -------------------------------------------------------------------- -// ----------- SdOpenSoundFileDialog ----------------------- +// ----------- SdOpenSoundFileDialog ----------------------- // -------------------------------------------------------------------- // these are simple forwarders |