This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 53c84c60a6 Fixed typos, cleanup
53c84c60a6 is described below
commit 53c84c60a65dacad00374eeefbd17a032835fe13
Author: mseidel <msei...@apache.org>
AuthorDate: Sat Nov 23 12:04:41 2024 +0100
Fixed typos, cleanup
---
main/framework/source/services/backingcomp.cxx | 65 +++++----
main/framework/source/services/backingwindow.cxx | 170 +++++++++++------------
main/framework/source/services/desktop.cxx | 124 ++++++++---------
main/framework/source/services/fwk_services.src | 26 ++--
4 files changed, 190 insertions(+), 195 deletions(-)
diff --git a/main/framework/source/services/backingcomp.cxx
b/main/framework/source/services/backingcomp.cxx
index 6838d8444b..2aa961536a 100644
--- a/main/framework/source/services/backingcomp.cxx
+++ b/main/framework/source/services/backingcomp.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
@@ -28,7 +26,6 @@
#include "backingwindow.hxx"
-//_______________________________________________
// own includes
#include <threadhelp/readguard.hxx>
#include <threadhelp/writeguard.hxx>
@@ -42,7 +39,6 @@
#include <helpid.hrc>
#endif
-//_______________________________________________
// interface includes
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
@@ -54,7 +50,6 @@
#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
-//_______________________________________________
// other includes
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/factory.hxx>
@@ -103,7 +98,7 @@ BackingComp::~BackingComp()
Some interfaces are supported by his class directly, but some other ones
are
used by aggregation. An instance of this class must provide some window
interfaces.
But it must represent a VCL window behind such interfaces too! So we use
an internal
- saved window member to ask it for it's interfaces and return it. But we
must be aware then,
+ saved window member to ask it for its interfaces and return it. But we
must be aware then,
that it can be destroyed from outside too ...
@param aType
@@ -192,7 +187,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL
BackingComp::getTypes()
{
/* GLOBAL SAFE { */
::osl::MutexGuard aGlobalLock(::osl::Mutex::getGlobalMutex());
- // Control these pointer again ... it can be, that another instance
will be faster then this one!
+ // Control these pointer again ... it can be, that another instance
will be faster than this one!
if (!pTypeCollection)
{
/* LOCAL SAFE { */
@@ -239,7 +234,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL
BackingComp::getImplementationId()
{
/* GLOBAL SAFE { */
::osl::MutexGuard aLock(::osl::Mutex::getGlobalMutex());
- // Control these pointer again ... it can be, that another instance
will be faster then this one!
+ // Control these pointer again ... it can be, that another instance
will be faster than this one!
if (!pID)
{
static ::cppu::OImplementationId aID(sal_False);
@@ -376,7 +371,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL
BackingComp::impl_createIns
/** returns a new factory instance for instances of this class.
It uses a helper class of the cppuhelper project as factory.
- It will be initialized with all necessary informations and
+ It will be initialized with all necessary information and
will be able afterwards to create instance of this class.
This factory call us back inside our method impl_createInstance().
So we can create and initialize ourself. Only filtering of creation
@@ -406,7 +401,7 @@ css::uno::Reference< css::lang::XSingleServiceFactory >
BackingComp::impl_create
We has to use the container window of this frame as parent window of our
own component window.
But it's not allowed to work with it really. May another component used it
too.
- Currently we need it only to create our child component window and support
it's
+ Currently we need it only to create our child component window and support
its
interfaces inside our queryInterface() method. The user of us must have
e.g. the
XWindow interface of it to be able to call
setComponent(xWindow,xController) at the
frame!
@@ -424,7 +419,7 @@ css::uno::Reference< css::lang::XSingleServiceFactory >
BackingComp::impl_create
xBackingComp);
// attach controller to the frame
- // We will use it's container window, to create
+ // We will use its container window, to create
// the component window. From now we offer the window interfaces!
xBackingComp.attachFrame(xFrame);
@@ -476,7 +471,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference< css::f
::rtl::OUString::createFromAscii("instance seems to be not or
wrong initialized"),
static_cast< ::cppu::OWeakObject* >(this));
- // safe the frame reference
+ // save the frame reference
m_xFrame = xFrame;
// establish drag&drop mode
@@ -494,7 +489,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference< css::f
}
}
- // initialize the component and it's parent window
+ // initialize the component and its parent window
css::uno::Reference< css::awt::XWindow > xParentWindow =
xFrame->getContainerWindow();
WorkWindow* pParent = (WorkWindow*)VCLUnoHelper::GetWindow(xParentWindow);
Window* pWindow = VCLUnoHelper::GetWindow(m_xWindow);
@@ -509,7 +504,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference< css::f
// create the menu bar for the backing component
css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame,
css::uno::UNO_QUERY_THROW);
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
- xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>=
xLayoutManager;
+ xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>=
xLayoutManager;
if (xLayoutManager.is())
{
xLayoutManager->lock();
@@ -521,11 +516,11 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference< css::f
xLayoutManager->showElement ( DECLARE_ASCII(
"private:resource/statusbar/statusbar" ));
*/
xLayoutManager->unlock();
- }
+ }
// set help ID for our canvas
pWindow->SetHelpId(HID_BACKINGWINDOW);
-
+
// inform BackingWindow about frame
BackingWindow* pBack = dynamic_cast<BackingWindow*>(pWindow );
if( pBack )
@@ -540,7 +535,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const
css::uno::Reference< css::f
/** not supported.
This component does not know any model. It will be represented by a window
and
- it's controller only.
+ its controller only.
return <FALSE/> every time.
*/
@@ -556,7 +551,7 @@ sal_Bool SAL_CALL BackingComp::attachModel( /*IN*/ const
css::uno::Reference< cs
/** not supported.
This component does not know any model. It will be represented by a window
and
- it's controller only.
+ its controller only.
return An empty reference every time.
*/
@@ -614,9 +609,9 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL
BackingComp::getFrame()
//_______________________________________________
-/** ask controller for it's current working state.
+/** ask controller for its current working state.
- If somehwere whish to close this component, it must suspend the controller
before.
+ If somehwere wishes to close this component, it must suspend the
controller before.
That will be a chance for it to disagree with that AND show any UI for a
possible
UI user.
@@ -656,7 +651,7 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const
css::lang::EventObject& aEven
{
// Attention: dont free m_pAccExec here! see comments inside dtor and
// keyPressed() for further details.
-
+
/* SAFE { */
WriteGuard aWriteLock(m_aLock);
@@ -676,8 +671,8 @@ void SAL_CALL BackingComp::disposing( /*IN*/ const
css::lang::EventObject& aEven
/** kill this instance.
It can be called from our owner frame only. But there is no possibility to
check the calli.
- We have to release all our internal used ressources and die. From this
point we can throw
- DisposedExceptions for every further interface request ... but current
implementation doesn`t do so ...
+ We have to release all our internal used resources and die. From this
point we can throw
+ DisposedExceptions for every further interface request ... but current
implementation doesn't do so ...
*/
@@ -748,7 +743,7 @@ void SAL_CALL BackingComp::dispose()
not used.
@throw ::com::sun::star::uno::RuntimeException
- because the listener expect to be holded alive by this
container.
+ because the listener expect to be held alive by this container.
We must inform it about this unsupported feature.
*/
@@ -778,20 +773,20 @@ void SAL_CALL BackingComp::removeEventListener( /*IN*/
const css::uno::Reference
//_______________________________________________
/**
- force initialiation for this component.
+ force initialization for this component.
Inside attachFrame() we created our component window. But it was not
allowed there, to
- initialitze it. E.g. the menu must be set at the container window of the
frame, which
+ initialize it. E.g. the menu must be set at the container window of the
frame, which
is our parent window. But may at that time another component used it.
That's why our creator has to inform us, when it's time to initialize us
really.
- Currently only calling of this method must be done. But further
implementatoins
+ Currently only calling of this method must be done. But further
implementations
can use special in parameter to configure this initialization ...
@param lArgs
currently not used
@throw com::sun::star::uno::RuntimeException
- if some ressources are missing
+ if some resources are missing
Means if may be attachedFrame() wasn't called before.
*/
@@ -835,7 +830,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const
css::uno::Sequence< css::uno
xBroadcaster->addEventListener(static_cast< css::lang::XEventListener*
>(this));
m_xWindow->setVisible(sal_True);
-
+
aWriteLock.unlock();
/* } SAFE */
}
@@ -862,9 +857,11 @@ void SAL_CALL BackingComp::keyReleased( /*IN*/ const
css::awt::KeyEvent& )
Please use keyPressed() instead of this method. Otherwise it would be
possible, that
- a key input may be first switch to the backing mode
- and this component register itself as key listener too
- - and its first event will be a keyRealeased() for the already well
known event, which switched to the backing mode!
+ - and its first event will be a keyReleased() for the already well
known event, which switched to the backing mode!
So it will be handled twice! document => backing mode => exit app ...
*/
}
} // namespace framework
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/source/services/backingwindow.cxx
b/main/framework/source/services/backingwindow.cxx
index 7a02cf1892..86a01669ee 100644
--- a/main/framework/source/services/backingwindow.cxx
+++ b/main/framework/source/services/backingwindow.cxx
@@ -190,38 +190,38 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
{
mxPopupMenu.set(
mxContext->getServiceManager()->createInstanceWithContext(
DECLARE_ASCII( "com.sun.star.awt.PopupMenu" ), mxContext ),
uno::UNO_QUERY_THROW );
- }
- }
- catch (const Exception& e)
- {
- OSL_TRACE( "BackingWindow - caught an exception! %s",
- rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8
).getStr() );
- (void) e;
- }
+ }
+ }
+ catch (const Exception& e)
+ {
+ OSL_TRACE( "BackingWindow - caught an exception! %s",
+ rtl::OUStringToOString( e.Message,
RTL_TEXTENCODING_UTF8 ).getStr() );
+ (void) e;
+ }
- String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
- String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
- String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
- String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
+ String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
+// String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
+ String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
+ String aTplRepHelpText( FwkResId( STR_BACKING_TPLREP ) );
- // clean up resource stack
- FreeResource();
+ // clean up resource stack
+ FreeResource();
- maWelcome.SetPaintTransparent( sal_True );
- maProduct.SetPaintTransparent( sal_True );
- EnableChildTransparentMode();
+ maWelcome.SetPaintTransparent( sal_True );
+ maProduct.SetPaintTransparent( sal_True );
+ EnableChildTransparentMode();
- SetStyle( GetStyle() | WB_DIALOGCONTROL );
+ SetStyle( GetStyle() | WB_DIALOGCONTROL );
- // force tab cycling in toolbox
- maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE );
+ // force tab cycling in toolbox
+ maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE );
- // insert toolbox items
- maToolbox.InsertItem( nItemId_TplRep, Image() );
- maToolbox.SetItemText( nItemId_TplRep, aTplRepHelpText );
- maToolbox.SetQuickHelpText( nItemId_TplRep, aTplRepHelpText );
- maToolbox.SetItemCommand( nItemId_TplRep, String(
RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateRepository" ) ) );
- maToolbox.ShowItem( nItemId_TplRep );
+ // insert toolbox items
+ maToolbox.InsertItem( nItemId_TplRep, Image() );
+ maToolbox.SetItemText( nItemId_TplRep, aTplRepHelpText );
+ maToolbox.SetQuickHelpText( nItemId_TplRep, aTplRepHelpText );
+ maToolbox.SetItemCommand( nItemId_TplRep, String(
RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateRepository" ) ) );
+ maToolbox.ShowItem( nItemId_TplRep );
maToolbox.InsertItem( nItemId_Extensions, Image() );
maToolbox.SetQuickHelpText( nItemId_Extensions, aExtHelpText );
@@ -235,27 +235,27 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
maToolbox.SetItemCommand( nItemId_Info, String(
RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Info" ) ) );
maToolbox.ShowItem( nItemId_Info );
- // get dispatch provider
- mxDesktop = Reference<XDesktop>(
comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_DESKTOP
),UNO_QUERY );
- if( mxDesktop.is() )
- mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop,
UNO_QUERY );
+ // get dispatch provider
+ mxDesktop = Reference<XDesktop>(
comphelper::getProcessServiceFactory()->createInstance(SERVICENAME_DESKTOP
),UNO_QUERY );
+ if( mxDesktop.is() )
+ mxDesktopDispatchProvider = Reference< XDispatchProvider >(
mxDesktop, UNO_QUERY );
- maWriterButton.SetHelpId( ".HelpId:StartCenter:WriterButton" );
- maCalcButton.SetHelpId( ".HelpId:StartCenter:CalcButton" );
- maImpressButton.SetHelpId( ".HelpId:StartCenter:ImpressButton" );
- maDrawButton.SetHelpId( ".HelpId:StartCenter:DrawButton" );
- maDBButton.SetHelpId( ".HelpId:StartCenter:DBButton" );
- maMathButton.SetHelpId( ".HelpId:StartCenter:MathButton" );
- maTemplateButton.SetHelpId( ".HelpId:StartCenter:TemplateButton" );
- maOpenButton.SetHelpId( ".HelpId:StartCenter:OpenButton" );
- maToolbox.SetHelpId( ".HelpId:StartCenter:Toolbox" );
+ maWriterButton.SetHelpId( ".HelpId:StartCenter:WriterButton" );
+ maCalcButton.SetHelpId( ".HelpId:StartCenter:CalcButton" );
+ maImpressButton.SetHelpId( ".HelpId:StartCenter:ImpressButton" );
+ maDrawButton.SetHelpId( ".HelpId:StartCenter:DrawButton" );
+ maDBButton.SetHelpId( ".HelpId:StartCenter:DBButton" );
+ maMathButton.SetHelpId( ".HelpId:StartCenter:MathButton" );
+ maTemplateButton.SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+ maOpenButton.SetHelpId( ".HelpId:StartCenter:OpenButton" );
+ maToolbox.SetHelpId( ".HelpId:StartCenter:Toolbox" );
- // init background
- initBackground();
+ // init background
+ initBackground();
- // add some breathing space for the images
- maButtonImageSize.Width() += 12;
- maButtonImageSize.Height() += 12;
+ // add some breathing space for the images
+ maButtonImageSize.Width() += 12;
+ maButtonImageSize.Height() += 12;
}
@@ -386,7 +386,7 @@ void BackingWindow::initBackground()
maBackgroundRight = BitmapEx( FwkResId( BMP_BACKING_BACKGROUND_RIGHT )
);
}
maToolbox.SetItemImage( nItemId_Extensions, BitmapEx( FwkResId(
BMP_BACKING_EXT ) ) );
-//### maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId(
BMP_BACKING_REG ) ) );
+// maToolbox.SetItemImage( nItemId_Reg, BitmapEx( FwkResId(
BMP_BACKING_REG ) ) );
maToolbox.SetItemImage( nItemId_Info, BitmapEx( FwkResId( BMP_BACKING_INFO
) ) );
maToolbox.SetItemImage( nItemId_TplRep, BitmapEx( FwkResId(
BMP_BACKING_TPLREP ) ) );
@@ -544,7 +544,7 @@ void BackingWindow::initControls()
aModuleOptions, SvtModuleOptions::E_SMATH,
maMathButton, aMnemns );
- nYPos += 3*maButtonImageSize.Height() / 2;
+ nYPos += 3 * maButtonImageSize.Height() / 2;
layoutButton( NULL, 0, aFileNewAppsAvailable,
aModuleOptions, SvtModuleOptions::E_SWRITER,
@@ -646,11 +646,11 @@ void BackingWindow::layoutButton(
{
if( nTextWidth > mnColumnWidth[nColumn] )
mnColumnWidth[nColumn] = nTextWidth;
- }
+ }
- i_rBtn.SetImageAlign( IMAGEALIGN_LEFT );
- // show the controls
- i_rBtn.Show();
+ i_rBtn.SetImageAlign( IMAGEALIGN_LEFT );
+ // show the controls
+ i_rBtn.Show();
}
void BackingWindow::Paint( const Rectangle& )
@@ -1011,19 +1011,19 @@ struct ImplDelayedDispatch
static long implDispatchDelayed( void*, void* pArg )
{
- struct ImplDelayedDispatch* pDispatch =
reinterpret_cast<ImplDelayedDispatch*>(pArg);
- try
- {
- pDispatch->xDispatch->dispatch( pDispatch->aDispatchURL,
pDispatch->aArgs );
- }
- catch( Exception )
- {
- }
+ struct ImplDelayedDispatch* pDispatch =
reinterpret_cast<ImplDelayedDispatch*>(pArg);
+ try
+ {
+ pDispatch->xDispatch->dispatch( pDispatch->aDispatchURL,
pDispatch->aArgs );
+ }
+ catch( Exception )
+ {
+ }
- // clean up
- delete pDispatch;
+ // clean up
+ delete pDispatch;
- return 0;
+ return 0;
}
void BackingWindow::dispatchURL( const rtl::OUString& i_rURL,
@@ -1031,24 +1031,24 @@ void BackingWindow::dispatchURL( const rtl::OUString&
i_rURL,
const Reference< XDispatchProvider >& i_xProv,
const Sequence< PropertyValue >& i_rArgs )
{
- // if no special dispatch provider is given, get the desktop
- Reference< XDispatchProvider > xProvider( i_xProv.is() ? i_xProv :
mxDesktopDispatchProvider );
+ // if no special dispatch provider is given, get the desktop
+ Reference< XDispatchProvider > xProvider( i_xProv.is() ? i_xProv :
mxDesktopDispatchProvider );
- // check for dispatch provider
- if( !xProvider.is())
- return;
+ // check for dispatch provider
+ if( !xProvider.is())
+ return;
- // get an URL transformer to clean up the URL
- com::sun::star::util::URL aDispatchURL;
- aDispatchURL.Complete = i_rURL;
+ // get an URL transformer to clean up the URL
+ com::sun::star::util::URL aDispatchURL;
+ aDispatchURL.Complete = i_rURL;
- Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
- comphelper::getProcessServiceFactory()->createInstance(
rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
- com::sun::star::uno::UNO_QUERY );
- if ( xURLTransformer.is() )
- {
- try
- {
+ Reference < com::sun::star::util::XURLTransformer > xURLTransformer(
+ comphelper::getProcessServiceFactory()->createInstance(
rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer") ),
+ com::sun::star::uno::UNO_QUERY );
+ if ( xURLTransformer.is() )
+ {
+ try
+ {
// clean up the URL
xURLTransformer->parseStrict( aDispatchURL );
// get a Dispatch for the URL and target
@@ -1062,15 +1062,15 @@ void BackingWindow::dispatchURL( const rtl::OUString&
i_rURL,
sal_uLong nEventId = 0;
if( ! Application::PostUserEvent( nEventId, Link( NULL,
implDispatchDelayed ), pDisp ) )
delete pDisp; // event could not be posted for unknown
reason, at least don't leak
- }
- }
- catch ( com::sun::star::uno::RuntimeException& )
- {
- throw;
- }
- catch ( com::sun::star::uno::Exception& )
- {
- }
+ }
+ }
+ catch ( com::sun::star::uno::RuntimeException& )
+ {
+ throw;
+ }
+ catch ( com::sun::star::uno::Exception& )
+ {
+ }
}
}
diff --git a/main/framework/source/services/desktop.cxx
b/main/framework/source/services/desktop.cxx
index 7ea5ed3fde..68f1dc0141 100644
--- a/main/framework/source/services/desktop.cxx
+++ b/main/framework/source/services/desktop.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
@@ -168,7 +166,7 @@ DEFINE_INIT_SERVICE ( Desktop,
/*Attention
I think we don't need any
mutex or lock here ... because we are called by our own static method
impl_createInstance()
to create a new instance
of this class by our own supported service factory.
- see macro
DEFINE_XSERVICEINFO_MULTISERVICE and "impl_initService()" for further
informations!
+ see macro
DEFINE_XSERVICEINFO_MULTISERVICE and "impl_initService()" for further
information!
*/
//-------------------------------------------------------------------------------------------------------------
@@ -190,7 +188,7 @@ DEFINE_INIT_SERVICE ( Desktop,
// Initialize a new
interception helper object to handle dispatches and implement an interceptor
mechanism.
// Set created dispatch
provider as slowest slave of it.
// Hold interception helper by
reference only - not by pointer!
- // So it's easiear to destroy
it.
+ // So it's easier to destroy
it.
InterceptionHelper*
pInterceptionHelper = new InterceptionHelper( this, xDispatchProvider );
m_xDispatchHelper =
css::uno::Reference< css::frame::XDispatchProvider >( static_cast<
::cppu::OWeakObject* >(pInterceptionHelper), css::uno::UNO_QUERY );
@@ -223,7 +221,7 @@ DEFINE_INIT_SERVICE ( Desktop,
will get over this. (e.g. using of your reference as
parameter to initialize some member)
Do such things in DEFINE_INIT_SERVICE() method, which is
called automatically after your ctor!!!
b) Baseclass OBroadcastHelper is a typedef in namespace cppu!
- The microsoft compiler has some problems to handle it
right BY using namespace explicitly ::cppu::OBroadcastHelper.
+ The Microsoft compiler has some problems to handle it
right BY using namespace explicitly ::cppu::OBroadcastHelper.
If we write it without a namespace or expand the typedef
to OBrodcastHelperVar<...> -> it will be OK!?
I don't know why! (other compiler not tested .. but it
works!)
@@ -275,7 +273,7 @@ Desktop::Desktop( const css::uno::Reference<
css::lang::XMultiServiceFactory >&
/*-************************************************************************************************************//**
@short standard destructor
- @descr This one do NOTHING! Use dispose() instaed of this.
+ @descr This one do NOTHING! Use dispose() instead of this.
@seealso method dispose()
@@ -298,15 +296,15 @@ sal_Bool SAL_CALL Desktop::terminate()
SYNCHRONIZED_START
ReadGuard aReadLock( m_aLock );
-
+
css::uno::Reference< css::frame::XTerminateListener > xPipeTerminator
= m_xPipeTerminator;
css::uno::Reference< css::frame::XTerminateListener > xQuickLauncher
= m_xQuickLauncher;
css::uno::Reference< css::frame::XTerminateListener > xSWThreadManager
= m_xSWThreadManager;
css::uno::Reference< css::frame::XTerminateListener > xSfxTerminator
= m_xSfxTerminator;
-
+
css::lang::EventObject aEvent
( static_cast< ::cppu::OWeakObject* >(this) );
::sal_Bool
bAskQuickStart = !m_bSuspendQuickstartVeto
;
-
+
aReadLock.unlock();
SYNCHRONIZED_END
@@ -347,7 +345,7 @@ sal_Bool SAL_CALL Desktop::terminate()
// Order of alled listener is important !
// some of them are harmless .-)
// But some of them can be dangerous. E.g. it would be dangerous if we
close our pipe
- // and dont terminate in real because another listener throws a veto
exception .-)
+ // and don't terminate in real because another listener throws a veto
exception .-)
::sal_Bool bTerminate = sal_False;
try
@@ -360,25 +358,25 @@ sal_Bool SAL_CALL Desktop::terminate()
xQuickLauncher->queryTermination( aEvent );
lCalledTerminationListener.push_back( xQuickLauncher );
}
-
+
if ( xSWThreadManager.is() )
{
xSWThreadManager->queryTermination( aEvent );
lCalledTerminationListener.push_back( xSWThreadManager );
}
-
+
if ( xPipeTerminator.is() )
{
xPipeTerminator->queryTermination( aEvent );
lCalledTerminationListener.push_back( xPipeTerminator );
}
-
+
if ( xSfxTerminator.is() )
{
xSfxTerminator->queryTermination( aEvent );
lCalledTerminationListener.push_back( xSfxTerminator );
}
-
+
bTerminate = sal_True;
}
catch(const css::frame::TerminationVetoException&)
@@ -392,16 +390,16 @@ sal_Bool SAL_CALL Desktop::terminate()
{
#ifdef ENABLE_ASSERTIONS
// "Protect" us against dispose before terminate calls!
- // see dispose() for further informations.
+ // see dispose() for further information.
/* SAFE AREA
---------------------------------------------------------------------------------------
*/
WriteGuard aWriteLock( m_aLock );
m_bIsTerminated = sal_True;
aWriteLock.unlock();
/* UNSAFE AREA
-------------------------------------------------------------------------------------
*/
#endif
-
+
impl_sendNotifyTerminationEvent();
-
+
if(
( bAskQuickStart ) &&
( xQuickLauncher.is() )
@@ -409,19 +407,19 @@ sal_Bool SAL_CALL Desktop::terminate()
{
xQuickLauncher->notifyTermination( aEvent );
}
-
+
if ( xSWThreadManager.is() )
xSWThreadManager->notifyTermination( aEvent );
-
+
if ( xPipeTerminator.is() )
xPipeTerminator->notifyTermination( aEvent );
-
+
// Must be really the last listener to be called.
// Because it shutdown the whole process asynchronous !
if ( xSfxTerminator.is() )
xSfxTerminator->notifyTermination( aEvent );
}
-
+
return bTerminate;
}
@@ -436,10 +434,10 @@ void SAL_CALL Desktop::addTerminateListener( const
css::uno::Reference< css::fra
if ( xInfo.is() )
{
::rtl::OUString sImplementationName = xInfo->getImplementationName();
-
+
// SYCNHRONIZED ->
WriteGuard aWriteLock( m_aLock );
-
+
if( sImplementationName.equals(IMPLEMENTATIONNAME_SFXTERMINATOR) )
{
m_xSfxTerminator = xListener;
@@ -460,7 +458,7 @@ void SAL_CALL Desktop::addTerminateListener( const
css::uno::Reference< css::fra
m_xSWThreadManager = xListener;
return;
}
-
+
aWriteLock.unlock();
// <- SYCNHRONIZED
}
@@ -479,34 +477,34 @@ void SAL_CALL Desktop::removeTerminateListener( const
css::uno::Reference< css::
if ( xInfo.is() )
{
::rtl::OUString sImplementationName = xInfo->getImplementationName();
-
+
// SYCNHRONIZED ->
WriteGuard aWriteLock( m_aLock );
-
+
if( sImplementationName.equals(IMPLEMENTATIONNAME_SFXTERMINATOR) )
{
m_xSfxTerminator.clear();
return;
}
-
+
if( sImplementationName.equals(IMPLEMENTATIONNAME_PIPETERMINATOR) )
{
m_xPipeTerminator.clear();
return;
}
-
+
if( sImplementationName.equals(IMPLEMENTATIONNAME_QUICKLAUNCHER) )
{
m_xQuickLauncher.clear();
return;
}
-
+
if( sImplementationName.equals(IMPLEMENTATIONNAME_SWTHREADMANAGER) )
{
m_xSWThreadManager.clear();
return;
}
-
+
aWriteLock.unlock();
// <- SYCNHRONIZED
}
@@ -618,13 +616,13 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL
Desktop::getCurrentFrame() th
/*-************************************************************************************************************//**
@interface XComponentLoader
@short try to load given URL into a task
- @descr You can give us some informations about the content, which you
will load into a frame.
+ @descr You can give us some information about the content, which you
will load into a frame.
We search or create this target for you, make a type detection
of given URL and try to load it.
As result of this operation we return the new created
component or nothing, if loading failed.
@seealso -
- @param "sURL" , URL, which represant the content
+ @param "sURL" , URL, which represents the content
@param "sTargetFrameName" , name of target frame or special value
like "_self", "_blank" ...
@param "nSearchFlags" , optional arguments for frame search, if
target isn't a special one
@param "lArguments" , optional arguments for loading
@@ -942,7 +940,7 @@ sal_Bool SAL_CALL Desktop::isTop() throw(
css::uno::RuntimeException )
//*****************************************************************************************************************
void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException )
{
- // Desktop is activae always ... but sometimes our frames try to activate
+ // Desktop is active always ... but sometimes our frames try to activate
// the complete path from bottom to top ... And our desktop is the topest
frame :-(
// So - please don't show any assertions here. Do nothing!
}
@@ -1002,7 +1000,7 @@ void SAL_CALL Desktop::removeFrameActionListener( const
css::uno::Reference< css
@short try to find a frame with special parameters
@descr This method searches for a frame with the specified name.
Frames may contain other frames (e.g. a frameset) and may
- be contained in other frames. This hierarchie ist searched by
+ be contained in other frames. This hierarchie is searched by
this method.
First some special names are taken into account, i.e. "",
"_self", "_top", "_parent" etc. The FrameSearchFlags are
ignored
@@ -1129,7 +1127,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL
Desktop::findFrame( const ::r
// II.II) TASKS
// This is a special flag. Normally it regulates search inside tasks
and forbid access to parent trees.
// But the desktop exists outside such task trees. They are our sub
trees. So the desktop implement
- // a special feature: We use it to start search on our direct
childrens only. That means we suppress
+ // a special feature: We use it to start search on our direct
children only. That means we suppress
// search on ALL child frames. May that can be useful to get access
on opened document tasks
// only without filter out all non really required sub frames ...
// Used helper method on our container doesn't create any frame - its
a search only.
@@ -1185,11 +1183,11 @@ void SAL_CALL Desktop::dispose()
SYNCHRONIZED_START
WriteGuard aWriteLock( m_aLock );
-
+
// Look for multiple calls of this method!
// If somewhere call dispose() twice - he will be stopped here
really!!!
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS
);
-
+
// Now - we are alone and its the first call of this method ...
// otherwise call before had thrown a DisposedException / hopefully .-)
// But we dont use the transaction object created before ... we reset
it immediately ...
@@ -1199,12 +1197,12 @@ void SAL_CALL Desktop::dispose()
// are running within the same thread!) So we would block ourself
there if aTransaction
// will stay registered .-)
aTransaction.stop();
-
+
// Disable this instance for further work.
// This will wait for all current running transactions ...
// and reject all new incoming requests!
m_aTransactionManager.setWorkingMode( E_BEFORECLOSE );
-
+
aWriteLock.unlock();
SYNCHRONIZED_END
@@ -1248,11 +1246,11 @@ void SAL_CALL Desktop::dispose()
/*-************************************************************************************************************//**
@interface XComponent
@short add/remove listener for dispose events
- @descr Add an event listener to this object, if you whish to get
informations
+ @descr Add an event listener to this object, if you wish to get
information
about our dying!
- You must releas ethis listener reference during your own
disposing() method.
+ You must release this listener reference during your own
disposing() method.
- @attention Our container is threadsafe himeslf. So we doesn't need any
lock here.
+ @attention Our container is threadsafe himself. So we doesn't need any
lock here.
@seealso -
@@ -1375,12 +1373,12 @@ void SAL_CALL Desktop::handle( const
css::uno::Reference< css::task::XInteractio
// Don't check incoming request!
// If somewhere starts interaction without right parameter - he made
something wrong.
- // loadComponentFromURL() waits for thjese event - otherwise it yield for
ever!
+ // loadComponentFromURL() waits for these event - otherwise it yield for
ever!
// get packed request and work on it first
// Attention: Don't set it on internal member BEFORE interaction is
finished - because
// "loadComponentFromURL()" yield tills this member is changed. If we do
it before
- // interaction finish we can't guarantee right functionality. May be we
cancel load process to erliear ...
+ // interaction finish we can't guarantee right functionality. May be we
cancel load process to early...
css::uno::Any aRequest = xRequest->getRequest();
// extract continuations from request
@@ -1404,7 +1402,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference<
css::task::XInteractio
}
// differ between abortable interactions (error, unknown filter ...)
- // and other ones (ambigous but not unknown filter ...)
+ // and other ones (ambiguous but not unknown filter ...)
css::task::ErrorCodeRequest aErrorCodeRequest ;
css::document::AmbigousFilterRequest aAmbigousFilterRequest;
if( aRequest >>= aAmbigousFilterRequest )
@@ -1457,7 +1455,7 @@ void SAL_CALL Desktop::handle( const css::uno::Reference<
css::task::XInteractio
TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
return m_xTitleNumberGenerator->leaseNumber (xComponent);
}
-
+
//-----------------------------------------------------------------------------
void SAL_CALL Desktop::releaseNumber( ::sal_Int32 nNumber )
throw (css::lang::IllegalArgumentException,
@@ -1503,7 +1501,7 @@ void SAL_CALL Desktop::releaseNumberForComponent( const
css::uno::Reference< css
@param "aOldValue" old value of property
@param "nHandle" handle of property
@param "aValue" new value of property
- @return sal_True if value will be changed, sal_FALSE otherway
+ @return sal_True if value will be changed, sal_FALSE otherwise
@onerror IllegalArgumentException, if you call this with an invalid
argument
@threadsafe yes
@@ -1815,9 +1813,9 @@ void
Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC
::cppu::OInterfaceContainerHelper* pContainer =
m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference<
css::frame::XTerminateListener >*) NULL ) );
if ( ! pContainer )
return;
-
+
css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >(this) );
-
+
::cppu::OInterfaceIteratorHelper aIterator( *pContainer );
while ( aIterator.hasMoreElements() )
{
@@ -1878,9 +1876,9 @@ void Desktop::impl_sendNotifyTerminationEvent()
::cppu::OInterfaceContainerHelper* pContainer =
m_aListenerContainer.getContainer( ::getCppuType( ( const css::uno::Reference<
css::frame::XTerminateListener >*) NULL ) );
if ( ! pContainer )
return;
-
+
css::lang::EventObject aEvent( static_cast< ::cppu::OWeakObject* >(this) );
-
+
::cppu::OInterfaceIteratorHelper aIterator( *pContainer );
while ( aIterator.hasMoreElements() )
{
@@ -1952,7 +1950,7 @@ void Desktop::impl_sendNotifyTerminationEvent()
// Any internal process of this frame disagree with our
request.
// Safe this state but dont break these loop. Other frames
has to be closed!
++nNonClosedFrames;
-
+
// Reactivate controller.
// It can happen that XController.suspend() returned true
... but a registered close listener
// throwed these veto exception. Then the controller has
to be reactivated. Otherwise
@@ -1963,18 +1961,18 @@ void Desktop::impl_sendNotifyTerminationEvent()
)
xController->suspend(sal_False);
}
-
+
// If interface XClosable interface exists and was used ...
// it's not allowed to use XComponent->dispose() also !
continue;
}
-
+
// XClosable not supported ?
// Then we have to dispose these frame hardly.
css::uno::Reference< css::lang::XComponent > xDispose( xFrame,
css::uno::UNO_QUERY );
if ( xDispose.is() )
xDispose->dispose();
-
+
// Don't remove these frame from our child container!
// A frame do it by itself inside close()/dispose() method.
}
@@ -2003,7 +2001,7 @@ void Desktop::impl_sendNotifyTerminationEvent()
// We work with valid servicemanager only.
sal_Bool Desktop::implcp_ctor( const css::uno::Reference<
css::lang::XMultiServiceFactory >& xFactory )
{
- return(
+ return(
( &xFactory == NULL )
||
( xFactory.is() == sal_False )
);
@@ -2013,7 +2011,7 @@ sal_Bool Desktop::implcp_ctor( const css::uno::Reference<
css::lang::XMultiServi
// We work with valid listener only.
sal_Bool Desktop::implcp_addEventListener( const css::uno::Reference<
css::lang::XEventListener >& xListener )
{
- return(
+ return(
( &xListener == NULL )
||
( xListener.is() == sal_False )
);
@@ -2023,7 +2021,7 @@ sal_Bool Desktop::implcp_addEventListener( const
css::uno::Reference< css::lang:
// We work with valid listener only.
sal_Bool Desktop::implcp_removeEventListener( const css::uno::Reference<
css::lang::XEventListener >& xListener )
{
- return(
+ return(
( &xListener == NULL )
||
( xListener.is() == sal_False )
);
@@ -2032,3 +2030,5 @@ sal_Bool Desktop::implcp_removeEventListener( const
css::uno::Reference< css::la
#endif // #ifdef ENABLE_ASSERTIONS
} // namespace framework
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/framework/source/services/fwk_services.src
b/main/framework/source/services/fwk_services.src
index 817f113e1a..698114368a 100644
--- a/main/framework/source/services/fwk_services.src
+++ b/main/framework/source/services/fwk_services.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "framework.hrc"
Window DLG_BACKING
@@ -53,10 +51,10 @@ Window DLG_BACKING
{
Text [ en-US ] = "Add new features to %PRODUCTNAME" ;
};
- String STR_BACKING_REGHELP
- {
- Text [ en-US ] = "Register your %PRODUCTNAME" ;
- };
+// String STR_BACKING_REGHELP
+// {
+// Text [ en-US ] = "Register your %PRODUCTNAME" ;
+// };
String STR_BACKING_INFOHELP
{
Text [ en-US ] = "Get more information about %PRODUCTNAME" ;
@@ -93,10 +91,10 @@ Resource RES_BACKING_IMAGES
{
File = "extension_32.png" ;
};
- Bitmap BMP_BACKING_REG
- {
- File = "register_32.png" ;
- };
+// Bitmap BMP_BACKING_REG
+// {
+// File = "register_32.png" ;
+// };
Bitmap BMP_BACKING_INFO
{
File = "info_32.png" ;
@@ -165,10 +163,10 @@ Resource RES_BACKING_IMAGES_HC
{
File = "extension_32_hc.png" ;
};
- Bitmap BMP_BACKING_REG
- {
- File = "register_32_hc.png" ;
- };
+// Bitmap BMP_BACKING_REG
+// {
+// File = "register_32_hc.png" ;
+// };
Bitmap BMP_BACKING_INFO
{
File = "info_32_hc.png" ;
