cui/source/dialogs/cuigrfflt.cxx | 1 - vcl/source/app/sound.cxx | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-)
New commits: commit ad6b352bffdba5c45fa0915c7fdf8f5460409fc3 Author: Matteo Casalin <matteo.casa...@gmx.com> Date: Sat Jul 14 18:46:58 2012 +0200 Cleanup sound.cxx Change-Id: I6aeb437a034c8c9e5ab7583d608d098912068f72 diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx index 2ffc190..498842c 100644 --- a/vcl/source/app/sound.cxx +++ b/vcl/source/app/sound.cxx @@ -24,7 +24,6 @@ #include <salframe.hxx> #include <svdata.hxx> -#include <salinst.hxx> void Sound::Beep( SoundType eType, Window* pWindow ) { @@ -32,13 +31,10 @@ void Sound::Beep( SoundType eType, Window* pWindow ) if ( Application::IsHeadlessModeEnabled() ) return; - if( !pWindow ) - { - Window* pDefWindow = ImplGetDefaultWindow(); - pDefWindow->ImplGetFrame()->Beep( eType ); - } - else - pWindow->ImplGetFrame()->Beep( eType ); + if ( !pWindow ) + pWindow = ImplGetDefaultWindow(); + + pWindow->ImplGetFrame()->Beep( eType ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 72ee894e1ede17e0b3300b2da4b2f63bd20961a5 Author: Matteo Casalin <matteo.casa...@gmx.com> Date: Sat Jul 14 10:24:38 2012 +0200 Do not include the same header file in both .cxx and related .hxx Change-Id: Ie1a9227189ec1f3c2de1b81bec99b4267a5fee1f diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 2dbe200..310c54a 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -27,7 +27,6 @@ ************************************************************************/ #include <tools/shl.hxx> -#include <tools/helpers.hxx> #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits