From 63fa3c48e2ab664802c75fba42873e9fe56b58b3 Mon Sep 17 00:00:00 2001 From: Andre Fischer Date: Fri, 16 Oct 2009 12:00:49 +0000 Subject: #i48179# Fixed wrong resolution of merge conflict. --- sdext/source/presenter/PresenterController.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx index e95e4d73664f..699df813bb9d 100644 --- a/sdext/source/presenter/PresenterController.cxx +++ b/sdext/source/presenter/PresenterController.cxx @@ -1013,7 +1013,6 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent) } break; - case awt::Key::LEFT: case awt::Key::UP: case awt::Key::P: case awt::Key::BACKSPACE: -- cgit v1.2.1