UnoControls/inc/basecontainercontrol.hxx | 177 +----
UnoControls/inc/basecontrol.hxx | 404 +++----------
UnoControls/inc/multiplexer.hxx | 223 ++-----
UnoControls/source/base/basecontrol.cxx | 2
UnoControls/source/controls/framecontrol.cxx | 2
UnoControls/source/controls/statusindicator.cxx | 2
UnoControls/source/inc/OConnectionPointContainerHelper.hxx | 112 ---
UnoControls/source/inc/OConnectionPointHelper.hxx | 167 -----
UnoControls/source/inc/framecontrol.hxx | 108 +--
UnoControls/source/inc/progressbar.hxx | 275 --------
UnoControls/source/inc/progressmonitor.hxx | 211 +-----
UnoControls/source/inc/statusindicator.hxx | 166 +----
12 files changed, 411 insertions(+), 1438 deletions(-)
New commits:
commit c504477e7c3c7109fc4439988d8f3eb11a267c74
Author: Noel Grandin <n...@peralex.com>
Date: Wed Nov 11 11:19:43 2015 +0200
com::sun::star->css in UnoControls/
and remove some noise comments
Change-Id: I290ec365b58fa1b21838a6faf84006434c3e7bbd
Reviewed-on: https://gerrit.libreoffice.org/19904
Reviewed-by: Noel Grandin <noelgran...@gmail.com>
Tested-by: Noel Grandin <noelgran...@gmail.com>
diff --git a/UnoControls/inc/basecontainercontrol.hxx
b/UnoControls/inc/basecontainercontrol.hxx
index c4f2295..e62b9af 100644
--- a/UnoControls/inc/basecontainercontrol.hxx
+++ b/UnoControls/inc/basecontainercontrol.hxx
@@ -42,28 +42,18 @@ namespace unocontrols{
struct IMPL_ControlInfo
{
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >
xControl;
- OUString sName;
+ css::uno::Reference< css::awt::XControl > xControl;
+ OUString sName;
};
-class BaseContainerControl : public ::com::sun::star::awt::XControlModel
- , public ::com::sun::star::awt::XControlContainer
+class BaseContainerControl : public css::awt::XControlModel
+ , public css::awt::XControlContainer
, public BaseControl
{
-// public methods
-
public:
- // construct/destruct
-
-
/**_______________________________________________________________________________________________________
- */
-
- BaseContainerControl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
-
-
/**_______________________________________________________________________________________________________
- */
+ BaseContainerControl( const css::uno::Reference<
css::uno::XComponentContext >& rxContext );
virtual ~BaseContainerControl();
@@ -82,9 +72,9 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XTypeProvider
@@ -96,181 +86,88 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getTypes()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XAggregation
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
- const ::com::sun::star::uno::Type& aType
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryAggregation(
+ const css::uno::Type& aType
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XControl
-
/**_______________________________________________________________________________________________________
- */
-
virtual void SAL_CALL createPeer(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XToolkit >& xToolkit ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer >& xParent
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XToolkit >& xToolkit ,
+ const css::uno::Reference< css::awt::XWindowPeer >& xParent
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL setModel(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel >& xModel
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::awt::XControlModel >& xModel
+ ) throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel > SAL_CALL getModel()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XComponent
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL dispose() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispose() throw( css::uno::RuntimeException,
std::exception ) override;
// XEventListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL disposing( const
::com::sun::star::lang::EventObject& rEvent ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent )
throw( css::uno::RuntimeException, std::exception ) override;
// XControlContainer
-
/**_______________________________________________________________________________________________________
- */
-
virtual void SAL_CALL addControl(
- const OUString& sName ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControl >& xControl
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const OUString& sName ,
+ const css::uno::Reference< css::awt::XControl >& xControl
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeControl(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControl >& xControl
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XControl >& xControl
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setStatusText(
const OUString& sStatusText
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl
> SAL_CALL getControl(
+ virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl(
const OUString& sName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ ) throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControl > > SAL_CALL getControls()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > >
SAL_CALL getControls()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XWindow
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-// protected methods
+ virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw(
css::uno::RuntimeException, std::exception ) override;
protected:
using OComponentHelper::disposing;
-
/**_______________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
- @param
-
- @return
-
- @onerror
- */
-
- virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer >& xParentPeer
+ virtual css::awt::WindowDescriptor* impl_getWindowDescriptor(
+ const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
) override;
-
/**_______________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
virtual void impl_paint(
sal_Int32 nX ,
sal_Int32 nY ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XGraphics >& xGraphics
+ const css::uno::Reference< css::awt::XGraphics >& xGraphics
) override;
-// private methods
-
private:
-
/**_______________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
void impl_activateTabControllers();
-
/**_______________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
void impl_cleanMemory();
-// private variables
-
-private:
// list of pointer of "struct IMPL_ControlInfo" to hold child-controls
::std::vector< IMPL_ControlInfo* > maControlInfoList;
// list of references of XTabController to hold tab-order in this container
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::awt::XTabController > > m_xTabControllerList;
+ css::uno::Sequence< css::uno::Reference< css::awt::XTabController > >
m_xTabControllerList;
::cppu::OMultiTypeInterfaceContainerHelper
m_aListeners;
diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx
index 4ccf035..81ec491 100644
--- a/UnoControls/inc/basecontrol.hxx
+++ b/UnoControls/inc/basecontrol.hxx
@@ -109,29 +109,19 @@ struct IMPL_MutexContainer
::osl::Mutex m_aMutex;
};
-class BaseControl : public ::com::sun::star::lang::XServiceInfo
- , public ::com::sun::star::awt::XPaintListener
- , public ::com::sun::star::awt::XWindowListener
- , public ::com::sun::star::awt::XView
- , public ::com::sun::star::awt::XWindow
- , public ::com::sun::star::awt::XControl
+class BaseControl : public css::lang::XServiceInfo
+ , public css::awt::XPaintListener
+ , public css::awt::XWindowListener
+ , public css::awt::XView
+ , public css::awt::XWindow
+ , public css::awt::XControl
, public IMPL_MutexContainer
, public ::cppu::OComponentHelper
{
-// public methods
-
public:
- // construct/destruct
-
-
/**_______________________________________________________________________________________________________
- */
-
- BaseControl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
-
-
/**_______________________________________________________________________________________________________
- */
+ BaseControl( const css::uno::Reference< css::uno::XComponentContext >&
rxContext );
virtual ~BaseControl();
@@ -150,9 +140,9 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType
+ ) throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -182,8 +172,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getTypes()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short get implementation id
@@ -196,398 +186,222 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XAggregation
-
/**_______________________________________________________________________________________________________
- */
-
virtual void SAL_CALL setDelegator(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xDelegator
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::uno::XInterface >& xDelegator
+ ) throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
- const ::com::sun::star::uno::Type& aType
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryAggregation(
+ const css::uno::Type& aType
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XServiceInfo
-
/**_______________________________________________________________________________________________________
- */
-
virtual sal_Bool SAL_CALL supportsService(
const OUString& sServiceName
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual OUString SAL_CALL getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XComponent
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL dispose() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL dispose() throw( css::uno::RuntimeException,
std::exception ) override;
virtual void SAL_CALL addEventListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::lang::XEventListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeEventListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XEventListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::lang::XEventListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XControl
-
/**_______________________________________________________________________________________________________
- */
-
virtual void SAL_CALL createPeer(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XToolkit >& xToolkit,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer >& xParent
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XToolkit >& xToolkit,
+ const css::uno::Reference< css::awt::XWindowPeer >& xParent
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setContext(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xContext
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::uno::XInterface >& xContext
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL setModel(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel >& xModel
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override = 0;
+ const css::uno::Reference< css::awt::XControlModel >& xModel
+ ) throw( css::uno::RuntimeException, std::exception ) override = 0;
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw(
css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext()
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
+ virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+ throw( css::uno::RuntimeException, std::exception ) override = 0;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL getContext()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer()
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel > SAL_CALL getModel()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override = 0;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::awt::XView > SAL_CALL getView()
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView >
SAL_CALL getView()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual sal_Bool SAL_CALL isDesignMode() throw(
css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL isDesignMode() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual sal_Bool SAL_CALL isTransparent() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL isTransparent() throw(
css::uno::RuntimeException, std::exception ) override;
// XWindow
-
/**_______________________________________________________________________________________________________
- */
-
virtual void SAL_CALL setPosSize( sal_Int32 nX ,
sal_Int32 nY ,
sal_Int32 nWidth ,
sal_Int32 nHeight ,
- sal_Int16 nFlags ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ sal_Int16 nFlags ) throw(
css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw(
css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw(
css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL setFocus() throw( css::uno::RuntimeException,
std::exception ) override;
- virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL setFocus() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual css::awt::Rectangle SAL_CALL getPosSize() throw(
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addWindowListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XWindowListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addFocusListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XFocusListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XFocusListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addKeyListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XKeyListener >& xListener )
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XKeyListener >& xListener )
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addMouseListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XMouseListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XMouseListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addMouseMotionListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XMouseMotionListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XMouseMotionListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL addPaintListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XPaintListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XPaintListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeWindowListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XWindowListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeFocusListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XFocusListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XFocusListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeKeyListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XKeyListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XKeyListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeMouseListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XMouseListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XMouseListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeMouseMotionListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XMouseMotionListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XMouseMotionListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removePaintListener(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XPaintListener >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::awt::XPaintListener >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XView
-
/**_______________________________________________________________________________________________________
- */
-
virtual void SAL_CALL draw( sal_Int32 nX ,
- sal_Int32 nY ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
+ sal_Int32 nY ) throw(
css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL setGraphics(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XGraphics >& xDevice
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XGraphics >& xDevice
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setZoom( float fZoomX ,
- float fZoomY ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
+ float fZoomY ) throw(
css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics
> SAL_CALL getGraphics()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics()
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual css::awt::Size SAL_CALL getSize() throw(
css::uno::RuntimeException, std::exception ) override;
- // ::com::sun::star::lang::XEventListener
-
-
/**_______________________________________________________________________________________________________
- */
+ // css::lang::XEventListener
virtual void SAL_CALL disposing(
- const ::com::sun::star::lang::EventObject& rSource
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::lang::EventObject& rSource
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XPaintListener
-
/**_______________________________________________________________________________________________________
- */
-
virtual void SAL_CALL windowPaint(
- const ::com::sun::star::awt::PaintEvent& rEvent
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::awt::PaintEvent& rEvent
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XWindowListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowResized( const
::com::sun::star::awt::WindowEvent& aEvent ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowMoved( const
::com::sun::star::awt::WindowEvent& aEvent ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowShown( const
::com::sun::star::lang::EventObject& aEvent ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowHidden( const
::com::sun::star::lang::EventObject& aEvent ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent )
throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent )
throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent )
throw( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent )
throw( css::uno::RuntimeException, std::exception ) override;
// impl but public method to register service
-
/**_______________________________________________________________________________________________________
- */
-
- static const ::com::sun::star::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
-
-
/**_______________________________________________________________________________________________________
- */
+ static const css::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
static const OUString impl_getStaticImplementationName();
-// protected methods
-
protected:
using OComponentHelper::disposing;
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::uno::XComponentContext >
impl_getComponentContext() { return m_xComponentContext;}
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > impl_getComponentContext() { return
m_xComponentContext;}
+ const css::uno::Reference< css::awt::XWindow > impl_getPeerWindow() {
return m_xPeerWindow;}
-
/**_______________________________________________________________________________________________________
- */
-
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
impl_getPeerWindow() { return m_xPeerWindow;}
-
-
/**_______________________________________________________________________________________________________
- */
-
- const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >
impl_getGraphicsPeer() { return m_xGraphicsPeer;}
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XGraphics > impl_getGraphicsPeer() {
return m_xGraphicsPeer;}
const sal_Int32& impl_getWidth() { return m_nWidth;}
-
/**_______________________________________________________________________________________________________
- */
-
const sal_Int32& impl_getHeight() { return m_nHeight;}
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer >& xParentPeer
+ virtual css::awt::WindowDescriptor* impl_getWindowDescriptor(
+ const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
);
-
/**_______________________________________________________________________________________________________
- */
-
virtual void impl_paint( sal_Int32 nX ,
sal_Int32 nY ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XGraphics >& xGraphics );
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void impl_recalcLayout( const ::com::sun::star::awt::WindowEvent&
aEvent );
-
-
/**_______________________________________________________________________________________________________
- */
+ const css::uno::Reference< css::awt::XGraphics
>& xGraphics );
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
impl_getDelegator() { return m_xDelegator;}
+ virtual void impl_recalcLayout( const css::awt::WindowEvent& aEvent );
-// private methods
+ css::uno::Reference< css::uno::XInterface > impl_getDelegator() { return
m_xDelegator;}
private:
-
/**_______________________________________________________________________________________________________
- */
-
void impl_releasePeer();
-
/**_______________________________________________________________________________________________________
- */
-
OMRCListenerMultiplexerHelper* impl_getMultiplexer();
-// private variables
-
-private:
-
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext
> m_xComponentContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
m_xDelegator;
- OMRCListenerMultiplexerHelper* m_pMultiplexer; //
multiplex events
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
m_xMultiplexer;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
m_xContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
m_xPeer;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
m_xPeerWindow;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >
m_xGraphicsView; // graphics for
::com::sun::star::awt::XView-operations
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >
m_xGraphicsPeer; // graphics for painting on a peer
+ css::uno::Reference< css::uno::XComponentContext >
m_xComponentContext;
+ css::uno::Reference< css::uno::XInterface > m_xDelegator;
+ OMRCListenerMultiplexerHelper* m_pMultiplexer;
// multiplex events
+ css::uno::Reference< css::uno::XInterface > m_xMultiplexer;
+ css::uno::Reference< css::uno::XInterface > m_xContext;
+ css::uno::Reference< css::awt::XWindowPeer > m_xPeer;
+ css::uno::Reference< css::awt::XWindow > m_xPeerWindow;
+ css::uno::Reference< css::awt::XGraphics > m_xGraphicsView;
// graphics for css::awt::XView-operations
+ css::uno::Reference< css::awt::XGraphics > m_xGraphicsPeer;
// graphics for painting on a peer
sal_Int32 m_nX; // Position ...
sal_Int32 m_nY;
sal_Int32 m_nWidth; // ... and
size of window
diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx
index 3c068ec..b148b9c 100644
--- a/UnoControls/inc/multiplexer.hxx
+++ b/UnoControls/inc/multiplexer.hxx
@@ -53,22 +53,18 @@ namespace unocontrols{
// class
-class OMRCListenerMultiplexerHelper : public
::com::sun::star::awt::XFocusListener
- , public
::com::sun::star::awt::XWindowListener
- , public
::com::sun::star::awt::XKeyListener
- , public
::com::sun::star::awt::XMouseListener
- , public
::com::sun::star::awt::XMouseMotionListener
- , public
::com::sun::star::awt::XPaintListener
- , public
::com::sun::star::awt::XTopWindowListener
+class OMRCListenerMultiplexerHelper : public css::awt::XFocusListener
+ , public css::awt::XWindowListener
+ , public css::awt::XKeyListener
+ , public css::awt::XMouseListener
+ , public css::awt::XMouseMotionListener
+ , public css::awt::XPaintListener
+ , public css::awt::XTopWindowListener
, public ::cppu::OWeakObject
{
-// public methods
-
public:
- // construct/destruct
-
/**_______________________________________________________________________________________________________
@short constructor
@descr Create a Multiplexer of XWindowEvents.
@@ -76,8 +72,8 @@ public:
@param rPeer The peer from which the original events are
dispatched. Null is allowed.
*/
- OMRCListenerMultiplexerHelper( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow >& xControl ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow >& xPeer );
+ OMRCListenerMultiplexerHelper( const css::uno::Reference<
css::awt::XWindow >& xControl ,
+ const css::uno::Reference<
css::awt::XWindow >& xPeer );
/**_______________________________________________________________________________________________________
@short copy-constructor
@@ -87,10 +83,6 @@ public:
OMRCListenerMultiplexerHelper( const OMRCListenerMultiplexerHelper&
aCopyInstance );
-
/**_______________________________________________________________________________________________________
- @short destructor
- */
-
virtual ~OMRCListenerMultiplexerHelper();
// XInterface
@@ -108,8 +100,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
)
+ throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -129,15 +121,7 @@ public:
virtual void SAL_CALL release() throw() override;
- // operator
-
-
/**_______________________________________________________________________________________________________
- */
-
- operator ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >() const { return
(static_cast<OWeakObject*>(const_cast<OMRCListenerMultiplexerHelper *>(this)));}
-
-
/**_______________________________________________________________________________________________________
- */
+ operator css::uno::Reference< css::uno::XInterface >() const { return
(static_cast<OWeakObject*>(const_cast<OMRCListenerMultiplexerHelper *>(this)));}
OMRCListenerMultiplexerHelper& operator= ( const
OMRCListenerMultiplexerHelper& aCopyInstance );
@@ -148,7 +132,7 @@ public:
@param rPeer The peer from which the original events are
dispatched. Null is allowed.
*/
- void setPeer( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow >& xPeer );
+ void setPeer( const css::uno::Reference< css::awt::XWindow >& xPeer );
/**_______________________________________________________________________________________________________
@short Remove all listeners and send a disposing message.
@@ -160,169 +144,100 @@ public:
@short Add the specified listener to the source.
*/
- void advise( const ::com::sun::star::uno::Type&
aType ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener );
+ void advise( const css::uno::Type& aType
,
+ const css::uno::Reference< css::uno::XInterface >&
xListener );
/**_______________________________________________________________________________________________________
@short Remove the specified listener from the source.
*/
- void unadvise( const ::com::sun::star::uno::Type&
aType ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener );
+ void unadvise( const css::uno::Type& aType
,
+ const css::uno::Reference< css::uno::XInterface >&
xListener );
// XEventListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject&
aSource)
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aSource)
+ throw( css::uno::RuntimeException, std::exception ) override;
// XFocusListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent&
aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL focusGained(const css::awt::FocusEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent&
aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL focusLost(const css::awt::FocusEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XWindowListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowResized(const
::com::sun::star::awt::WindowEvent& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowMoved(const
::com::sun::star::awt::WindowEvent& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowShown(const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL windowMoved(const css::awt::WindowEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL windowShown(const css::lang::EventObject& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowHidden(const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL windowHidden(const css::lang::EventObject& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XKeyListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent&
aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent&
aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XMouseListener
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL mousePressed(const
::com::sun::star::awt::MouseEvent& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL mouseReleased(const
::com::sun::star::awt::MouseEvent& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL mouseEntered(const
::com::sun::star::awt::MouseEvent& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent&
aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XMouseMotionListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL mouseDragged(const
::com::sun::star::awt::MouseEvent& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL mouseDragged(const css::awt::MouseEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent&
aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL mouseMoved(const css::awt::MouseEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XPaintListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent&
aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL windowPaint(const css::awt::PaintEvent& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XTopWindowListener
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowOpened( const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowClosing( const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowClosed( const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL windowOpened( const css::lang::EventObject& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL windowMinimized( const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowNormalized( const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL windowClosed( const css::lang::EventObject& aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL windowMinimized( const css::lang::EventObject&
aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowActivated( const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL windowNormalized( const css::lang::EventObject&
aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL windowActivated( const css::lang::EventObject&
aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL windowDeactivated( const
::com::sun::star::lang::EventObject& aEvent )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual void SAL_CALL windowDeactivated( const css::lang::EventObject&
aEvent )
+ throw( css::uno::RuntimeException, std::exception ) override;
// protected methods
@@ -334,8 +249,8 @@ protected:
@param rType The listener type, which specify the type of the
listener.
*/
- void impl_adviseToPeer( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow >& xPeer ,
- const ::com::sun::star::uno::Type&
aType );
+ void impl_adviseToPeer( const css::uno::Reference< css::awt::XWindow >&
xPeer ,
+ const css::uno::Type&
aType );
/**_______________________________________________________________________________________________________
@short Add the listener to the peer.
@@ -343,16 +258,16 @@ protected:
@param rType The listener type, which specify the type of the
listener.
*/
- void impl_unadviseFromPeer( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow >& xPeer ,
- const ::com::sun::star::uno::Type&
aType );
+ void impl_unadviseFromPeer( const css::uno::Reference< css::awt::XWindow
>& xPeer ,
+ const css::uno::Type&
aType );
// private variables
private:
::osl::Mutex m_aMutex;
- ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >
m_xPeer; /// The source of the events. Normally this is the peer object.
- ::com::sun::star::uno::WeakReference< ::com::sun::star::awt::XWindow >
m_xControl;
+ css::uno::Reference< css::awt::XWindow > m_xPeer; /// The source of
the events. Normally this is the peer object.
+ css::uno::WeakReference< css::awt::XWindow > m_xControl;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerHolder;
}; // class OMRCListenerMultiplexerHelper
diff --git a/UnoControls/source/base/basecontrol.cxx
b/UnoControls/source/base/basecontrol.cxx
index 79c5fd6..d4ce153 100644
--- a/UnoControls/source/base/basecontrol.cxx
+++ b/UnoControls/source/base/basecontrol.cxx
@@ -718,7 +718,7 @@ const OUString
BaseControl::impl_getStaticImplementationName()
WindowDescriptor* BaseControl::impl_getWindowDescriptor( const Reference<
XWindowPeer >& xParentPeer )
{
- // - used from "createPeer()" to set the values of an
::com::sun::star::awt::WindowDescriptor !!!
+ // - used from "createPeer()" to set the values of an
css::awt::WindowDescriptor !!!
// - if you will change the descriptor-values, you must override this
virtuell function
// - the caller must release the memory for this dynamical descriptor !!!
diff --git a/UnoControls/source/controls/framecontrol.cxx
b/UnoControls/source/controls/framecontrol.cxx
index a1b5633..6375136 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -312,7 +312,7 @@ sal_Bool FrameControl::convertFastPropertyValue(
Any& rConvertedVa
void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32
nHandle ,
const Any&
rValue )
- throw (
::com::sun::star::uno::Exception, std::exception )
+ throw (
css::uno::Exception, std::exception )
{
// this method only set the value
MutexGuard aGuard (m_aMutex);
diff --git a/UnoControls/source/controls/statusindicator.cxx
b/UnoControls/source/controls/statusindicator.cxx
index 571d5ed..75b5c87 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -373,7 +373,7 @@ const OUString
StatusIndicator::impl_getStaticImplementationName()
WindowDescriptor* StatusIndicator::impl_getWindowDescriptor( const
css::uno::Reference< XWindowPeer >& xParentPeer )
{
- // - used from "createPeer()" to set the values of an
::com::sun::star::awt::WindowDescriptor !!!
+ // - used from "createPeer()" to set the values of an
css::awt::WindowDescriptor !!!
// - if you will change the descriptor-values, you must override this
virtuell function
// - the caller must release the memory for this dynamical descriptor !!!
diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
index 5ea65d9..698c510 100644
--- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx
@@ -31,44 +31,14 @@ namespace unocontrols{
// class declaration OConnectionPointContainerHelper
-class OConnectionPointContainerHelper : public
::com::sun::star::lang::XConnectionPointContainer
+class OConnectionPointContainerHelper : public
css::lang::XConnectionPointContainer
, public ::cppu::OWeakObject
{
-// public methods
-
public:
- // construct/destruct
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
OConnectionPointContainerHelper( ::osl::Mutex& aMutex );
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
virtual ~OConnectionPointContainerHelper();
// XInterface
@@ -86,8 +56,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
)
+ throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -109,74 +79,22 @@ public:
// XConnectionPointContainer
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getConnectionPointTypes()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getConnectionPointTypes()
+ throw( css::uno::RuntimeException, std::exception ) override;
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
- const ::com::sun::star::uno::Type& aType
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL
queryConnectionPoint(
+ const css::uno::Type& aType
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL advise(
- const ::com::sun::star::uno::Type&
aType ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ const css::uno::Type& aType ,
+ const css::uno::Reference< css::uno::XInterface >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL unadvise(
- const ::com::sun::star::uno::Type&
aType ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Type& aType ,
+ const css::uno::Reference< css::uno::XInterface >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// public but impl method!
// Is necessary to get container member at OConnectionPoint-instance.
@@ -185,8 +103,6 @@ public:
::cppu::OMultiTypeInterfaceContainerHelper& impl_getMultiTypeContainer() {
return m_aMultiTypeContainer; }
-// private variables
-
private:
::osl::Mutex& m_aSharedMutex;
diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx
b/UnoControls/source/inc/OConnectionPointHelper.hxx
index 2aead81..f686ef8 100644
--- a/UnoControls/source/inc/OConnectionPointHelper.hxx
+++ b/UnoControls/source/inc/OConnectionPointHelper.hxx
@@ -34,45 +34,15 @@ namespace unocontrols{
// class declaration OConnectionPointHelper
-class OConnectionPointHelper : public
::com::sun::star::lang::XConnectionPoint
+class OConnectionPointHelper : public css::lang::XConnectionPoint
, public ::cppu::OWeakObject
{
-// public methods
-
public:
- // construct/destruct
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
OConnectionPointHelper( ::osl::Mutex& aMutex
,
OConnectionPointContainerHelper*
pContainerImplementation ,
- ::com::sun::star::uno::Type
aType );
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ css::uno::Type aType
);
virtual ~OConnectionPointHelper();
@@ -91,8 +61,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
)
+ throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -114,135 +84,40 @@ public:
// XConnectionPoint
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual ::com::sun::star::uno::Type SAL_CALL getConnectionType()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::lang::XConnectionPointContainer > SAL_CALL
getConnectionPointContainer()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
+ virtual css::uno::Type SAL_CALL getConnectionType()
+ throw( css::uno::RuntimeException, std::exception ) override;
- @param
-
- @return
-
- @onerror
- */
+ virtual css::uno::Reference< css::lang::XConnectionPointContainer >
SAL_CALL getConnectionPointContainer()
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL advise(
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener
+ const css::uno::Reference< css::uno::XInterface >& xListener
) throw (
- ::com::sun::star::lang::ListenerExistException,
- ::com::sun::star::lang::InvalidListenerException ,
- ::com::sun::star::uno::RuntimeException, std::exception
+ css::lang::ListenerExistException,
+ css::lang::InvalidListenerException ,
+ css::uno::RuntimeException, std::exception
) override;
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ virtual void SAL_CALL unadvise( const css::uno::Reference<
css::uno::XInterface >& xListener )
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > > SAL_CALL getConnections()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-// private methods
+ virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >
SAL_CALL getConnections()
+ throw( css::uno::RuntimeException, std::exception ) override;
private:
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
bool impl_LockContainer();
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
void impl_UnlockContainer();
-// private variables
-
private:
- ::osl::Mutex&
m_aSharedMutex;
- ::com::sun::star::uno::WeakReference<
::com::sun::star::lang::XConnectionPointContainer >
m_oContainerWeakReference; // Reference to container-class!. Don't use
Reference<...>
+ ::osl::Mutex&
m_aSharedMutex;
+ css::uno::WeakReference< css::lang::XConnectionPointContainer >
m_oContainerWeakReference; // Reference to container-class!. Don't use
Reference<...>
// It is a ring-reference => and must be a wekreference!
- OConnectionPointContainerHelper*
m_pContainerImplementation;
- ::com::sun::star::uno::Type
m_aInterfaceType;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
m_xLock;
+ OConnectionPointContainerHelper*
m_pContainerImplementation;
+ css::uno::Type
m_aInterfaceType;
+ css::uno::Reference< css::uno::XInterface > m_xLock;
}; // class OConnectionPointHelper
diff --git a/UnoControls/source/inc/framecontrol.hxx
b/UnoControls/source/inc/framecontrol.hxx
index 7ae1880..e17fea7 100644
--- a/UnoControls/source/inc/framecontrol.hxx
+++ b/UnoControls/source/inc/framecontrol.hxx
@@ -49,8 +49,8 @@ namespace unocontrols{
// class
-class FrameControl : public ::com::sun::star::awt::XControlModel
- , public ::com::sun::star::lang::XConnectionPointContainer
+class FrameControl : public css::awt::XControlModel
+ , public css::lang::XConnectionPointContainer
, public BaseControl //
This order is necessary for right initialization of m_aMutex!
, public ::cppu::OBroadcastHelper
, public ::cppu::OPropertySetHelper
@@ -62,15 +62,15 @@ public:
// construct/destruct
- FrameControl( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
+ FrameControl( const css::uno::Reference< css::uno::XComponentContext >&
rxContext );
virtual ~FrameControl();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
- const ::com::sun::star::uno::Type& aType
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface(
+ const css::uno::Type& aType
+ ) throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -92,14 +92,14 @@ public:
// XTypeProvider
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getTypes()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XAggregation
- ::com::sun::star::uno::Any SAL_CALL queryAggregation(
- const ::com::sun::star::uno::Type& aType
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ css::uno::Any SAL_CALL queryAggregation(
+ const css::uno::Type& aType
+ ) throw( css::uno::RuntimeException, std::exception ) override;
OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException, std::exception) override;
@@ -110,52 +110,52 @@ public:
// XControl
virtual void SAL_CALL createPeer(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XToolkit >& xToolkit ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer >& xParent
- ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::awt::XToolkit >& xToolkit ,
+ const css::uno::Reference< css::awt::XWindowPeer >& xParent
+ ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual sal_Bool SAL_CALL setModel(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel >& xModel
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::awt::XControlModel >& xModel
+ ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel > SAL_CALL getModel()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XComponent
- virtual void SAL_CALL dispose() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL dispose() throw( css::uno::RuntimeException,
std::exception ) override;
// XView
virtual sal_Bool SAL_CALL setGraphics(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XGraphics >& xDevice
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Reference< css::awt::XGraphics >& xDevice
+ ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics
> SAL_CALL getGraphics()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XConnectionPointContainer
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getConnectionPointTypes()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL
getConnectionPointTypes()
+ throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::lang::XConnectionPoint > SAL_CALL queryConnectionPoint(
- const ::com::sun::star::uno::Type& aType
- ) throw ( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL
queryConnectionPoint(
+ const css::uno::Type& aType
+ ) throw ( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL advise(
- const ::com::sun::star::uno::Type&
aType ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Type& aType ,
+ const css::uno::Reference< css::uno::XInterface >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL unadvise(
- const ::com::sun::star::uno::Type&
aType ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xListener
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ const css::uno::Type& aType ,
+ const css::uno::Reference< css::uno::XInterface >& xListener
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// impl but public methods to register service!
- static const ::com::sun::star::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
+ static const css::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
static const OUString impl_getStaticImplementationName();
@@ -167,54 +167,54 @@ protected:
// OPropertySetHelper
virtual sal_Bool SAL_CALL convertFastPropertyValue(
- ::com::sun::star::uno::Any& rConvertedValue ,
- ::com::sun::star::uno::Any& rOldValue ,
+ css::uno::Any& rConvertedValue ,
+ css::uno::Any& rOldValue ,
sal_Int32 nHandle ,
- const ::com::sun::star::uno::Any& rValue
- ) throw( ::com::sun::star::lang::IllegalArgumentException ) override;
+ const css::uno::Any& rValue
+ ) throw( css::lang::IllegalArgumentException ) override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle ,
- const ::com::sun::star::uno::Any& rValue
- ) throw ( ::com::sun::star::uno::Exception, std::exception ) override;
+ const css::uno::Any& rValue
+ ) throw ( css::uno::Exception, std::exception ) override;
- virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any&
rValue ,
+ virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue ,
sal_Int32 nHandle )
const override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
// XPropertySet
- ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
+ throw( css::uno::RuntimeException, std::exception ) override;
// BaseControl
- virtual ::com::sun::star::awt::WindowDescriptor* impl_getWindowDescriptor(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer >& xParentPeer
+ virtual css::awt::WindowDescriptor* impl_getWindowDescriptor(
+ const css::uno::Reference< css::awt::XWindowPeer >& xParentPeer
) override;
// private methods
private:
- void impl_createFrame( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer >& xPeer ,
+ void impl_createFrame( const css::uno::Reference< css::awt::XWindowPeer
>& xPeer ,
const OUString&
sURL ,
- const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& seqArguments );
+ const css::uno::Sequence<
css::beans::PropertyValue >& seqArguments );
void impl_deleteFrame();
- static const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
+ static const css::uno::Sequence< css::beans::Property >
impl_getStaticPropertyDescriptor();
// private variables
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame2 >
m_xFrame;
- OUString
m_sComponentURL;
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
m_seqLoaderArguments;
- ::cppu::OMultiTypeInterfaceContainerHelper
m_aInterfaceContainer;
- css::uno::Reference<OConnectionPointContainerHelper>
m_aConnectionPointContainer;
+ css::uno::Reference< css::frame::XFrame2 > m_xFrame;
+ OUString m_sComponentURL;
+ css::uno::Sequence< css::beans::PropertyValue >
m_seqLoaderArguments;
+ ::cppu::OMultiTypeInterfaceContainerHelper
m_aInterfaceContainer;
+ css::uno::Reference<OConnectionPointContainerHelper>
m_aConnectionPointContainer;
}; // class FrameControl
diff --git a/UnoControls/source/inc/progressbar.hxx
b/UnoControls/source/inc/progressbar.hxx
index 8beee8c..5e20463 100644
--- a/UnoControls/source/inc/progressbar.hxx
+++ b/UnoControls/source/inc/progressbar.hxx
@@ -43,64 +43,21 @@ namespace unocontrols{
#define PROGRESSBAR_LINECOLOR_BRIGHT TRGB_COLORDATA( 0x00, 0xFF, 0xFF,
0xFF ) // white
#define PROGRESSBAR_LINECOLOR_SHADOW TRGB_COLORDATA( 0x00, 0x00, 0x00,
0x00 ) // black
-class ProgressBar : public ::com::sun::star::awt::XControlModel
- , public ::com::sun::star::awt::XProgressBar
+class ProgressBar : public css::awt::XControlModel
+ , public css::awt::XProgressBar
, public BaseControl
{
-// public methods
-
public:
- // construct/destruct
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- ProgressBar( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ ProgressBar( const css::uno::Reference< css::uno::XComponentContext >&
rxContext );
virtual ~ProgressBar();
// XInterface
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
)
+ throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -122,256 +79,70 @@ public:
// XTypeProvider
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getTypes()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception ) override;
// XAggregation
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- ::com::sun::star::uno::Any SAL_CALL queryAggregation( const
::com::sun::star::uno::Type& aType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XProgressBar
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
virtual void SAL_CALL setForegroundColor( sal_Int32 nColor )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
+ throw( css::uno::RuntimeException, std::exception ) override;
- @param
-
- @return
-
- @onerror
- */
+ virtual void SAL_CALL setValue( sal_Int32 nValue ) throw(
css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL setRange(
sal_Int32 nMin ,
sal_Int32 nMax
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
+ ) throw( css::uno::RuntimeException, std::exception ) override;
- @onerror
- */
-
- virtual sal_Int32 SAL_CALL getValue() throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException,
std::exception ) override;
// XWindow
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
virtual void SAL_CALL setPosSize(
sal_Int32 nX ,
sal_Int32 nY ,
sal_Int32 nWidth ,
sal_Int32 nHeight ,
sal_Int16 nFlags
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XControl
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
virtual sal_Bool SAL_CALL setModel(
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel >& xModel
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ const css::uno::Reference< css::awt::XControlModel >& xModel
+ ) throw( css::uno::RuntimeException, std::exception ) override;
- virtual ::com::sun::star::uno::Reference<
::com::sun::star::awt::XControlModel > SAL_CALL getModel()
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel()
+ throw( css::uno::RuntimeException, std::exception ) override;
// BaseControl
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- static const ::com::sun::star::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
-
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ static const css::uno::Sequence< OUString >
impl_getStaticSupportedServiceNames();
static const OUString impl_getStaticImplementationName();
-// protected methods
-
protected:
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
virtual void impl_paint(
sal_Int32 nX ,
sal_Int32 nY ,
- const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XGraphics >& xGraphics
+ const css::uno::Reference< css::awt::XGraphics >& xGraphics
) override;
-
/**_________________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
void impl_recalcRange();
-// private variables
-
private:
- bool m_bHorizontal; // orientation for steps
[true=horizontal/false=vertikal]
- ::com::sun::star::awt::Size m_aBlockSize; // width and height of a
block [>=0,0]
+ bool m_bHorizontal; // orientation for steps
[true=horizontal/false=vertikal]
+ css::awt::Size m_aBlockSize; // width and height of a block [>=0,0]
sal_Int32 m_nForegroundColor; //
(alpha,r,g,b)
sal_Int32 m_nBackgroundColor; //
(alpha,r,g,b)
sal_Int32 m_nMinRange; // lowest value = 0% [long,
<_nMaxRange]
diff --git a/UnoControls/source/inc/progressmonitor.hxx
b/UnoControls/source/inc/progressmonitor.hxx
index 6f21b71..2879b92 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -94,45 +94,15 @@ struct IMPL_TextlistItem
// class declaration
-class ProgressMonitor : public ::com::sun::star::awt::XLayoutConstrains
- , public ::com::sun::star::awt::XButton
- , public ::com::sun::star::awt::XProgressMonitor
+class ProgressMonitor : public css::awt::XLayoutConstrains
+ , public css::awt::XButton
+ , public css::awt::XProgressMonitor
, public BaseContainerControl
{
-// public methods
-
public:
- // construct/destruct
-
-
/**_______________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
-
- ProgressMonitor( const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& rxContext );
-
-
/**_______________________________________________________________________________________________________
- @short
- @descr
-
- @seealso
-
- @param
-
- @return
-
- @onerror
- */
+ ProgressMonitor( const css::uno::Reference< css::uno::XComponentContext >&
rxContext );
virtual ~ProgressMonitor();
@@ -151,8 +121,8 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type& aType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType
)
+ throw( css::uno::RuntimeException, std::exception ) override;
/**_______________________________________________________________________________________________________
@short increment refcount
@@ -182,15 +152,12 @@ public:
@onerror A RuntimeException is thrown.
*/
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
SAL_CALL getTypes() throw( ::com::sun::star::uno::RuntimeException,
std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw(
css::uno::RuntimeException, std::exception ) override;
// XAggregation
-
/**_______________________________________________________________________________________________________
- */
-
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const
::com::sun::star::uno::Type& aType )
- throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type&
aType )
+ throw( css::uno::RuntimeException, std::exception ) override;
// XProgressMonitor
@@ -215,209 +182,125 @@ public:
const OUString& sTopic ,
const OUString& sText ,
sal_Bool bbeforeProgress
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL removeText(
const OUString& sTopic ,
sal_Bool bbeforeProgress
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
-
-
/**_______________________________________________________________________________________________________
- */
+ ) throw( css::uno::RuntimeException, std::exception ) override;
virtual void SAL_CALL updateText(
const OUString& sTopic ,
const OUString& sText ,
sal_Bool bbeforeProgress
- ) throw( ::com::sun::star::uno::RuntimeException, std::exception )
override;
+ ) throw( css::uno::RuntimeException, std::exception ) override;
// XProgressBar
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw(
css::uno::RuntimeException, std::exception ) override;
-
/**_______________________________________________________________________________________________________
- */
+ virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(
css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
-
- virtual void SAL_CALL setValue( sal_Int32 nValue ) throw(
::com::sun::star::uno::RuntimeException, std::exception ) override;
-
-
/**_______________________________________________________________________________________________________
- */
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
