[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - include/svx svx/source sw/source
Kohei Yoshida
kohei.yoshida at collabora.com
Wed Oct 29 20:12:45 PDT 2014
include/svx/sdrpagewindow.hxx | 68 +++--------
include/svx/svdpagv.hxx | 4
include/svx/svdpntv.hxx | 2
include/svx/svdtypes.hxx | 2
svx/source/sdr/contact/objectcontactofpageview.cxx | 43 +++++++
svx/source/svdraw/sdrpagewindow.cxx | 122 ++++++++++++++-------
svx/source/svdraw/svdouno.cxx | 2
svx/source/svdraw/svdpagv.cxx | 7 -
svx/source/svdraw/svdpntv.cxx | 6 -
sw/source/core/inc/viewimp.hxx | 2
sw/source/core/view/vdraw.cxx | 2
11 files changed, 163 insertions(+), 97 deletions(-)
New commits:
commit 0c5aca21044269ddea9aea15df5e003b7cfa35a7
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date: Wed Oct 29 21:51:19 2014 -0400
Apply pimpl to SdrPageWindow.
Change-Id: I54554a229c03ff87096782344a728a49636c1de1
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 078edaf..82c82b0 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -20,77 +20,51 @@
#ifndef INCLUDED_SVX_SDRPAGEWINDOW_HXX
#define INCLUDED_SVX_SDRPAGEWINDOW_HXX
-#include <com/sun/star/awt/XWindowListener.hpp>
-#include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/util/XModeChangeListener.hpp>
-#include <cppuhelper/implbase4.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <svx/svdtypes.hxx>
-#include <svx/sdrpagewindow.hxx>
#include <svx/svxdllapi.h>
+#include <rtl/ref.hxx>
-#include <vector>
-
+#include <com/sun/star/awt/XControlContainer.hpp>
// predeclarations
namespace vcl { class Region; }
-class SdrUnoObj;
-class SdrPageView;
-// #110094#
namespace sdr
{
namespace contact
{
class ObjectContact;
class ViewObjectContactRedirector;
- } // end of namespace contact
+ }
+}
- namespace overlay
- {
- class OverlayManager;
- } // end of namespace overlay
-} // end of namespace sdr
-
-namespace basegfx
-{
- class B2DRange;
-} // end of namespace basegfx
+namespace basegfx { class B2DRange; }
class SdrPaintWindow;
-class Link;
-
-
+class SdrPageView;
class SVX_DLLPUBLIC SdrPageWindow
{
- // #110094# ObjectContact section
- sdr::contact::ObjectContact* mpObjectContact;
-
- // the SdrPageView this window belongs to
- SdrPageView& mrPageView;
-
- // the PaintWindow to paint on. Here is access to OutDev etc.
- // #i72752# change to pointer to allow patcing it in DrawLayer() if necessary
- SdrPaintWindow* mpPaintWindow;
- SdrPaintWindow* mpOriginalPaintWindow;
+ struct Impl;
- // UNO stuff for xControls
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer;
+ Impl* mpImpl;
sdr::contact::ObjectContact* CreateViewSpecificObjectContact();
+ SdrPageWindow( const SdrPageWindow& ); // disabled
+ SdrPageWindow& operator= ( const SdrPageWindow& ); // disabled
+
public:
SdrPageWindow(SdrPageView& rNewPageView, SdrPaintWindow& rPaintWindow);
~SdrPageWindow();
// data read accesses
- SdrPageView& GetPageView() const { return mrPageView; }
- SdrPaintWindow& GetPaintWindow() const { return *mpPaintWindow; }
- const SdrPaintWindow* GetOriginalPaintWindow() const { return mpOriginalPaintWindow; }
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > GetControlContainer( bool _bCreateIfNecessary = true ) const;
+ SdrPageView& GetPageView() const;
+ SdrPaintWindow& GetPaintWindow() const;
+ const SdrPaintWindow* GetOriginalPaintWindow() const;
+ css::uno::Reference<css::awt::XControlContainer> GetControlContainer( bool _bCreateIfNecessary = true ) const;
// OVERLAYMANAGER
rtl::Reference< ::sdr::overlay::OverlayManager > GetOverlayManager() const;
@@ -102,14 +76,15 @@ public:
// the repaint method. For migration from pPaintProc, use one more parameter
void PrePaint();
void PrepareRedraw(const vcl::Region& rReg);
- void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const;
- void RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const;
+ void RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector );
+ void RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector );
// Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...)
void InvalidatePageWindow(const basegfx::B2DRange& rRange);
// #110094# ObjectContact section
- sdr::contact::ObjectContact& GetObjectContact() const;
+ const sdr::contact::ObjectContact& GetObjectContact() const;
+ sdr::contact::ObjectContact& GetObjectContact();
/// determines whether there already exists an ObjectContact
bool HasObjectContact() const;
@@ -121,11 +96,6 @@ public:
void SetDesignMode( bool _bDesignMode ) const;
};
-// typedefs for a list of SdrPageWindow
-typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector;
-
-
-
#endif // INCLUDED_SVX_SDRPAGEWINDOW_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index 9fb2d95..5369616 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -166,13 +166,13 @@ public:
void PrePaint();
// rReg bezieht sich auf's OutDev, nicht auf die Page
- void CompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const;
+ void CompleteRedraw( SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = NULL );
// write access to mpPreparedPageWindow
void setPreparedPageWindow(SdrPageWindow* pKnownTarget);
void DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget = 0, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L,
- const Rectangle& rRect = Rectangle()) const;
+ const Rectangle& rRect = Rectangle());
void DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor = Color( COL_BLACK ) );
Rectangle GetPageRect() const;
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 16bdc9d..bf342d7 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -391,7 +391,7 @@ public:
protected:
// used to paint the form layer after the PreRender device is flushed (painted) to the window.
- void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const;
+ void ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow );
vcl::Region OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect);
diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index 694ea9a..58abbf1 100644
--- a/include/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SVX_SVDTYPES_HXX
#define INCLUDED_SVX_SVDTYPES_HXX
+#include <sal/types.h>
+
/*
* SdrObject
*/
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index f778df1..c6b9f8e 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -41,6 +41,48 @@
using namespace com::sun::star;
+#include <stdio.h>
+#include <string>
+#include <sys/time.h>
+
+namespace {
+
+class stack_printer
+{
+public:
+ explicit stack_printer( const char* msg ) :
+ msMsg(msg)
+ {
+ fprintf(stdout, "%s: --begin\n", msMsg.c_str());
+ mfStartTime = getTime();
+ }
+
+ ~stack_printer()
+ {
+ double fEndTime = getTime();
+ fprintf(stdout, "%s: --end (duration: %g sec)\n", msMsg.c_str(), (fEndTime - mfStartTime));
+ }
+
+ void printTime( int line ) const
+ {
+ double fEndTime = getTime();
+ fprintf(stdout, "%s: --(%d) (duration: %g sec)\n", msMsg.c_str(), line, (fEndTime - mfStartTime));
+ }
+
+private:
+ double getTime() const
+ {
+ timeval tv;
+ gettimeofday(&tv, NULL);
+ return tv.tv_sec + tv.tv_usec / 1000000.0;
+ }
+
+ ::std::string msMsg;
+ double mfStartTime;
+};
+
+}
+
namespace sdr
{
namespace contact
@@ -95,6 +137,7 @@ namespace sdr
// From baseclass Timer, the timeout call triggered by the LazyInvalidate mechanism
void ObjectContactOfPageView::Timeout()
{
+ stack_printer __stack_printer__( "sdr/contact/ObjectContactOfPageView::Timeout" );
// stop the timer
Stop();
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index bdd163d..869ff10 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -42,11 +42,39 @@
using namespace ::rtl;
using namespace ::com::sun::star;
+struct SdrPageWindow::Impl
+{
+ // #110094# ObjectContact section
+ sdr::contact::ObjectContact* mpObjectContact;
+
+ // the SdrPageView this window belongs to
+ SdrPageView& mrPageView;
+
+ // the PaintWindow to paint on. Here is access to OutDev etc.
+ // #i72752# change to pointer to allow patcing it in DrawLayer() if necessary
+ SdrPaintWindow* mpPaintWindow;
+ SdrPaintWindow* mpOriginalPaintWindow;
+
+ // UNO stuff for xControls
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer;
+
+ Impl( SdrPageView& rPageView, SdrPaintWindow& rPaintWindow ) :
+ mpObjectContact(NULL),
+ mrPageView(rPageView),
+ mpPaintWindow(&rPaintWindow),
+ mpOriginalPaintWindow(NULL)
+ {
+ }
+
+ ~Impl()
+ {
+ }
+};
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SdrPageWindow::GetControlContainer( bool _bCreateIfNecessary ) const
{
- if ( !mxControlContainer.is() && _bCreateIfNecessary )
+ if (!mpImpl->mxControlContainer.is() && _bCreateIfNecessary)
{
SdrView& rView = GetPageView().GetView();
@@ -54,7 +82,7 @@ using namespace ::com::sun::star;
if ( rPaintWindow.OutputToWindow() && !rView.IsPrintPreview() )
{
vcl::Window& rWindow = dynamic_cast< vcl::Window& >( rPaintWindow.GetOutputDevice() );
- const_cast< SdrPageWindow* >( this )->mxControlContainer = VCLUnoHelper::CreateControlContainer( &rWindow );
+ const_cast< SdrPageWindow* >( this )->mpImpl->mxControlContainer = VCLUnoHelper::CreateControlContainer( &rWindow );
// #100394# xC->setVisible triggers window->Show() and this has
// problems when the view is not completely constructed which may
@@ -64,7 +92,7 @@ using namespace ::com::sun::star;
// UnoControlContainer::setVisible(...) which calls createPeer(...).
// This will now be called directly from here.
- uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY);
+ uno::Reference< awt::XControl > xControl(mpImpl->mxControlContainer, uno::UNO_QUERY);
if(xControl.is())
{
uno::Reference< uno::XInterface > xContext = xControl->getContext();
@@ -79,9 +107,9 @@ using namespace ::com::sun::star;
{
// Printer and VirtualDevice, or rather: no OutDev
uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
- const_cast< SdrPageWindow* >( this )->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance("com.sun.star.awt.UnoControlContainer"), uno::UNO_QUERY);
+ const_cast< SdrPageWindow* >( this )->mpImpl->mxControlContainer = uno::Reference< awt::XControlContainer >(xFactory->createInstance("com.sun.star.awt.UnoControlContainer"), uno::UNO_QUERY);
uno::Reference< awt::XControlModel > xModel(xFactory->createInstance("com.sun.star.awt.UnoControlContainerModel"), uno::UNO_QUERY);
- uno::Reference< awt::XControl > xControl(mxControlContainer, uno::UNO_QUERY);
+ uno::Reference< awt::XControl > xControl(mpImpl->mxControlContainer, uno::UNO_QUERY);
if (xControl.is())
xControl->setModel(xModel);
@@ -89,23 +117,20 @@ using namespace ::com::sun::star;
Point aPosPix = rOutDev.GetMapMode().GetOrigin();
Size aSizePix = rOutDev.GetOutputSizePixel();
- uno::Reference< awt::XWindow > xContComp(mxControlContainer, uno::UNO_QUERY);
+ uno::Reference< awt::XWindow > xContComp(mpImpl->mxControlContainer, uno::UNO_QUERY);
if( xContComp.is() )
xContComp->setPosSize(aPosPix.X(), aPosPix.Y(), aSizePix.Width(), aSizePix.Height(), awt::PosSize::POSSIZE);
}
FmFormView* pViewAsFormView = dynamic_cast< FmFormView* >( &rView );
if ( pViewAsFormView )
- pViewAsFormView->InsertControlContainer(mxControlContainer);
+ pViewAsFormView->InsertControlContainer(mpImpl->mxControlContainer);
}
- return mxControlContainer;
+ return mpImpl->mxControlContainer;
}
-SdrPageWindow::SdrPageWindow(SdrPageView& rPageView, SdrPaintWindow& rPaintWindow)
-: mpObjectContact(0L),
- mrPageView(rPageView),
- mpPaintWindow(&rPaintWindow),
- mpOriginalPaintWindow(NULL)
+SdrPageWindow::SdrPageWindow(SdrPageView& rPageView, SdrPaintWindow& rPaintWindow) :
+ mpImpl(new Impl(rPageView, rPaintWindow))
{
}
@@ -114,19 +139,21 @@ SdrPageWindow::~SdrPageWindow()
// #i26631#
ResetObjectContact();
- if (mxControlContainer.is())
+ if (mpImpl->mxControlContainer.is())
{
SdrView& rView = GetPageView().GetView();
// notify derived views
FmFormView* pViewAsFormView = dynamic_cast< FmFormView* >( &rView );
if ( pViewAsFormView )
- pViewAsFormView->RemoveControlContainer(mxControlContainer);
+ pViewAsFormView->RemoveControlContainer(mpImpl->mxControlContainer);
// dispose the control container
- uno::Reference< lang::XComponent > xComponent(mxControlContainer, uno::UNO_QUERY);
+ uno::Reference< lang::XComponent > xComponent(mpImpl->mxControlContainer, uno::UNO_QUERY);
xComponent->dispose();
}
+
+ delete mpImpl;
}
// ObjectContact section
@@ -135,6 +162,21 @@ sdr::contact::ObjectContact* SdrPageWindow::CreateViewSpecificObjectContact()
return new sdr::contact::ObjectContactOfPageView(*this);
}
+SdrPageView& SdrPageWindow::GetPageView() const
+{
+ return mpImpl->mrPageView;
+}
+
+SdrPaintWindow& SdrPageWindow::GetPaintWindow() const
+{
+ return *mpImpl->mpPaintWindow;
+}
+
+const SdrPaintWindow* SdrPageWindow::GetOriginalPaintWindow() const
+{
+ return mpImpl->mpOriginalPaintWindow;
+}
+
// OVERLAY MANAGER
rtl::Reference< ::sdr::overlay::OverlayManager > SdrPageWindow::GetOverlayManager() const
{
@@ -143,17 +185,17 @@ rtl::Reference< ::sdr::overlay::OverlayManager > SdrPageWindow::GetOverlayManage
void SdrPageWindow::patchPaintWindow(SdrPaintWindow& rPaintWindow)
{
- mpOriginalPaintWindow = mpPaintWindow;
- mpPaintWindow = &rPaintWindow;
+ mpImpl->mpOriginalPaintWindow = mpImpl->mpPaintWindow;
+ mpImpl->mpPaintWindow = &rPaintWindow;
}
void SdrPageWindow::unpatchPaintWindow()
{
- DBG_ASSERT(mpOriginalPaintWindow, "SdrPageWindow::unpatchPaintWindow: paint window not patched!" );
- if ( mpOriginalPaintWindow )
+ DBG_ASSERT(mpImpl->mpOriginalPaintWindow, "SdrPageWindow::unpatchPaintWindow: paint window not patched!" );
+ if (mpImpl->mpOriginalPaintWindow)
{
- mpPaintWindow = mpOriginalPaintWindow;
- mpOriginalPaintWindow = NULL;
+ mpImpl->mpPaintWindow = mpImpl->mpOriginalPaintWindow;
+ mpImpl->mpOriginalPaintWindow = NULL;
}
}
@@ -270,18 +312,18 @@ namespace
-void SdrPageWindow::RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const
+void SdrPageWindow::RedrawAll( sdr::contact::ViewObjectContactRedirector* pRedirector )
{
// set Redirector
GetObjectContact().SetViewObjectContactRedirector(pRedirector);
// set PaintingPageView
- const SdrView& rView = mrPageView.GetView();
+ const SdrView& rView = mpImpl->mrPageView.GetView();
SdrModel& rModel = *((SdrModel*)rView.GetModel());
// get to be processed layers
const bool bPrinter(GetPaintWindow().OutputToPrinter());
- SetOfByte aProcessLayers = bPrinter ? mrPageView.GetPrintableLayers() : mrPageView.GetVisibleLayers();
+ SetOfByte aProcessLayers = bPrinter ? mpImpl->mrPageView.GetPrintableLayers() : mpImpl->mrPageView.GetVisibleLayers();
// create PaintInfoRec; use Rectangle only temporarily
const vcl::Region& rRegion = GetPaintWindow().GetRedrawRegion();
@@ -322,18 +364,18 @@ void SdrPageWindow::RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedire
#endif // CLIPPER_TEST
}
-void SdrPageWindow::RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const
+void SdrPageWindow::RedrawLayer( const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector )
{
// set redirector
GetObjectContact().SetViewObjectContactRedirector(pRedirector);
// set PaintingPageView
- const SdrView& rView = mrPageView.GetView();
+ const SdrView& rView = mpImpl->mrPageView.GetView();
SdrModel& rModel = *((SdrModel*)rView.GetModel());
// get the layers to process
const bool bPrinter(GetPaintWindow().OutputToPrinter());
- SetOfByte aProcessLayers = bPrinter ? mrPageView.GetPrintableLayers() : mrPageView.GetVisibleLayers();
+ SetOfByte aProcessLayers = bPrinter ? mpImpl->mrPageView.GetPrintableLayers() : mpImpl->mrPageView.GetVisibleLayers();
// is the given layer visible at all?
if(aProcessLayers.IsSet(*pId))
@@ -404,28 +446,36 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange)
}
// ObjectContact section
-sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() const
+const sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() const
{
- if(!mpObjectContact)
+ if (!mpImpl->mpObjectContact)
{
- ((SdrPageWindow*)this)->mpObjectContact = ((SdrPageWindow*)this)->CreateViewSpecificObjectContact();
+ ((SdrPageWindow*)this)->mpImpl->mpObjectContact = ((SdrPageWindow*)this)->CreateViewSpecificObjectContact();
}
- return *mpObjectContact;
+ return *mpImpl->mpObjectContact;
+}
+
+sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact()
+{
+ if (!mpImpl->mpObjectContact)
+ mpImpl->mpObjectContact = CreateViewSpecificObjectContact();
+
+ return *mpImpl->mpObjectContact;
}
bool SdrPageWindow::HasObjectContact() const
{
- return ( mpObjectContact != NULL );
+ return mpImpl->mpObjectContact != NULL;
}
// #i26631#
void SdrPageWindow::ResetObjectContact()
{
- if(mpObjectContact)
+ if (mpImpl->mpObjectContact)
{
- delete mpObjectContact;
- mpObjectContact = 0L;
+ delete mpImpl->mpObjectContact;
+ mpImpl->mpObjectContact = 0L;
}
}
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 1fa9564..e94f174 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -127,7 +127,7 @@ namespace
for ( sal_uInt32 i = 0; i < pPageView->PageWindowCount(); ++i )
{
- const SdrPageWindow* pPageWindow = pPageView->GetPageWindow( i );
+ SdrPageWindow* pPageWindow = pPageView->GetPageWindow( i );
DBG_ASSERT( pPageWindow, "lcl_ensureControlVisibility: invalid PageViewWindow!" );
if ( !pPageWindow )
continue;
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index f8ae258..bd6aae2 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -282,7 +282,8 @@ void SdrPageView::PrePaint()
}
}
-void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const
+void SdrPageView::CompleteRedraw(
+ SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector )
{
if(GetPage())
{
@@ -318,13 +319,13 @@ void SdrPageView::setPreparedPageWindow(SdrPageWindow* pKnownTarget)
mpPreparedPageWindow = pKnownTarget;
}
-void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector, const Rectangle& rRect) const
+void SdrPageView::DrawLayer( SdrLayerID nID, OutputDevice* pGivenTarget, sdr::contact::ViewObjectContactRedirector* pRedirector, const Rectangle& rRect )
{
if(GetPage())
{
if(pGivenTarget)
{
- const SdrPageWindow* pKnownTarget = FindPageWindow(*pGivenTarget);
+ SdrPageWindow* pKnownTarget = FindPageWindow(*pGivenTarget);
if(pKnownTarget)
{
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index e7a713e..9c1e3a4 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -851,7 +851,7 @@ vcl::Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl
-void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const
+void SdrPaintView::ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow )
{
if(mpPageView)
{
@@ -1202,7 +1202,7 @@ void SdrPaintView::SetAnimationPause( bool bSet )
{
for(sal_uInt32 b(0L); b < mpPageView->PageWindowCount(); b++)
{
- const SdrPageWindow& rPageWindow = *(mpPageView->GetPageWindow(b));
+ SdrPageWindow& rPageWindow = *(mpPageView->GetPageWindow(b));
sdr::contact::ObjectContact& rObjectContact = rPageWindow.GetObjectContact();
sdr::animation::primitiveAnimator& rAnimator = rObjectContact.getPrimitiveAnimator();
@@ -1322,7 +1322,7 @@ void SdrPaintView::SetAnimationTimer(sal_uInt32 nTime)
// first, reset all timers at all windows to 0L
for(sal_uInt32 a(0L); a < mpPageView->PageWindowCount(); a++)
{
- const SdrPageWindow& rPageWindow = *mpPageView->GetPageWindow(a);
+ SdrPageWindow& rPageWindow = *mpPageView->GetPageWindow(a);
sdr::contact::ObjectContact& rObjectContact = rPageWindow.GetObjectContact();
sdr::animation::primitiveAnimator& rAnimator = rObjectContact.getPrimitiveAnimator();
rAnimator.SetTime(nTime);
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index ae86642..575aa01 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -175,7 +175,7 @@ public:
const SwRect& _rRect,
const Color* _pPageBackgrdColor = 0,
const bool _bIsPageRightToLeft = false,
- sdr::contact::ViewObjectContactRedirector* pRedirector = 0 ) const;
+ sdr::contact::ViewObjectContactRedirector* pRedirector = 0 );
/**
* Is passed to the DrawEngine as a Link and decides what is painted
diff --git a/sw/source/core/view/vdraw.cxx b/sw/source/core/view/vdraw.cxx
index 4ac2908..b5300e6 100644
--- a/sw/source/core/view/vdraw.cxx
+++ b/sw/source/core/view/vdraw.cxx
@@ -87,7 +87,7 @@ void SwViewImp::PaintLayer( const SdrLayerID _nLayerID,
const SwRect& aPaintRect,
const Color* _pPageBackgrdColor,
const bool _bIsPageRightToLeft,
- sdr::contact::ViewObjectContactRedirector* pRedirector ) const
+ sdr::contact::ViewObjectContactRedirector* pRedirector )
{
if ( HasDrawView() )
{
More information about the Libreoffice-commits
mailing list