summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2010-09-21 11:02:19 +0200
committerFrank Schoenheit [fs] <frank.schoenheit@oracle.com>2010-09-21 11:02:19 +0200
commitdd2152778f21974da6bc7998c2761506350094d1 (patch)
treef2a344a79a29edd67dfd13184f7594033234e0a3 /sdext
parent6878e6bb9888ce93687a372ac195b5de6ce808a3 (diff)
parent489c748fad12942fb3a71093a01999905cad061d (diff)
dba34a: merged latest changes from CWS dba33j
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/presenter/PresenterController.cxx2
-rwxr-xr-xsdext/source/presenter/PresenterTextView.cxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/sdext/source/presenter/PresenterController.cxx b/sdext/source/presenter/PresenterController.cxx
index 42208f670f56..4cad226281bf 100644
--- a/sdext/source/presenter/PresenterController.cxx
+++ b/sdext/source/presenter/PresenterController.cxx
@@ -1085,10 +1085,12 @@ void SAL_CALL PresenterController::keyReleased (const awt::KeyEvent& rEvent)
case awt::Key::F1:
// Toggle the help view.
if (mpWindowManager.get() != NULL)
+ {
if (mpWindowManager->GetViewMode() != PresenterWindowManager::VM_Help)
mpWindowManager->SetViewMode(PresenterWindowManager::VM_Help);
else
mpWindowManager->SetHelpViewState(false);
+ }
break;
diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx
index 8cd308dc230f..b0cc9f4cc9c9 100755
--- a/sdext/source/presenter/PresenterTextView.cxx
+++ b/sdext/source/presenter/PresenterTextView.cxx
@@ -380,10 +380,12 @@ void PresenterTextView::MoveCaret (
// the previous or the start of the next paragraph.
pParagraph = GetParagraph(nParagraphIndex);
if (pParagraph)
+ {
if (nDistance<0)
nCharacterIndex = pParagraph->GetCharacterCount();
else
nCharacterIndex = 0;
+ }
}
}
else