diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-04-04 10:24:36 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-05 13:59:05 +0100 |
commit | fe630f3b097ca2bf173f21de77ed1535c767d0b9 (patch) | |
tree | 46e0a3de38dd7cdd51f79bb5689e6fdf5a1b64f3 /fpicker | |
parent | 9c2dee67b56085ab8535a90810bf885fe0afd30c (diff) |
callcatcher: update list, add README, remove some newly unused code
Diffstat (limited to 'fpicker')
-rw-r--r-- | fpicker/source/office/PlacesListBox.cxx | 4 | ||||
-rw-r--r-- | fpicker/source/office/PlacesListBox.hxx | 1 | ||||
-rw-r--r-- | fpicker/source/office/iodlg.cxx | 35 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.cxx | 70 | ||||
-rw-r--r-- | fpicker/source/office/iodlgimp.hxx | 17 |
5 files changed, 0 insertions, 127 deletions
diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 31bb1250a406..3c1587982e7e 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -97,10 +97,6 @@ void PlacesListBox::AppendPlace( PlacePtr pPlace ) } } -sal_Int32 PlacesListBox::GetNbPlaces() { - return maPlaces.size(); -} - sal_Int32 PlacesListBox::GetNbEditablePlaces() { return mnNbEditables; } diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx index 0326be885fbd..16ba19ae6070 100644 --- a/fpicker/source/office/PlacesListBox.hxx +++ b/fpicker/source/office/PlacesListBox.hxx @@ -96,7 +96,6 @@ class PlacesListBox : public Control void AppendPlace( PlacePtr pPlace ); void RemovePlace( sal_uInt16 nPos ); void RemoveSelectedPlace(); - sal_Int32 GetNbPlaces(); sal_Int32 GetNbEditablePlaces(); bool IsUpdated(); const std::vector<PlacePtr>& GetPlaces(); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 3c9df7d4c180..b3db6975ccc0 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -325,41 +325,6 @@ namespace } //--------------------------------------------------------------------- - void convertStringListToUrls( const rtl::OUString& _rColonSeparatedList, ::std::vector< String >& _rTokens ) - { - const sal_Unicode cSeparator = -#if defined(WNT) - ';' -#else - ':' -#endif - ; - sal_Int32 nIndex = 0; - do - { - // the current token in the list - rtl::OUString sCurrentToken = _rColonSeparatedList.getToken( 0, cSeparator, nIndex ); - if ( !sCurrentToken.isEmpty() ) - { - INetURLObject aCurrentURL; - - rtl::OUString sURL; - if ( ::utl::LocalFileHelper::ConvertPhysicalNameToURL( sCurrentToken, sURL ) ) - aCurrentURL = INetURLObject( sURL ); - else - { - // smart URL parsing, assuming FILE protocol - aCurrentURL = INetURLObject( sCurrentToken, INET_PROT_FILE ); - } - - aCurrentURL.removeFinalSlash( ); - _rTokens.push_back( aCurrentURL.GetMainURL( INetURLObject::NO_DECODE ) ); - } - } - while ( nIndex >= 0 ); - } - - //--------------------------------------------------------------------- struct RemoveFinalSlash : public ::std::unary_function< String, void > { void operator()( String& _rURL ) diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index 7900ee18c6b1..f93b84d20775 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -264,76 +264,6 @@ void SvtUpButton_Impl::Click() GetDialogParent()->PrevLevel_Impl(); } -//============================================================================= -//= SvtTravelButton_Impl -//============================================================================= - -//----------------------------------------------------------------------------- -SvtTravelButton_Impl::SvtTravelButton_Impl( SvtFileDialog* pParent, const ResId& rResId ) - :SvtFileDialogURLSelector ( pParent, rResId, IMG_FILEDLG_BTN_STD ) -{ - SetDropDown( 0 ); // by default, don't drop down, as we don't have favourites -} - -//----------------------------------------------------------------------------- -void SvtTravelButton_Impl::SetFavouriteLocations( const ::std::vector< String >& _rLocations ) -{ - m_aFavourites = _rLocations; - // enable the drop down if and only if we have favourites - SetDropDown( m_aFavourites.empty() ? 0 : PUSHBUTTON_DROPDOWN_TOOLBOX ); -} - -//----------------------------------------------------------------------------- -SvtTravelButton_Impl::~SvtTravelButton_Impl() -{ -} - -//----------------------------------------------------------------------------- -void SvtTravelButton_Impl::FillURLMenu( PopupMenu* _pMenu ) -{ - if ( m_aFavourites.empty() ) - // though we claimed that we do not want to have a drop down button - // in this case, VCL nevertheless behaves as if we had one .... :( - return; - - _pMenu->Clear(); - - sal_uInt16 nItemId = 1; - String sDisplayName; - - ::std::vector< String >::const_iterator aLoop; - for ( aLoop = m_aFavourites.begin(); aLoop != m_aFavourites.end(); ++aLoop, ++nItemId ) - { - if ( GetDialogParent()->isUrlAllowed( *aLoop ) ) - { - Image aImage = SvFileInformationManager::GetImage( INetURLObject(*aLoop) ); - if ( LocalFileHelper::ConvertURLToSystemPath(*aLoop, sDisplayName) ) - _pMenu->InsertItem( nItemId, sDisplayName, aImage ); - else - _pMenu->InsertItem( nItemId, *aLoop, aImage ); - } - } -} - -//----------------------------------------------------------------------------- -void SvtTravelButton_Impl::Select() -{ - sal_uInt16 nId = GetCurItemId(); - if ( nId ) - { - --nId; - DBG_ASSERT( nId < m_aFavourites.size(), "SvtTravelButton_Impl::Select: invalid index!" ); - if ( nId < m_aFavourites.size() ) - OpenURL( m_aFavourites[ nId ] ); - } -} - -//----------------------------------------------------------------------------- -void SvtTravelButton_Impl::Click() -{ - OpenURL( GetDialogParent()->GetStandardDir() ); -} - //***************************************************************************** // SvtExpFileDlg_Impl //***************************************************************************** diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 3e5cd765fff5..54784520ab13 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -126,23 +126,6 @@ protected: virtual void Click(); }; -class SvtTravelButton_Impl : public SvtFileDialogURLSelector -{ -private: - ::std::vector< String > m_aFavourites; - -public: - SvtTravelButton_Impl( SvtFileDialog* pParent, const ResId& rResId ); - ~SvtTravelButton_Impl(); - - void SetFavouriteLocations( const ::std::vector< String >& _rLocations ); - -protected: - virtual void FillURLMenu( PopupMenu* _pMenu ); - virtual void Select(); - virtual void Click(); -}; - typedef sal_uInt8 SvtFileDlgState; #define FILEDLG_STATE_NONE ((SvtFileDlgState)0x00) |