[Libreoffice-commits] core.git: Branch 'feature/perfwork4' - 2 commits - include/svx svx/source

[Kohei Yoshida]

 include/svx/sdrpagewindow.hxx       |    2 --
 svx/source/svdraw/sdrpagewindow.cxx |   27 +++++++++------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

New commits:
commit dfb613213c0ee0e8ae18dee81f439c24a4cd921a
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Oct 29 23:24:38 2014 -0400

    Remove com::sun::star.
    
    Change-Id: Id656f1ef1cdfb695bcfcb35e393def3682e8c556

diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 37ec51b..2fd2ddc 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -72,7 +72,7 @@ struct SdrPageWindow::Impl
 };
 
 
-::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SdrPageWindow::GetControlContainer( bool _bCreateIfNecessary ) const
+uno::Reference<awt::XControlContainer> SdrPageWindow::GetControlContainer( bool _bCreateIfNecessary ) const
 {
     if (!mpImpl->mxControlContainer.is() && _bCreateIfNecessary)
     {
@@ -98,8 +98,7 @@ struct SdrPageWindow::Impl
                 uno::Reference< uno::XInterface > xContext = xControl->getContext();
                 if(!xContext.is())
                 {
-                    xControl->createPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > (),
-                        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > () );
+                    xControl->createPeer( uno::Reference<awt::XToolkit>(), uno::Reference<awt::XWindowPeer>() );
                 }
             }
         }
commit ea5939084019960b0aa3ccbf9f43e40ecd74cfc6
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Oct 29 23:21:41 2014 -0400

    Remove indirection...
    
    Change-Id: Ia01ed40391a4d5725a9f9e22817406216020c0d2

diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 82c82b0..e7156eb 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -51,8 +51,6 @@ class SVX_DLLPUBLIC SdrPageWindow
 
     Impl* mpImpl;
 
-    sdr::contact::ObjectContact* CreateViewSpecificObjectContact();
-
     SdrPageWindow( const SdrPageWindow& ); // disabled
     SdrPageWindow& operator= ( const SdrPageWindow& ); // disabled
 
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 869ff10..37ec51b 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -45,18 +45,18 @@ using namespace ::com::sun::star;
 struct SdrPageWindow::Impl
 {
     // #110094# ObjectContact section
-    sdr::contact::ObjectContact*                        mpObjectContact;
+    mutable sdr::contact::ObjectContactOfPageView* mpObjectContact;
 
     // the SdrPageView this window belongs to
-    SdrPageView&                                        mrPageView;
+    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;
+    SdrPaintWindow* mpPaintWindow;
+    SdrPaintWindow* mpOriginalPaintWindow;
 
     // UNO stuff for xControls
-    ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > mxControlContainer;
+    uno::Reference<awt::XControlContainer> mxControlContainer;
 
     Impl( SdrPageView& rPageView, SdrPaintWindow& rPaintWindow ) :
         mpObjectContact(NULL),
@@ -156,12 +156,6 @@ SdrPageWindow::~SdrPageWindow()
     delete mpImpl;
 }
 
-// ObjectContact section
-sdr::contact::ObjectContact* SdrPageWindow::CreateViewSpecificObjectContact()
-{
-    return new sdr::contact::ObjectContactOfPageView(*this);
-}
-
 SdrPageView& SdrPageWindow::GetPageView() const
 {
     return mpImpl->mrPageView;
@@ -449,9 +443,7 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange& rRange)
 const sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() const
 {
     if (!mpImpl->mpObjectContact)
-    {
-        ((SdrPageWindow*)this)->mpImpl->mpObjectContact = ((SdrPageWindow*)this)->CreateViewSpecificObjectContact();
-    }
+        mpImpl->mpObjectContact = new sdr::contact::ObjectContactOfPageView(const_cast<SdrPageWindow&>(*this));
 
     return *mpImpl->mpObjectContact;
 }
@@ -459,7 +451,7 @@ const sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact() const
 sdr::contact::ObjectContact& SdrPageWindow::GetObjectContact()
 {
     if (!mpImpl->mpObjectContact)
-        mpImpl->mpObjectContact = CreateViewSpecificObjectContact();
+        mpImpl->mpObjectContact = new sdr::contact::ObjectContactOfPageView(*this);
 
     return *mpImpl->mpObjectContact;
 }