Kaydet (Commit) 37b21a0a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Merge shell into TaskManager base class

(arbitrarily decided to keep the latter, being the less odd class name)

Change-Id: I5c061a0f12b8f3095e283b4896f7c910948ac50f
üst d9aec104
......@@ -234,7 +234,6 @@ merge detail::ScVbaHlinkContainerMember with ScVbaHyperlinks
merge drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::DiscreteBitmapPrimitive2D
merge drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::WallpaperBitmapPrimitive2D
merge drawinglayer::processor3d::DefaultProcessor3D with drawinglayer::processor3d::ZBufferProcessor3D
merge fileaccess::TaskManager with fileaccess::shell
merge frm::ICommandImageProvider with frm::DocumentCommandImageProvider
merge frm::IEngineStatusListener with frm::RichTextControlImpl
merge frm::IEngineTextChangeListener with frm::ORichTextModel
......
......@@ -40,7 +40,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpfile1,\
ucb/source/ucp/file/filstr \
ucb/source/ucp/file/filtask \
ucb/source/ucp/file/prov \
ucb/source/ucp/file/shell \
))
# vim: set noet sw=4 ts=4:
......@@ -78,7 +78,7 @@ public:
// Private Constructor for just inserted Contents
BaseContent::BaseContent( shell* pMyShell,
BaseContent::BaseContent( TaskManager* pMyShell,
const OUString& parentName,
bool bFolder )
: m_pMyShell( pMyShell ),
......@@ -98,7 +98,7 @@ BaseContent::BaseContent( shell* pMyShell,
// Constructor for full featured Contents
BaseContent::BaseContent( shell* pMyShell,
BaseContent::BaseContent( TaskManager* pMyShell,
const Reference< XContentIdentifier >& xContentIdentifier,
const OUString& aUncPath )
: m_pMyShell( pMyShell ),
......@@ -699,7 +699,7 @@ BaseContent::getParent()
OUString ParentUrl;
bool err = fileaccess::shell::getUrlFromUnq( ParentUnq, ParentUrl );
bool err = fileaccess::TaskManager::getUrlFromUnq( ParentUnq, ParentUrl );
if( err )
return Reference< XInterface >( nullptr );
......@@ -1045,7 +1045,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier,
}
OUString srcUnc;
if( fileaccess::shell::getUnqFromUrl( aTransferInfo.SourceURL,srcUnc ) )
if( fileaccess::TaskManager::getUnqFromUrl( aTransferInfo.SourceURL,srcUnc ) )
{
m_pMyShell->installError( nMyCommandIdentifier,
TASKHANDLING_TRANSFER_INVALIDURL );
......
......@@ -49,13 +49,13 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
#include <com/sun/star/ucb/InteractiveBadTransferURLException.hpp>
#include "shell.hxx"
#include "filtask.hxx"
namespace fileaccess {
class PropertyListeners;
class shell;
class TaskManager;
class BaseContent:
public cppu::OWeakObject,
......@@ -74,13 +74,13 @@ namespace fileaccess {
private:
// A special creator for inserted contents; Creates an ugly object
BaseContent( shell* pMyShell,
BaseContent( TaskManager* pMyShell,
const OUString& parentName,
bool bFolder );
public:
BaseContent(
shell* pMyShell,
TaskManager* pMyShell,
const css::uno::Reference< css::ucb::XContentIdentifier >& xContentIdentifier,
const OUString& aUnqPath );
......@@ -251,7 +251,7 @@ namespace fileaccess {
private:
// Data members
shell* m_pMyShell;
TaskManager* m_pMyShell;
css::uno::Reference< css::ucb::XContentIdentifier > m_xContentIdentifier;
OUString m_aUncPath;
......
......@@ -18,7 +18,7 @@
*/
#include "filcmd.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "prov.hxx"
using namespace fileaccess;
......@@ -31,7 +31,7 @@ using namespace com::sun::star::ucb;
#define THROW_WHERE ""
#endif
XCommandInfo_impl::XCommandInfo_impl( shell* pMyShell )
XCommandInfo_impl::XCommandInfo_impl( TaskManager* pMyShell )
: m_pMyShell( pMyShell )
{
}
......
......@@ -30,7 +30,7 @@ namespace fileaccess {
// forward
class shell;
class TaskManager;
class XCommandInfo_impl
......@@ -39,7 +39,7 @@ namespace fileaccess {
{
public:
explicit XCommandInfo_impl( shell* pMyShell );
explicit XCommandInfo_impl( TaskManager* pMyShell );
virtual ~XCommandInfo_impl() override;
......@@ -83,7 +83,7 @@ namespace fileaccess {
private:
shell* m_pMyShell;
TaskManager* m_pMyShell;
};
}
......
......@@ -19,7 +19,7 @@
#include "filglob.hxx"
#include "filerror.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "bc.hxx"
#include <osl/file.hxx>
#include <vector>
......
......@@ -18,7 +18,7 @@
*/
#include "filid.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include <cppuhelper/queryinterface.hxx>
......@@ -33,15 +33,15 @@ FileContentIdentifier::FileContentIdentifier(
{
if( IsNormalized )
{
fileaccess::shell::getUrlFromUnq( aUnqPath,m_aContentId );
fileaccess::TaskManager::getUrlFromUnq( aUnqPath,m_aContentId );
m_aNormalizedId = aUnqPath;
shell::getScheme( m_aProviderScheme );
TaskManager::getScheme( m_aProviderScheme );
}
else
{
fileaccess::shell::getUnqFromUrl( aUnqPath,m_aNormalizedId );
fileaccess::TaskManager::getUnqFromUrl( aUnqPath,m_aNormalizedId );
m_aContentId = aUnqPath;
shell::getScheme( m_aProviderScheme );
TaskManager::getScheme( m_aProviderScheme );
}
}
......
......@@ -26,7 +26,7 @@
namespace fileaccess {
class shell;
class TaskManager;
class FileContentIdentifier :
public cppu::OWeakObject,
......
......@@ -19,35 +19,35 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
#define INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
inline const bool& SAL_CALL shell::MyProperty::IsNative() const
inline const bool& SAL_CALL TaskManager::MyProperty::IsNative() const
{
return isNative;
}
inline const sal_Int32& SAL_CALL shell::MyProperty::getHandle() const
inline const sal_Int32& SAL_CALL TaskManager::MyProperty::getHandle() const
{
return Handle;
}
inline const css::uno::Type& SAL_CALL shell::MyProperty::getType() const
inline const css::uno::Type& SAL_CALL TaskManager::MyProperty::getType() const
{
return Typ;
}
inline const css::uno::Any& SAL_CALL shell::MyProperty::getValue() const
inline const css::uno::Any& SAL_CALL TaskManager::MyProperty::getValue() const
{
return Value;
}
inline const css::beans::PropertyState& SAL_CALL shell::MyProperty::getState() const
inline const css::beans::PropertyState& SAL_CALL TaskManager::MyProperty::getState() const
{
return State;
}
inline const sal_Int16& SAL_CALL shell::MyProperty::getAttributes() const
inline const sal_Int16& SAL_CALL TaskManager::MyProperty::getAttributes() const
{
return Attributes;
}
inline void SAL_CALL shell::MyProperty::setValue( const css::uno::Any& theValue ) const
inline void SAL_CALL TaskManager::MyProperty::setValue( const css::uno::Any& theValue ) const
{
const_cast<MyProperty*>(this)->Value = theValue;
}
inline void SAL_CALL shell::MyProperty::setState( const css::beans::PropertyState& theState ) const
inline void SAL_CALL TaskManager::MyProperty::setState( const css::beans::PropertyState& theState ) const
{
const_cast<MyProperty*>(this)->State = theState;
}
......
......@@ -19,7 +19,7 @@
#include "filinpstr.hxx"
#include "filerror.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "prov.hxx"
using namespace fileaccess;
......
......@@ -32,7 +32,7 @@
namespace fileaccess {
class shell;
class TaskManager;
class XInputStream_impl
: public cppu::OWeakObject,
......
......@@ -18,7 +18,7 @@
*/
#include "filinsreq.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "filglob.hxx"
#include <comphelper/interaction.hxx>
......@@ -42,7 +42,7 @@ using namespace fileaccess;
XInteractionRequestImpl::XInteractionRequestImpl(
const OUString& aClashingName,
const Reference<XInterface>& xOrigin,
shell *pShell,sal_Int32 CommandId)
TaskManager *pShell,sal_Int32 CommandId)
: p1( new XInteractionSupplyNameImpl ),
p2( new XInteractionAbortImpl ),
m_nErrorCode(0),
......
......@@ -32,7 +32,7 @@
namespace fileaccess {
class shell;
class TaskManager;
class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
......@@ -109,7 +109,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
XInteractionRequestImpl(
const OUString& aClashingName,
const css::uno::Reference< css::uno::XInterface>& xOrigin,
shell* pShell,
TaskManager* pShell,
sal_Int32 CommandId);
bool aborted() const
......
......@@ -31,7 +31,7 @@ using namespace com::sun::star;
using namespace com::sun::star::ucb;
ContentEventNotifier::ContentEventNotifier( shell* pMyShell,
ContentEventNotifier::ContentEventNotifier( TaskManager* pMyShell,
const uno::Reference< XContent >& xCreatorContent,
const uno::Reference< XContentIdentifier >& xCreatorId,
const std::vector< uno::Reference< uno::XInterface > >& sListeners )
......@@ -43,7 +43,7 @@ ContentEventNotifier::ContentEventNotifier( shell* pMyShell,
}
ContentEventNotifier::ContentEventNotifier( shell* pMyShell,
ContentEventNotifier::ContentEventNotifier( TaskManager* pMyShell,
const uno::Reference< XContent >& xCreatorContent,
const uno::Reference< XContentIdentifier >& xCreatorId,
const uno::Reference< XContentIdentifier >& xOldId,
......
......@@ -29,12 +29,12 @@
namespace fileaccess {
class shell;
class TaskManager;
class ContentEventNotifier
{
private:
shell* m_pMyShell;
TaskManager* m_pMyShell;
css::uno::Reference< css::ucb::XContent > m_xCreatorContent;
css::uno::Reference< css::ucb::XContentIdentifier > m_xCreatorId;
css::uno::Reference< css::ucb::XContentIdentifier > m_xOldId;
......@@ -42,13 +42,13 @@ namespace fileaccess {
public:
ContentEventNotifier(
shell* pMyShell,
TaskManager* pMyShell,
const css::uno::Reference< css::ucb::XContent >& xCreatorContent,
const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId,
const std::vector< css::uno::Reference< css::uno::XInterface > >& sListeners );
ContentEventNotifier(
shell* pMyShell,
TaskManager* pMyShell,
const css::uno::Reference< css::ucb::XContent >& xCreatorContent,
const css::uno::Reference< css::ucb::XContentIdentifier >& xCreatorId,
const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId,
......
......@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "shell.hxx"
#include "filtask.hxx"
#include "prov.hxx"
#include "filprp.hxx"
......@@ -34,17 +34,17 @@ using namespace com::sun::star::ucb;
#define THROW_WHERE ""
#endif
XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath )
XPropertySetInfo_impl::XPropertySetInfo_impl( TaskManager* pMyShell,const OUString& aUnqPath )
: m_pMyShell( pMyShell ),
m_count( 0 ),
m_seq( 0 )
{
m_pMyShell->m_pProvider->acquire();
shell::ContentMap::iterator it = m_pMyShell->m_aContent.find( aUnqPath );
TaskManager::ContentMap::iterator it = m_pMyShell->m_aContent.find( aUnqPath );
shell::PropertySet& properties = *(it->second.properties);
shell::PropertySet::iterator it1 = properties.begin();
TaskManager::PropertySet& properties = *(it->second.properties);
TaskManager::PropertySet::iterator it1 = properties.begin();
m_seq.realloc( properties.size() );
......@@ -59,7 +59,7 @@ XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const OUString& aU
}
XPropertySetInfo_impl::XPropertySetInfo_impl( shell* pMyShell,const Sequence< beans::Property >& seq )
XPropertySetInfo_impl::XPropertySetInfo_impl( TaskManager* pMyShell,const Sequence< beans::Property >& seq )
: m_pMyShell( pMyShell ),
m_count( seq.getLength() ),
m_seq( seq )
......
......@@ -26,14 +26,14 @@
namespace fileaccess {
class shell;
class TaskManager;
class XPropertySetInfo_impl : public cppu::WeakImplHelper<
css::beans::XPropertySetInfo >
{
public:
XPropertySetInfo_impl( shell* pMyShell,const OUString& aUnqPath );
XPropertySetInfo_impl( shell* pMyShell,const css::uno::Sequence< css::beans::Property >& seq );
XPropertySetInfo_impl( TaskManager* pMyShell,const OUString& aUnqPath );
XPropertySetInfo_impl( TaskManager* pMyShell,const css::uno::Sequence< css::beans::Property >& seq );
virtual ~XPropertySetInfo_impl() override;
......@@ -51,7 +51,7 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper<
throw( css::uno::RuntimeException, std::exception ) override;
private:
shell* m_pMyShell;
TaskManager* m_pMyShell;
sal_Int32 m_count;
css::uno::Sequence< css::beans::Property > m_seq;
};
......
......@@ -18,7 +18,7 @@
*/
#include "filrow.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "prov.hxx"
#include <com/sun/star/script/Converter.hpp>
#include <comphelper/processfactory.hxx>
......@@ -36,7 +36,7 @@ using namespace css::uno;
// Function for TypeConverting
template< class _type_ >
bool convert( shell* pShell,
bool convert( TaskManager* pShell,
uno::Reference< script::XTypeConverter >& xConverter,
uno::Any& rValue,
_type_& aReturn )
......@@ -75,7 +75,7 @@ bool convert( shell* pShell,
}
XRow_impl::XRow_impl( shell* pMyShell,const uno::Sequence< uno::Any >& seq )
XRow_impl::XRow_impl( TaskManager* pMyShell,const uno::Sequence< uno::Any >& seq )
: m_aValueMap( seq ),
m_nWasNull(false),
m_pMyShell( pMyShell ),
......
......@@ -26,13 +26,13 @@
namespace fileaccess {
class shell;
class TaskManager;
class XRow_impl: public cppu::WeakImplHelper<
css::sdbc::XRow >
{
public:
XRow_impl( shell* pShell,const css::uno::Sequence< css::uno::Any >& aValueMap );
XRow_impl( TaskManager* pShell,const css::uno::Sequence< css::uno::Any >& aValueMap );
virtual ~XRow_impl() override;
virtual sal_Bool SAL_CALL
......@@ -143,7 +143,7 @@ namespace fileaccess {
osl::Mutex m_aMutex;
css::uno::Sequence< css::uno::Any > m_aValueMap;
bool m_nWasNull;
shell* m_pMyShell;
TaskManager* m_pMyShell;
css::uno::Reference< css::script::XTypeConverter > m_xTypeConverter;
};
......
......@@ -19,7 +19,7 @@
#include <com/sun/star/ucb/WelcomeDynamicResultSetStruct.hpp>
#include "filid.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "filprp.hxx"
#include "filrset.hxx"
#include <com/sun/star/ucb/OpenMode.hpp>
......@@ -41,7 +41,7 @@ using namespace com::sun::star;
#define THROW_WHERE ""
#endif
XResultSet_impl::XResultSet_impl( shell* pMyShell,
XResultSet_impl::XResultSet_impl( TaskManager* pMyShell,
const OUString& aUnqPath,
sal_Int32 OpenMode,
const uno::Sequence< beans::Property >& seq,
......
......@@ -53,7 +53,7 @@ class XResultSet_impl : public Notifier,
{
public:
XResultSet_impl( shell* pMyShell,
XResultSet_impl( TaskManager* pMyShell,
const OUString& aUnqPath,
sal_Int32 OpenMode,
const css::uno::Sequence< css::beans::Property >& seq,
......@@ -536,7 +536,7 @@ class XResultSet_impl : public Notifier,
private:
shell* m_pMyShell;
TaskManager* m_pMyShell;
bool m_nIsOpen;
sal_Int32 m_nRow;
bool m_nWasNull;
......
......@@ -21,7 +21,7 @@
#include "com/sun/star/uno/RuntimeException.hpp"
#include "osl/diagnose.h"
#include "filstr.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "prov.hxx"
#include <memory>
......
......@@ -36,7 +36,7 @@
namespace fileaccess {
// forward:
class shell;
class TaskManager;
class XStream_impl : public cppu::WeakImplHelper<
css::io::XStream,
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -28,7 +28,7 @@
#include <cppuhelper/supportsservice.hxx>
#include "filglob.hxx"
#include "filid.hxx"
#include "shell.hxx"
#include "filtask.hxx"
#include "bc.hxx"
#include "prov.hxx"
......@@ -60,7 +60,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory(
// File Content Provider.
if ( fileaccess::shell::getImplementationName_static().
if ( fileaccess::TaskManager::getImplementationName_static().
equalsAscii( pImplName ) )
{
xFactory = FileProvider::createServiceFactory( xSMgr );
......@@ -99,7 +99,7 @@ FileProvider::~FileProvider()
void SAL_CALL FileProvider::init()
{
if( ! m_pMyShell )
m_pMyShell = new shell( m_xContext, this, true );
m_pMyShell = new TaskManager( m_xContext, this, true );
}
......@@ -113,9 +113,9 @@ FileProvider::initialize(
if( aArguments.getLength() > 0 &&
(aArguments[0] >>= config) &&
config == "NoConfig" )
m_pMyShell = new shell( m_xContext, this, false );
m_pMyShell = new TaskManager( m_xContext, this, false );
else
m_pMyShell = new shell( m_xContext, this, true );
m_pMyShell = new TaskManager( m_xContext, this, true );
}
}
......@@ -124,7 +124,7 @@ OUString SAL_CALL
FileProvider::getImplementationName()
throw( RuntimeException, std::exception )
{
return fileaccess::shell::getImplementationName_static();
return fileaccess::TaskManager::getImplementationName_static();
}
sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName )
......@@ -137,7 +137,7 @@ Sequence< OUString > SAL_CALL
FileProvider::getSupportedServiceNames()
throw( RuntimeException, std::exception )
{
return fileaccess::shell::getSupportedServiceNames_static();
return fileaccess::TaskManager::getSupportedServiceNames_static();
}
Reference< XSingleServiceFactory > SAL_CALL
......@@ -146,9 +146,9 @@ FileProvider::createServiceFactory(
{
return Reference< XSingleServiceFactory > ( cppu::createSingleFactory(
rxServiceMgr,
fileaccess::shell::getImplementationName_static(),
fileaccess::TaskManager::getImplementationName_static(),
FileProvider::CreateInstance,
fileaccess::shell::getSupportedServiceNames_static() ) );
fileaccess::TaskManager::getSupportedServiceNames_static() ) );
}
Reference< XInterface > SAL_CALL
......@@ -171,7 +171,7 @@ FileProvider::queryContent(
{
init();
OUString aUnc;
bool err = fileaccess::shell::getUnqFromUrl( xIdentifier->getContentIdentifier(),
bool err = fileaccess::TaskManager::getUnqFromUrl( xIdentifier->getContentIdentifier(),
aUnc );
if( err )
......@@ -197,8 +197,8 @@ FileProvider::compareContentIds(
{
OUString aPath1, aPath2;
fileaccess::shell::getUnqFromUrl( aUrl1, aPath1 );
fileaccess::shell::getUnqFromUrl( aUrl2, aPath2 );
fileaccess::TaskManager::getUnqFromUrl( aUrl1, aPath1 );
fileaccess::TaskManager::getUnqFromUrl( aUrl2, aPath2 );
osl::FileBase::RC error;
osl::DirectoryItem aItem1, aItem2;
......
......@@ -45,7 +45,7 @@ namespace fileaccess {
// Forward declaration
class BaseContent;
class shell;
class TaskManager;
class FileProvider: public cppu::WeakImplHelper <
css::lang::XServiceInfo,
......@@ -196,7 +196,7 @@ namespace fileaccess {
css::uno::Reference< css::beans::XPropertySetInfo > m_xPropertySetInfo;
shell* m_pMyShell;
TaskManager* m_pMyShell;
};
} // end namespace fileaccess
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment