diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-11 09:53:12 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-01-11 09:53:12 +0100 |
| commit | 75af76e9e1a58039e978aae3aba021f15f204968 (patch) | |
| tree | 4e7d1e2ce98d49f75c19f03d8493293b7d2ba15b | |
| parent | 980ad53327be1da380d473389cf3c7e74726d56a (diff) | |
autorecovery: fix post-rebase build problems
| -rw-r--r-- | framework/util/makefile.mk | 1 | ||||
| -rw-r--r-- | sfx2/source/view/frame2.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm2.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/datanavi.cxx | 2 | ||||
| -rw-r--r-- | vbahelper/source/vbahelper/vbahelper.cxx | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/framework/util/makefile.mk b/framework/util/makefile.mk index 0a07f3cf137d..b0b074da8b7c 100644 --- a/framework/util/makefile.mk +++ b/framework/util/makefile.mk @@ -282,7 +282,6 @@ SHL4OBJS= \ $(SLO)$/langselectionstatusbarcontroller.obj \ $(SLO)$/layoutmanager.obj \ $(SLO)$/loaddispatcher.obj \ - $(SLO)$/loaddispatchlistener.obj \ $(SLO)$/loadenv.obj \ $(SLO)$/menubarfactory.obj \ $(SLO)$/menubarmanager.obj \ diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index a32045fb6595..9e1f3823c2c9 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -57,7 +57,7 @@ #include <comphelper/processfactory.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svl/rectitem.hxx> #include <svl/stritem.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index 686e694ce965..3d6721328d5a 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -56,7 +56,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <svtools/asynclink.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svl/intitem.hxx> #include <svl/rectitem.hxx> #include <svl/stritem.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 7b7223281292..4e5df772d2bb 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1611,7 +1611,7 @@ namespace svxform DBG_ASSERT( pBindings != NULL, "DataNavigatorWindow::LoadModels(): no SfxBindings; can't get frame" ); m_xFrame = Reference<XFrame>( - pBindings->GetDispatcher().GetFrame()->GetFrame()->GetFrameInterface(), + pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); DBG_ASSERT( m_xFrame.is(), "DataNavigatorWindow::LoadModels(): no frame" ); // add frameaction listener diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index ca3a3b5d729f..df12c5a3f242 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -611,7 +611,7 @@ void PrintOutHelper( SfxViewShell* pViewShell, const uno::Any& From, const uno:: { if ( bPreview ) { - if ( !pViewFrame->GetFrame()->IsInPlace() ) + if ( !pViewFrame->GetFrame().IsInPlace() ) { // #TODO is this necessary ( calc specific ) // SC_MOD()->InputEnterHandler(); |