summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-11-02 14:50:28 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-02 14:55:52 +0000
commit555c89db131240641cb01c7c8caa239d1621df84 (patch)
tree9ad5ac75fdb9c96000098a105006a20bbddb45d6
parent12402e2cfdacf9a77af390e51ce12a4a6025f286 (diff)
fix this to build
-rw-r--r--sw/source/ui/dialog/wordcountwrapper.cxx1
-rw-r--r--sw/source/ui/shells/annotsh.cxx4
-rw-r--r--sw/source/ui/shells/drawsh.cxx1
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx1
-rw-r--r--sw/source/ui/shells/frmsh.cxx2
5 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx b/sw/source/ui/dialog/wordcountwrapper.cxx
index 764f9f9f910c..ddecf5a0e96c 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/ui/dialog/wordcountwrapper.cxx
@@ -32,7 +32,6 @@
#include <dialog.hrc>
#include <layout/layout-pre.hxx>
#include <wordcountdialog.hrc>
-#include <wordcountwrapper.hxx>
#include <cmdid.h>
SFX_IMPL_CHILDWINDOW(SwWordCountWrapper, FN_WORDCOUNT_DIALOG)
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index cf38a168e88e..6aada30c4655 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -131,6 +131,8 @@
#include <langhelper.hxx>
+#include <wordcountdialog.hxx>
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -410,7 +412,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
break;
case FN_WORDCOUNT_DIALOG:
{
- SfxViewFrame* pVFrame = GetView().GetViewFrame();
+ SfxViewFrame* pVFrame = rView.GetViewFrame();
if (pVFrame != NULL)
{
pVFrame->ToggleChildWindow(FN_WORDCOUNT_DIALOG);
diff --git a/sw/source/ui/shells/drawsh.cxx b/sw/source/ui/shells/drawsh.cxx
index 7dc94e01aefc..56e0a42515e7 100644
--- a/sw/source/ui/shells/drawsh.cxx
+++ b/sw/source/ui/shells/drawsh.cxx
@@ -70,6 +70,7 @@
#include <sfx2/msg.hxx>
#include "swslots.hxx"
#include "swabstdlg.hxx"
+#include <wordcountdialog.hxx>
#include "misc.hrc"
using namespace ::com::sun::star;
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index b21da6dd7333..dcbdd6f5f5d2 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -101,6 +101,7 @@
#include <viewopt.hxx>
#include <wrtsh.hxx>
#include <wview.hxx>
+#include <wordcountdialog.hxx>
#include "swabstdlg.hxx"
#include "chrdlg.hrc"
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 6eb2ea712bc5..12efea78a63d 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -95,6 +95,8 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/uno/Any.h>
+#include <wordcountdialog.hxx>
+
using ::editeng::SvxBorderLine;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;