[Libreoffice-commits] core.git: fpicker/source

Stephan Bergmann sbergman at redhat.com
Mon Jun 30 12:01:25 PDT 2014


 fpicker/source/office/iodlg.cxx |   63 ----------------------------------------
 fpicker/source/office/iodlg.hxx |    4 --
 2 files changed, 67 deletions(-)

New commits:
commit 656dd07d298b8a8a9f3db69cc2b44779dde664db
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jun 30 21:00:59 2014 +0200

    Dead code
    
    Change-Id: I50b13e27501dfd885e3ed99215d18166d5112bf7

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index aa8b637..5f6be1f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -187,27 +187,6 @@ namespace
         rFile += rExtension;
     }
 
-
-    // move the control with the given offset
-    void lcl_MoveControl( Control* _pControl, sal_Int32 _nDeltaX, sal_Int32 _nDeltaY, sal_Int32* _pMaxY = NULL )
-    {
-        if ( _pControl )
-        {
-            Point aNewPos = _pControl->GetPosPixel();
-
-            // adjust the vertical position
-            aNewPos.Y() += _nDeltaY;
-            if ( _pMaxY && ( aNewPos.Y() > *_pMaxY ) )
-                *_pMaxY = aNewPos.Y();
-
-            // adjust the horizontal position
-            aNewPos.X() += _nDeltaX;
-
-            _pControl->SetPosPixel( aNewPos );
-        }
-    }
-
-
     void lcl_autoUpdateFileExtension( SvtFileDialog* _pDialog, const OUString& _rLastFilterExt )
     {
         // if auto extension is enabled ....
@@ -319,45 +298,6 @@ namespace
     }
 }
 
-
-// ControlChain_Impl
-
-
-struct ControlChain_Impl
-{
-    Window*            _pControl;
-    ControlChain_Impl* _pNext;
-    bool               _bHasOwnership;
-
-    ControlChain_Impl( Window* pControl, ControlChain_Impl* pNext );
-    ~ControlChain_Impl();
-};
-
-
-
-ControlChain_Impl::ControlChain_Impl
-(
-    Window* pControl,
-    ControlChain_Impl* pNext
-)
-    : _pControl( pControl ),
-      _pNext( pNext ),
-      _bHasOwnership( true )
-{
-}
-
-
-
-ControlChain_Impl::~ControlChain_Impl()
-{
-    if ( _bHasOwnership )
-    {
-        delete _pControl;
-    }
-    delete _pNext;
-}
-
-
 // SvtFileDialog
 
 SvtFileDialog::SvtFileDialog
@@ -368,7 +308,6 @@ SvtFileDialog::SvtFileDialog
 ) :
     ModalDialog( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" )
 
-    ,_pUserControls( NULL )
     ,_pCbReadOnly( NULL )
     ,_pCbLinkBox( NULL)
     ,_pCbPreviewBox( NULL )
@@ -392,7 +331,6 @@ SvtFileDialog::SvtFileDialog
 
 SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits )
     :ModalDialog( _pParent, "ExplorerFileDialog", "fps/ui/explorerfiledialog.ui" )
-    ,_pUserControls( NULL )
     ,_pCbReadOnly( NULL )
     ,_pCbLinkBox( NULL)
     ,_pCbPreviewBox( NULL )
@@ -501,7 +439,6 @@ SvtFileDialog::~SvtFileDialog()
     delete _pSplitter;
     delete _pContainer;
     delete _pPrevBmp;
-    delete _pUserControls;
 }
 
 void SvtFileDialog::Init_Impl
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 4984321..4a217c0 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -48,7 +48,6 @@
 
 class SvTabListBox;
 class SvtFileView;
-struct ControlChain_Impl;
 class SvtFileDialogFilter_Impl;
 
 
@@ -85,9 +84,6 @@ class CustomContainer;
 class SvtFileDialog : public ModalDialog, public ::svt::IFilePickerController
 {
 private:
-    // originally from VclFileDialog
-    ControlChain_Impl*          _pUserControls;
-
     CheckBox*                   _pCbReadOnly;
     CheckBox*                   _pCbLinkBox;
     CheckBox*                   _pCbPreviewBox;


More information about the Libreoffice-commits mailing list