summaryrefslogtreecommitdiff
path: root/framework/source/loadenv
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-06 19:05:49 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-06 19:37:48 +0300
commit951ed199f1a47c02dad3dc899b9804b4574a151d (patch)
treed8f82a3afa345351ce6a4a206424c6f2bd2aed46 /framework/source/loadenv
parentbe616c26f990d651c752be201e29e2b89ba17f2a (diff)
Kill superfluous vertical whitespace
Change-Id: Ia1bb2b40c74efb17e655dd6f00d7ba48c16c65ae
Diffstat (limited to 'framework/source/loadenv')
-rw-r--r--framework/source/loadenv/loadenv.cxx34
1 files changed, 0 insertions, 34 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 99a3730f4c50..72d0458be12e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -91,7 +91,6 @@ namespace framework {
using namespace com::sun::star;
-
class LoadEnvListener : public ::cppu::WeakImplHelper2< css::frame::XLoadEventListener ,
css::frame::XDispatchResultListener >
{
@@ -102,14 +101,12 @@ class LoadEnvListener : public ::cppu::WeakImplHelper2< css::frame::XLoadEventLi
public:
-
LoadEnvListener(LoadEnv* pLoadEnv)
: m_bWaitingResult(true)
, m_pLoadEnv(pLoadEnv)
{
}
-
// frame.XLoadEventListener
virtual void SAL_CALL loadFinished(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -117,18 +114,15 @@ class LoadEnvListener : public ::cppu::WeakImplHelper2< css::frame::XLoadEventLi
virtual void SAL_CALL loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >& xLoader)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
// frame.XDispatchResultListener
virtual void SAL_CALL dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
-
// lang.XEventListener
virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-
LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xContext)
throw(LoadEnvException, css::uno::RuntimeException)
: m_xContext (xContext)
@@ -136,12 +130,10 @@ LoadEnv::LoadEnv(const css::uno::Reference< css::uno::XComponentContext >& xCont
{
}
-
LoadEnv::~LoadEnv()
{
}
-
css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const css::uno::Reference< css::frame::XComponentLoader >& xLoader,
const css::uno::Reference< css::uno::XComponentContext >& xContext ,
const OUString& sURL ,
@@ -203,7 +195,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::loadComponentFromURL(const
return xComponent;
}
-
utl::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const css::uno::Sequence< css::beans::PropertyValue >& lOutsideDescriptor)
{
utl::MediaDescriptor lDescriptor(lOutsideDescriptor);
@@ -221,7 +212,6 @@ utl::MediaDescriptor impl_mergeMediaDescriptorWithMightExistingModelArgs(const c
return lDescriptor;
}
-
void LoadEnv::initializeLoading(const OUString& sURL ,
const css::uno::Sequence< css::beans::PropertyValue >& lMediaDescriptor,
const css::uno::Reference< css::frame::XFrame >& xBaseFrame ,
@@ -299,7 +289,6 @@ void LoadEnv::initializeLoading(const OUString&
);
}
-
void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XComponentContext >& i_rxContext,
utl::MediaDescriptor& io_lMediaDescriptor, const bool i_bUIMode,
QuietInteraction** o_ppQuietInteraction )
@@ -348,7 +337,6 @@ void LoadEnv::initializeUIDefaults( const css::uno::Reference< css::uno::XCompon
io_lMediaDescriptor[utl::MediaDescriptor::PROP_UPDATEDOCMODE()] <<= nUpdateMode;
}
-
void LoadEnv::startLoading()
{
// SAFE ->
@@ -454,7 +442,6 @@ css::uno::Reference< css::lang::XComponent > LoadEnv::getTargetComponent() const
return css::uno::Reference< css::lang::XComponent >(xModel, css::uno::UNO_QUERY);
}
-
void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::frame::XFrameLoader >&)
throw(css::uno::RuntimeException, std::exception)
{
@@ -464,7 +451,6 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram
m_bWaitingResult = false;
}
-
void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::frame::XFrameLoader >&)
throw(css::uno::RuntimeException, std::exception)
{
@@ -474,7 +460,6 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra
m_bWaitingResult = false;
}
-
void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResultEvent& aEvent)
throw(css::uno::RuntimeException, std::exception)
{
@@ -500,7 +485,6 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult
m_bWaitingResult = false;
}
-
void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
throw(css::uno::RuntimeException, std::exception)
{
@@ -510,7 +494,6 @@ void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
m_bWaitingResult = false;
}
-
void LoadEnv::impl_setResult(sal_Bool bResult)
{
osl::MutexGuard g(m_mutex);
@@ -555,7 +538,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
return E_UNSUPPORTED_CONTENT;
}
-
// (ii) Some special URLs indicates a given input stream,
// a full featured document model directly or
// specify a request for opening an empty document.
@@ -617,8 +599,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
css::uno::Reference< css::container::XEnumeration > xSet ;
css::uno::Sequence< OUString > lTypesReg(1);
-
-
// (iii) If a FrameLoader service (or at least
// a Filter) can be found, which supports
// this URL - it must be a loadable content.
@@ -644,7 +624,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
if (xSet->hasMoreElements())
return E_CAN_BE_LOADED;
-
// (iv) Some URL protocols are supported by special services.
// E.g. ContentHandler.
// Such contents can be handled ... but not loaded.
@@ -659,7 +638,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
if (xSet->hasMoreElements())
return E_CAN_BE_HANDLED;
-
// (v) Last but not least the UCB is used inside office to
// load contents. He has a special configuration to know
// which URL schemata can be used inside office.
@@ -667,7 +645,6 @@ LoadEnv::EContentType LoadEnv::classifyContent(const OUString&
if (xUCB->queryContentProvider(sURL).is())
return E_CAN_BE_LOADED;
-
// (TODO) At this point, we have no idea .-)
// But it seems to be better, to break all
// further requests for this URL. Otherwise
@@ -872,7 +849,6 @@ void LoadEnv::impl_detectTypeAndFilter()
}
}
-
sal_Bool LoadEnv::impl_handleContent()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -939,7 +915,6 @@ sal_Bool LoadEnv::impl_handleContent()
return sal_False;
}
-
sal_Bool LoadEnv::impl_furtherDocsAllowed()
{
// SAFE ->
@@ -1020,7 +995,6 @@ sal_Bool LoadEnv::impl_furtherDocsAllowed()
return bAllowed;
}
-
sal_Bool LoadEnv::impl_loadContent()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1157,7 +1131,6 @@ sal_Bool LoadEnv::impl_loadContent()
return sal_False;
}
-
css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
{
// SAFE -> -----------------------------------
@@ -1224,7 +1197,6 @@ css::uno::Reference< css::uno::XInterface > LoadEnv::impl_searchLoader()
return css::uno::Reference< css::uno::XInterface >();
}
-
void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& xFrame,
const css::util::URL& aURL )
{
@@ -1256,7 +1228,6 @@ void LoadEnv::impl_jumpToMark(const css::uno::Reference< css::frame::XFrame >& x
xDispatcher->dispatch(aCmd, lArgs.getAsConstPropertyValueList());
}
-
css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1397,7 +1368,6 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
return xResult;
}
-
sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< css::frame::XFrame >& xFrame) const
{
css::uno::Reference< css::document::XActionLockable > xLock(xFrame, css::uno::UNO_QUERY);
@@ -1412,7 +1382,6 @@ sal_Bool LoadEnv::impl_isFrameAlreadyUsedForLoading(const css::uno::Reference< c
return xLock->isActionLocked();
}
-
css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1544,7 +1513,6 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
return xTask;
}
-
void LoadEnv::impl_reactForLoadingState()
throw(LoadEnvException, css::uno::RuntimeException)
{
@@ -1664,7 +1632,6 @@ void LoadEnv::impl_reactForLoadingState()
// <- SAFE ----------------------------------
}
-
void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::XWindow >& xWindow ,
sal_Bool bForceToFront)
{
@@ -1701,7 +1668,6 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
}
}
-
void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
{
static OUString PACKAGE_SETUP_MODULES("/org.openoffice.Setup/Office/Factories");