summaryrefslogtreecommitdiff
path: root/sw/source/ui/uiview/view0.cxx
diff options
context:
space:
mode:
authorThomas Benisch <tbe@openoffice.org>2010-03-01 12:22:02 +0100
committerThomas Benisch <tbe@openoffice.org>2010-03-01 12:22:02 +0100
commit9894a711a7550c717381e80c38c981e6b502beb7 (patch)
tree781477b79027c5c1101d211c79603c366a002aeb /sw/source/ui/uiview/view0.cxx
parent04d7fd9828cdb09ff190bc65975e0c51df778487 (diff)
parent7e12418df527339d4a78416596ea12ed3cd6133a (diff)
chartshapes: merge with DEV300_m72
Diffstat (limited to 'sw/source/ui/uiview/view0.cxx')
-rw-r--r--sw/source/ui/uiview/view0.cxx25
1 files changed, 15 insertions, 10 deletions
diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx
index 38f885657450d..bc9255d598734 100644
--- a/sw/source/ui/uiview/view0.cxx
+++ b/sw/source/ui/uiview/view0.cxx
@@ -2,13 +2,10 @@
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: view0.cxx,v $
- * $Revision: 1.29 $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,18 +33,20 @@
#include "hintids.hxx"
#include <vcl/graph.hxx>
#include <svx/galbrws.hxx>
-#include <svx/srchitem.hxx>
+#include <svl/srchitem.hxx>
#include <SwSpellDialogChildWindow.hxx>
-#include <svtools/eitem.hxx>
-#include <svtools/linguprops.hxx>
-#include <svtools/lingucfg.hxx>
+#include <svl/eitem.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/lingucfg.hxx>
#include <viewopt.hxx>
#include <globals.h>
#include <sfx2/app.hxx>
#include <sfx2/request.hxx>
-#include <svtools/whiter.hxx>
+#include <svl/whiter.hxx>
#include <svx/srchdlg.hxx>
#include <sfx2/templdlg.hxx>
+#include <sfx2/viewfrm.hxx>
+#include <sfx2/bindings.hxx>
#include <uivwimp.hxx>
#include <avmedia/mediaplayer.hxx>
#include <swmodule.hxx>
@@ -99,7 +98,7 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-#include <svtools/moduleoptions.hxx>
+#include <unotools/moduleoptions.hxx>
#include <IDocumentSettingAccess.hxx>
@@ -554,3 +553,9 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
rReq.Done();
}
+IMPL_LINK( SwView, HtmlOptionsHdl, void*, EMPTYARG )
+{
+ // Invalidierung, falls blinkender Text erlaubt/verboten wurde
+ GetViewFrame()->GetBindings().Invalidate(SID_DRAW_TEXT_MARQUEE);
+ return 0;
+}