[Libreoffice-commits] .: dbaccess/source reportdesign/source

Michael Meeks mmeeks at kemper.freedesktop.org
Mon Oct 18 07:33:47 PDT 2010


 dbaccess/source/core/dataaccess/ContentHelper.cxx |   15 -----
 reportdesign/source/ui/inc/DesignView.hxx         |    6 --
 reportdesign/source/ui/report/DesignView.cxx      |    8 ---
 reportdesign/source/ui/report/ViewsWindow.cxx     |   56 ----------------------
 4 files changed, 85 deletions(-)

New commits:
commit 4b665e7a7b4b8c16fba323025ead225084b163fb
Author: Povilas Kanapickas <povilas.kanapickas at gmail.com>
Date:   Mon Oct 18 15:33:03 2010 +0100

    remove non-compiled code

diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 824e7ca..da4e3c2 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -421,13 +421,6 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
             }
         }
 
-        // @@@ Process other properties supported directly.
-#if 0
-        else if ( rValue.Name.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "xxxxxx" ) ) )
-        {
-        }
-#endif
         else
         {
             aRet[ n ] <<= Exception(
@@ -487,14 +480,6 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >&
             }
             else
                 xRow->appendVoid(rProp);
-
-            // @@@ Process other properties supported directly.
-#if 0
-            else if ( rProp.Name.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM( "xxxxxx" ) ) )
-            {
-            }
-#endif
         }
     }
     else
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 16d4e6c..4d5539f 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -157,12 +157,6 @@ namespace rptui
         */
         void alignMarkedObjects(sal_Int32 _nControlModification, bool _bAlignAtSection, bool bBoundRects = false);
 
-#if 0
-        /** checks if alignment is possible in the current section
-        */
-        sal_Bool isAlignPossible() const;
-#endif
-
         /** All objects will be marked.
         */
         void            SelectAll(const sal_uInt16 _nObjectType);
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index 9005592..4af7f70 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -678,14 +678,6 @@ void ODesignView::alignMarkedObjects(sal_Int32 _nControlModification,bool _bAlig
 {
     m_aScrollWindow.alignMarkedObjects(_nControlModification, _bAlignAtSection,bBoundRects);
 }
-#if 0
-// -----------------------------------------------------------------------------
-sal_Bool ODesignView::isAlignPossible() const
-{
-    ::boost::shared_ptr<OSectionWindow> pMarkedSection = getMarkedSection();
-    return pMarkedSection.get() && pMarkedSection->getReportSection().getSectionView().IsAlignPossible();
-}
-#endif
 //------------------------------------------------------------------------------
 sal_Bool ODesignView::handleKeyEvent(const KeyEvent& _rEvent)
 {
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index 6f02004..df456b1 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -1511,62 +1511,6 @@ void OViewsWindow::MovAction(const Point& _aPnt,const OSectionView* _pSection,bo
         const long nSectionHeight = (*aIter)->PixelToLogic((*aIter)->GetOutputSizePixel()).Height();
         aRealMousePos.Y() -= nSectionHeight;
     }
-#if 0
-#if OSL_DEBUG_LEVEL > 0
-    // TEST TEST TEST TEST
-    // Ich versuche gerade rauszubekommen, ob ich ein Object bewege oder nur resize.
-    // TEST TEST TEST TEST
-
-    for (aIter = m_aSections.begin(); aIter != aEnd; ++aIter)
-    {
-        OReportSection& rReportSection = (*aIter)->getReportSection();
-        OSectionView& rView = rReportSection.getSectionView();
-        if ( rView.AreObjectsMarked() )
-        {
-            rView.SortMarkedObjects();
-            const sal_uInt32 nCount = rView.GetMarkedObjectCount();
-            for (sal_uInt32 i=0; i < nCount; ++i) 
-            {
-                const SdrMark* pM = rView.GetSdrMarkByIndex(i);
-                SdrObject* pObj = pM->GetMarkedSdrObj();
-                (void)pObj;
-
-                int dummy = 0;
-                (void)dummy;
-            }
-        }
-        
-        /*
-        OReportSection& rReportSection = (*aIter)->getReportSection();
-        OSectionView& rView = rReportSection.getSectionView();
-        const SdrHdlList& rHdlList = rView.GetHdlList();
-        SdrHdl* pHdl2 = rHdlList.GetFocusHdl();
-        
-        if ( pHdl2 != 0 )
-        {
-            SdrHdlKind eKind = pHdl->GetKind();
-            int dummy = 0;
-            switch(eKind)
-            {
-            case 	HDL_UPLFT:		// Oben links
-            case 	HDL_UPPER:		// Oben
-            case 	HDL_UPRGT:		// Oben rechts
-            case 	HDL_LEFT:		// Links
-            case 	HDL_RIGHT:		// Rechts
-            case 	HDL_LWLFT:		// Unten links
-            case 	HDL_LOWER:		// Unten
-            case 	HDL_LWRGT:		// Unten rechts
-                dummy = 1;
-                break;
-            default:
-                dummy = 0;
-            }
-        }
-        */
-    }
-    // TEST TEST TEST TEST
-#endif
-#endif
 }
 // -----------------------------------------------------------------------------
 BOOL OViewsWindow::IsAction() const


More information about the Libreoffice-commits mailing list