Skip to content

C
core
Kaydet (Commit) c504477e authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

com::sun::star->css in UnoControls/ 

and remove some noise comments

Change-Id: I290ec365b58fa1b21838a6faf84006434c3e7bbd
Reviewed-on: https://gerrit.libreoffice.org/19904Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 44daaebf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 499 deletions
UnoControls/inc/basecontrol.hxx
Dosyayı görüntüle @ c504477e
This diff is collapsed.
UnoControls/inc/multiplexer.hxx
Dosyayı görüntüle @ c504477e
This diff is collapsed.
UnoControls/source/base/basecontrol.cxx
Dosyayı görüntüle @ c504477e
......@@ -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 !!!
......
UnoControls/source/controls/framecontrol.cxx
Dosyayı görüntüle @ c504477e
......@@ -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);
......
UnoControls/source/controls/statusindicator.cxx
Dosyayı görüntüle @ c504477e
......@@ -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 !!!
......
UnoControls/source/inc/OConnectionPointContainerHelper.hxx
Dosyayı görüntüle @ c504477e
......@@ -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;
......
UnoControls/source/inc/OConnectionPointHelper.hxx
Dosyayı görüntüle @ c504477e
......@@ -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
......
UnoControls/source/inc/progressbar.hxx
Dosyayı görüntüle @ c504477e
......@@ -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]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment