[Libreoffice-commits] .: 2 commits - sfx2/inc sfx2/source svx/inc svx/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Jul 20 02:04:42 PDT 2011
sfx2/inc/sfx2/sfxbasemodel.hxx | 1
sfx2/source/appl/newhelp.cxx | 21 -
sfx2/source/appl/newhelp.hxx | 5
sfx2/source/appl/sfxhelp.cxx | 16 -
sfx2/source/bastyp/helper.cxx | 410 ---------------------------------------
sfx2/source/doc/sfxbasemodel.cxx | 30 --
sfx2/source/inc/helper.hxx | 14 -
svx/inc/svx/xtable.hxx | 27 --
svx/source/xoutdev/xtabcolr.cxx | 82 -------
9 files changed, 606 deletions(-)
New commits:
commit 27e22870d8c83ab15da1919014437cd18ed2af73
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 22:37:58 2011 +0100
callcatcher: various unused methods
diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx
index f7b3101..83d1e52 100644
--- a/sfx2/inc/sfx2/sfxbasemodel.hxx
+++ b/sfx2/inc/sfx2/sfxbasemodel.hxx
@@ -1545,7 +1545,6 @@ private:
SAL_DLLPRIVATE void postEvent_Impl( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& xController = ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >() );
SAL_DLLPRIVATE String getEventName_Impl( long nID );
- SAL_DLLPRIVATE void NotifyStorageListeners_Impl();
SAL_DLLPRIVATE bool QuerySaveSizeExceededModules( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler );
SAL_DLLPRIVATE css::uno::Reference< css::frame::XTitle > impl_getTitleHelper ();
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 7890efc..36c3d11 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1482,27 +1482,6 @@ void BookmarksTabPage_Impl::AddBookmarks( const String& rTitle, const String& rU
aBookmarksBox.SetEntryData( nPos, (void*)(sal_uIntPtr)( new String( rURL ) ) );
}
-// class SfxHelpIndexWindow_Impl -----------------------------------------
-
-sal_Bool SfxHelpWindow_Impl::splitHelpURL(const ::rtl::OUString& sHelpURL,
- ::rtl::OUString& sFactory,
- ::rtl::OUString& sContent,
- ::rtl::OUString& sAnchor )
-{
- Reference < XURLTransformer > xParser( ::comphelper::getProcessServiceFactory()->createInstance(
- DEFINE_CONST_UNICODE("com.sun.star.util.URLTransformer" )), UNO_QUERY_THROW );
-
- URL aURL;
- aURL.Complete = sHelpURL;
- sal_Bool bResult = xParser->parseStrict(aURL);
-
- sFactory = aURL.Server;
- sContent = aURL.Path.copy(1); // strip "/"!
- sAnchor = aURL.Mark;
-
- return bResult;
-}
-
::rtl::OUString SfxHelpWindow_Impl::buildHelpURL(const ::rtl::OUString& sFactory ,
const ::rtl::OUString& sContent ,
const ::rtl::OUString& sAnchor ,
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index b45e4d5..9f83b7a 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -580,11 +580,6 @@ public:
void openDone(const ::rtl::OUString& sURL ,
sal_Bool bSuccess);
- static sal_Bool splitHelpURL(const ::rtl::OUString& sHelpURL,
- ::rtl::OUString& sFactory,
- ::rtl::OUString& sContent,
- ::rtl::OUString& sAnchor );
-
static ::rtl::OUString buildHelpURL(const ::rtl::OUString& sFactory ,
const ::rtl::OUString& sContent ,
const ::rtl::OUString& sAnchor ,
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 7c94d2e..70de782 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -335,8 +335,6 @@ public:
SfxHelpOptions_Impl* GetOptions();
static String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule );
- sal_Bool HasModule( const ::rtl::OUString& rModule ); // module installed
- sal_Bool IsHelpInstalled(); // module list not empty
};
SfxHelp_Impl::SfxHelp_Impl( sal_Bool bDebug ) :
@@ -395,20 +393,6 @@ SfxHelpOptions_Impl* SfxHelp_Impl::GetOptions()
return m_pOpt;
}
-sal_Bool SfxHelp_Impl::HasModule( const ::rtl::OUString& rModule )
-{
- if ( !m_aModulesList.size() )
- Load();
- return ( ::std::find( m_aModulesList.begin(), m_aModulesList.end(), rModule ) != m_aModulesList.end() );
-}
-
-sal_Bool SfxHelp_Impl::IsHelpInstalled()
-{
- if ( !m_aModulesList.size() )
- Load();
- return ( m_aModulesList.begin() != m_aModulesList.end() );
-}
-
SfxHelp::SfxHelp() :
bIsDebug( sal_False ),
diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx
index 3f5e75e..26bbae4 100644
--- a/sfx2/source/bastyp/helper.cxx
+++ b/sfx2/source/bastyp/helper.cxx
@@ -171,64 +171,6 @@ sal_Bool SfxContentHelper::IsDocument( const String& rContent )
// -----------------------------------------------------------------------
-sal_Bool SfxContentHelper::IsFolder( const String& rContent )
-{
- sal_Bool bRet = sal_False;
- INetURLObject aObj( rContent );
- DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
- try
- {
- ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- bRet = aCnt.isFolder();
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_WARNING( "CommandAbortedException" );
- }
- catch( const ucb::IllegalIdentifierException& )
- {
- DBG_WARNING( "IllegalIdentifierException" );
- }
- catch( const ucb::ContentCreationException& )
- {
- DBG_WARNING( "IllegalIdentifierException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "Any other exception" );
- }
-
- return bRet;
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SfxContentHelper::GetTitle( const String& rContent, String& rTitle )
-{
- sal_Bool bRet = sal_False;
- INetURLObject aObj( rContent );
- DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
- try
- {
- ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- OUString aTemp;
- aCnt.getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Title")) ) >>= aTemp;
- rTitle = String( aTemp );
- bRet = sal_True;
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_ERRORFILE( "CommandAbortedException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "Any other exception" );
- }
- return bRet;
-}
-
-// -----------------------------------------------------------------------
-
sal_Bool SfxContentHelper::Kill( const String& rContent )
{
sal_Bool bRet = sal_True;
@@ -256,250 +198,6 @@ sal_Bool SfxContentHelper::Kill( const String& rContent )
// -----------------------------------------------------------------------
-uno::Sequence < OUString > SfxContentHelper::GetFolderContents( const String& rFolder, sal_Bool bFolder, sal_Bool bSorted )
-{
- StringList_Impl* pFiles = NULL;
- INetURLObject aFolderObj( rFolder );
- DBG_ASSERT( aFolderObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
- try
- {
- ::ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- uno::Reference< sdbc::XResultSet > xResultSet;
- uno::Sequence< OUString > aProps(2);
- OUString* pProps = aProps.getArray();
- pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
- pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
-
- try
- {
- ::ucbhelper::ResultSetInclude eInclude = bFolder ? ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ::ucbhelper::INCLUDE_DOCUMENTS_ONLY;
- if ( !bSorted )
- {
- xResultSet = aCnt.createCursor( aProps, eInclude );
- }
- else
- {
- uno::Reference< ucb::XDynamicResultSet > xDynResultSet;
- xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
-
- uno::Reference < ucb::XAnyCompareFactory > xFactory;
- uno::Reference < lang::XMultiServiceFactory > xMgr = getProcessServiceFactory();
- uno::Reference < ucb::XSortedDynamicResultSetFactory > xSRSFac(
- xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), uno::UNO_QUERY );
-
- uno::Sequence< ucb::NumberedSortingInfo > aSortInfo( 2 );
- ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray();
- pInfo[ 0 ].ColumnIndex = 2;
- pInfo[ 0 ].Ascending = sal_False;
- pInfo[ 1 ].ColumnIndex = 1;
- pInfo[ 1 ].Ascending = sal_True;
-
- uno::Reference< ucb::XDynamicResultSet > xDynamicResultSet;
- xDynamicResultSet =
- xSRSFac->createSortedDynamicResultSet( xDynResultSet, aSortInfo, xFactory );
- if ( xDynamicResultSet.is() )
- {
- xResultSet = xDynamicResultSet->getStaticResultSet();
- }
- }
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_ERRORFILE( "createCursor: CommandAbortedException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "createCursor: Any other exception" );
- }
-
- if ( xResultSet.is() )
- {
- pFiles = new StringList_Impl();
- uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
- try
- {
- while ( xResultSet->next() )
- {
- OUString aId = xContentAccess->queryContentIdentifierString();
- OUString* pFile = new OUString( aId );
- pFiles->push_back( pFile );
- }
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_ERRORFILE( "XContentAccess::next(): CommandAbortedException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "XContentAccess::next(): Any other exception" );
- }
- }
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "GetFolderContents: Any other exception" );
- }
-
- if ( pFiles )
- {
- size_t nCount = pFiles->size();
- uno::Sequence < OUString > aRet( nCount );
- OUString* pRet = aRet.getArray();
- for ( size_t i = 0; i < nCount; ++i )
- {
- OUString* pFile = pFiles->at( i );
- pRet[i] = *( pFile );
- delete pFile;
- }
- pFiles->clear();
- delete pFiles;
- return aRet;
- }
- else
- return uno::Sequence < OUString > ();
-}
-
-// -----------------------------------------------------------------------
-
-uno::Sequence < OUString > SfxContentHelper::GetFolderContentProperties( const String& rFolder, sal_Bool bIsFolder )
-{
- StringList_Impl* pProperties = NULL;
- INetURLObject aFolderObj( rFolder );
- DBG_ASSERT( aFolderObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
- try
- {
- uno::Reference< lang::XMultiServiceFactory > xFactory = ::comphelper::getProcessServiceFactory();
- uno::Reference< task::XInteractionHandler > xInteractionHandler = uno::Reference< task::XInteractionHandler > (
- xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.InteractionHandler") ) ), uno::UNO_QUERY );
-
- ::ucbhelper::Content aCnt( aFolderObj.GetMainURL( INetURLObject::NO_DECODE ), new ::ucbhelper::CommandEnvironment( xInteractionHandler, uno::Reference< ucb::XProgressHandler >() ) );
- uno::Reference< sdbc::XResultSet > xResultSet;
- uno::Sequence< OUString > aProps(5);
- OUString* pProps = aProps.getArray();
- pProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
- pProps[1] = OUString(RTL_CONSTASCII_USTRINGPARAM("ContentType"));
- pProps[2] = OUString(RTL_CONSTASCII_USTRINGPARAM("Size"));
- pProps[3] = OUString(RTL_CONSTASCII_USTRINGPARAM("DateModified"));
- pProps[4] = OUString(RTL_CONSTASCII_USTRINGPARAM("IsFolder"));
-
- try
- {
- uno::Reference< ucb::XDynamicResultSet > xDynResultSet;
- ::ucbhelper::ResultSetInclude eInclude = bIsFolder ? ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS : ::ucbhelper::INCLUDE_DOCUMENTS_ONLY;
- xDynResultSet = aCnt.createDynamicCursor( aProps, eInclude );
-
- uno::Reference < ucb::XAnyCompareFactory > xCmpFactory;
- uno::Reference < lang::XMultiServiceFactory > xMgr = getProcessServiceFactory();
- uno::Reference < ucb::XSortedDynamicResultSetFactory > xSRSFac(
- xMgr->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SortedDynamicResultSetFactory")) ), uno::UNO_QUERY );
-
- uno::Sequence< ucb::NumberedSortingInfo > aSortInfo( 2 );
- ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray();
- pInfo[ 0 ].ColumnIndex = 5;
- pInfo[ 0 ].Ascending = sal_False;
- pInfo[ 1 ].ColumnIndex = 1;
- pInfo[ 1 ].Ascending = sal_True;
-
- uno::Reference< ucb::XDynamicResultSet > xDynamicResultSet;
- xDynamicResultSet =
- xSRSFac->createSortedDynamicResultSet( xDynResultSet, aSortInfo, xCmpFactory );
- if ( xDynamicResultSet.is() )
- {
- xResultSet = xDynamicResultSet->getStaticResultSet();
- }
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_ERRORFILE( "createCursor: CommandAbortedException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "createCursor: Any other exception" );
- }
-
- if ( xResultSet.is() )
- {
- LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
- pProperties = new StringList_Impl();
- uno::Reference< sdbc::XRow > xRow( xResultSet, uno::UNO_QUERY );
- uno::Reference< ucb::XContentAccess > xContentAccess( xResultSet, uno::UNO_QUERY );
- size_t nFolderPos = size_t(-1);
-
- try
- {
- while ( xResultSet->next() )
- {
- String aTitle( xRow->getString(1) );
- String aType( xRow->getString(2) );
- sal_Int64 nSize = xRow->getLong(3);
- util::DateTime aDT = xRow->getTimestamp(4);
- sal_Bool bFolder = xRow->getBoolean(5); // true = directory, else file
-
- String aRow = aTitle;
- aRow += '\t';
- aRow += String::CreateFromInt64( nSize );
- aRow += '\t';
- AppendDateTime_Impl( aDT, aRow, aLocaleWrapper );
- aRow += '\t';
- aRow += String( xContentAccess->queryContentIdentifierString() );
- aRow += '\t';
- aRow += bFolder ? '1' : '0';
- OUString* pRow = new OUString( aRow );
- size_t nPos = size_t(-1);
- if ( bFolder ) // place the directories at the top of the listing
- {
- if ( nFolderPos == size_t(-1) )
- nFolderPos = 0;
- else
- nFolderPos++;
- nPos = nFolderPos;
- }
- if ( nPos >= pProperties->size() )
- pProperties->push_back( pRow );
- else
- {
- StringList_Impl::iterator it = pProperties->begin();
- ::std::advance( it, nPos );
- it = pProperties->insert( it, pRow );
- }
- }
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_ERRORFILE( "XContentAccess::next(): CommandAbortedException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "XContentAccess::next(): Any other exception" );
- }
- }
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "GetFolderContents: Any other exception" );
- }
-
- if ( pProperties )
- {
- size_t nCount = pProperties->size();
- uno::Sequence < OUString > aRet( nCount );
- OUString* pRet = aRet.getArray();
- for ( size_t i = 0; i < nCount; ++i )
- {
- OUString* pProperty = pProperties->at(i);
- pRet[i] = *( pProperty );
- delete pProperty;
- }
- pProperties->clear();
- delete pProperties;
- return aRet;
- }
- else
- return uno::Sequence < OUString > ();
-}
-
-// -----------------------------------------------------------------------
-
uno::Sequence < OUString > SfxContentHelper::GetResultSet( const String& rURL )
{
StringList_Impl* pList = NULL;
@@ -733,61 +431,6 @@ sal_Bool SfxContentHelper::IsHelpErrorDocument( const String& rURL )
// -----------------------------------------------------------------------
-sal_Bool SfxContentHelper::CopyTo( const String& rSource, const String& rDest )
-{
- return Transfer_Impl( rSource, rDest, sal_False, ucb::NameClash::ERROR );
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SfxContentHelper::MoveTo( const String& rSource, const String& rDest, sal_Int32 nNameClash )
-{
- return Transfer_Impl( rSource, rDest, sal_True, nNameClash );
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SfxContentHelper::MakeFolder( const String& rFolder )
-{
- INetURLObject aURL( rFolder );
- DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
- String aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
- aURL.removeSegment();
- uno::Sequence < OUString > aNames(2);
- OUString* pNames = aNames.getArray();
- pNames[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( "Title" ) );
- pNames[1] = OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ) );
- uno::Sequence<uno::Any> aValues(2);
- uno::Any* pValues = aValues.getArray();
- pValues[0] = uno::makeAny( OUString( aTitle ) );
- pValues[1] = uno::makeAny( sal_Bool( sal_True ) );
- uno::Reference< ucb::XCommandEnvironment > aCmdEnv;
- sal_Bool bRet = sal_False;
- try
- {
- ::ucbhelper::Content aCnt( aURL.GetMainURL( INetURLObject::NO_DECODE ), aCmdEnv );
- ::ucbhelper::Content aNewFolder;
- OUString aType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.staroffice.fsys-folder" ) );
- bRet = aCnt.insertNewContent( aType, aNames, aValues, aNewFolder );
- }
- catch( const ucb::CommandAbortedException& )
- {
- // double name?
- }
- catch( const ucb::IllegalIdentifierException& )
- {
- DBG_ERRORFILE( "Illegal identifier" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "Any other exception" );
- }
-
- return bRet;
-}
-
-// -----------------------------------------------------------------------
-
sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
{
sal_uIntPtr nSize = 0;
@@ -811,57 +454,4 @@ sal_uIntPtr SfxContentHelper::GetSize( const String& rContent )
return nSize;
}
-// -----------------------------------------------------------------------
-// please don't use it (only used in appbas.cxx and appcfg.cxx)
-sal_Bool SfxContentHelper::Exists( const String& rContent )
-{
- sal_Bool bRet = sal_False;
- INetURLObject aObj( rContent );
- DBG_ASSERT( aObj.GetProtocol() != INET_PROT_NOT_VALID, "Invalid URL!" );
-
- try
- {
- ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ucb::XCommandEnvironment > () );
- // just try to get the property; if no exception is thrown, the content exists!
- aCnt.isDocument();
- bRet = sal_True;
- }
- catch( const ucb::CommandAbortedException& )
- {
- DBG_WARNING( "CommandAbortedException" );
- }
- catch( const ucb::IllegalIdentifierException& )
- {
- DBG_WARNING( "IllegalIdentifierException" );
- }
- catch( const ucb::ContentCreationException& )
- {
- DBG_WARNING( "IllegalIdentifierException" );
- }
- catch( const uno::Exception& )
- {
- DBG_ERRORFILE( "Any other exception" );
- }
-
- return bRet;
-
-}
-
-// -----------------------------------------------------------------------
-
-sal_Bool SfxContentHelper::Find( const String& rFolder, const String& rName, String& rFile )
-{
- sal_Bool bRet = sal_False;
- rtl::OUString aFile;
-
- if ( FileBase::searchFileURL( rName, rFolder, aFile ) == FileBase::E_None )
- {
- rFile = aFile;
- bRet = sal_True;
- }
-
- return bRet;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 9e73223..ee2b23e 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -2512,36 +2512,6 @@ void addTitle_Impl( Sequence < ::com::sun::star::beans::PropertyValue >& rSeq, c
}
}
-void SfxBaseModel::NotifyStorageListeners_Impl()
-{
- uno::Reference< uno::XInterface > xSelfHold( static_cast< ::cppu::OWeakObject* >(this) );
-
- if ( m_pData->m_pObjectShell )
- {
- ::cppu::OInterfaceContainerHelper* pContainer =
- m_pData->m_aInterfaceContainer.getContainer(
- ::getCppuType( ( const uno::Reference< document::XStorageChangeListener >*) NULL ) );
- if ( pContainer != NULL )
- {
- uno::Reference< embed::XStorage > xNewStorage = m_pData->m_pObjectShell->GetStorage();
- ::cppu::OInterfaceIteratorHelper pIterator(*pContainer);
- while ( pIterator.hasMoreElements() )
- {
- try
- {
- ((document::XStorageChangeListener*)pIterator.next())->notifyStorageChange(
- xSelfHold,
- xNewStorage );
- }
- catch( uno::RuntimeException& )
- {
- pIterator.remove();
- }
- }
- }
- }
-}
-
void SfxBaseModel::Notify( SfxBroadcaster& rBC ,
const SfxHint& rHint )
{
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 7856508..e767a14 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -47,30 +47,16 @@ private:
public:
static sal_Bool IsDocument( const String& rContent );
- static sal_Bool IsFolder( const String& rContent );
- static sal_Bool GetTitle( const String& rContent, String& rTitle );
static sal_Bool Kill( const String& rContent );
static ::com::sun::star::uno::Sequence< ::rtl::OUString >
- GetFolderContents( const String& rFolder, sal_Bool bFolder, sal_Bool bSorted = sal_False );
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >
- GetFolderContentProperties( const String& rFolder, sal_Bool bFolder );
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >
GetResultSet( const String& rURL );
static ::com::sun::star::uno::Sequence< ::rtl::OUString >
GetHelpTreeViewContents( const String& rURL );
static String GetActiveHelpString( const String& rURL );
static sal_Bool IsHelpErrorDocument( const String& rURL );
- static sal_Bool CopyTo( const String& rSource, const String& rDest );
- static sal_Bool MoveTo( const String& rSource, const String& rDest, sal_Int32 nNameClash = com::sun::star::ucb::NameClash::ERROR );
-
- static sal_Bool MakeFolder( const String& rFolder );
static sal_uIntPtr GetSize( const String& rContent );
-
- // please don't use this!
- static sal_Bool Exists( const String& rContent );
- static sal_Bool Find( const String& rFolder, const String& rName, String& rFile );
};
#endif // #ifndef _SFX_HELPER_HXX
commit dd709315796a214f109fe7da04c1121ed6d0db4d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Jul 19 22:37:14 2011 +0100
callcatcher: XColorList, your time has cometh to an end
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 5bcebc2..aa70aca 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -327,33 +327,6 @@ public:
static XColorTable& GetStdColorTable();
};
-// -------------------
-// class XColorList
-// -------------------
-
-class XColorList : public XPropertyList
-{
-public:
- explicit XColorList(
- const String& rPath,
- XOutdevItemPool* pXPool = NULL
- );
- virtual ~XColorList();
-
- using XPropertyList::Replace;
- XColorEntry* Replace(XColorEntry* pEntry, long nIndex );
- using XPropertyList::Remove;
- XColorEntry* Remove(long nIndex);
- using XPropertyList::Get;
- XColorEntry* GetColor(long nIndex) const;
-
- virtual sal_Bool Load();
- virtual sal_Bool Save();
- virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
-};
-
// --------------------
// class XLineEndTable
// --------------------
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 0a9b25f..60ca13d 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -457,86 +457,4 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
return( NULL );
}
-// --------------------
-// class XColorList
-// --------------------
-
-/*************************************************************************
-|*
-|* XColorList::XColorList()
-|*
-*************************************************************************/
-
-XColorList::XColorList(
- const String& rPath,
- XOutdevItemPool* pInPool
-) : XPropertyList( rPath, pInPool )
-{
- // pBmpList = new List( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XColorList::~XColorList()
-{
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::Replace(XColorEntry* pEntry, long nIndex )
-{
- return (XColorEntry*) XPropertyList::Replace(pEntry, nIndex);
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::Remove(long nIndex)
-{
- return (XColorEntry*) XPropertyList::Remove(nIndex);
-}
-
-/************************************************************************/
-
-XColorEntry* XColorList::GetColor(long nIndex) const
-{
- return (XColorEntry*) XPropertyList::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Load()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Save()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::Create()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XColorList::CreateBitmapsForUI()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
- return( NULL );
-}
-
-// eof
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list