Skip to content

C
core
Kaydet (Commit) 8b035102 authored tarafından Thomas Arnhold's avatar Thomas Arnhold
Dosyalara gözat
Seçenekler

expand and remove CSS* macro

üst 0c128345
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 111 deletions
UnoControls/inc/basecontrol.hxx
Dosyayı görüntüle @ 8b035102
This diff is collapsed.
UnoControls/inc/multiplexer.hxx
Dosyayı görüntüle @ 8b035102
This diff is collapsed.
UnoControls/source/inc/OConnectionPointContainerHelper.hxx
Dosyayı görüntüle @ 8b035102
......@@ -48,9 +48,6 @@
namespace unocontrols{
#define CSS_UNO ::com::sun::star::uno
#define CSS_LANG ::com::sun::star::lang
//______________________________________________________________________________________________________________
// defines
//______________________________________________________________________________________________________________
......@@ -59,7 +56,7 @@ namespace unocontrols{
// class declaration OConnectionPointContainerHelper
//______________________________________________________________________________________________________________
class OConnectionPointContainerHelper : public CSS_LANG::XConnectionPointContainer
class OConnectionPointContainerHelper : public ::com::sun::star::lang::XConnectionPointContainer
, public ::cppu::OWeakObject
{
......@@ -120,8 +117,8 @@ public:
@onerror A RuntimeException is thrown.
*/
virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
......@@ -172,8 +169,8 @@ public:
@onerror
*/
virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getConnectionPointTypes()
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getConnectionPointTypes()
throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -188,9 +185,9 @@ public:
@onerror
*/
virtual CSS_UNO::Reference< CSS_LANG::XConnectionPoint > SAL_CALL queryConnectionPoint(
const CSS_UNO::Type& aType
) throw( CSS_UNO::RuntimeException );
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 );
/**_________________________________________________________________________________________________________
@short
......@@ -206,9 +203,9 @@ public:
*/
virtual void SAL_CALL advise(
const CSS_UNO::Type& aType ,
const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
) throw( CSS_UNO::RuntimeException );
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 );
/**_________________________________________________________________________________________________________
@short
......@@ -224,9 +221,9 @@ public:
*/
virtual void SAL_CALL unadvise(
const CSS_UNO::Type& aType ,
const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
) throw( CSS_UNO::RuntimeException );
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 );
/**_________________________________________________________________________________________________________
@short
......@@ -254,10 +251,6 @@ private:
}; // class OConnectionPointContainerHelper
// The namespace aliases are only used in this header
#undef CSS_UNO
#undef CSS_LANG
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTCONTAINERHELPER_HXX
......
UnoControls/source/inc/OConnectionPointHelper.hxx
Dosyayı görüntüle @ 8b035102
......@@ -49,9 +49,6 @@
namespace unocontrols{
#define CSS_UNO ::com::sun::star::uno
#define CSS_LANG ::com::sun::star::lang
//______________________________________________________________________________________________________________
// defines
//______________________________________________________________________________________________________________
......@@ -60,7 +57,7 @@ namespace unocontrols{
// class declaration OConnectionPointHelper
//______________________________________________________________________________________________________________
class OConnectionPointHelper : public CSS_LANG::XConnectionPoint
class OConnectionPointHelper : public ::com::sun::star::lang::XConnectionPoint
, public ::cppu::OWeakObject
{
......@@ -89,7 +86,7 @@ public:
OConnectionPointHelper( ::osl::Mutex& aMutex ,
OConnectionPointContainerHelper* pContainerImplementation ,
CSS_UNO::Type aType );
::com::sun::star::uno::Type aType );
/**_________________________________________________________________________________________________________
@short
......@@ -123,8 +120,8 @@ public:
@onerror A RuntimeException is thrown.
*/
virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
......@@ -175,8 +172,8 @@ public:
@onerror
*/
virtual CSS_UNO::Type SAL_CALL getConnectionType()
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Type SAL_CALL getConnectionType()
throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -191,8 +188,8 @@ public:
@onerror
*/
virtual CSS_UNO::Reference< CSS_LANG::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer()
throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -208,11 +205,11 @@ public:
*/
virtual void SAL_CALL advise(
const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener
) throw (
CSS_LANG::ListenerExistException,
CSS_LANG::InvalidListenerException ,
CSS_UNO::RuntimeException
::com::sun::star::lang::ListenerExistException,
::com::sun::star::lang::InvalidListenerException ,
::com::sun::star::uno::RuntimeException
);
/**_________________________________________________________________________________________________________
......@@ -228,8 +225,8 @@ public:
@onerror
*/
virtual void SAL_CALL unadvise( const CSS_UNO::Reference< CSS_UNO::XInterface >& xListener )
throw( CSS_UNO::RuntimeException );
virtual void SAL_CALL unadvise( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xListener )
throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -244,8 +241,8 @@ public:
@onerror
*/
virtual CSS_UNO::Sequence< CSS_UNO::Reference< CSS_UNO::XInterface > > SAL_CALL getConnections()
throw( CSS_UNO::RuntimeException );
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 );
//______________________________________________________________________________________________________________
// private methods
......@@ -290,18 +287,14 @@ private:
private:
::osl::Mutex& m_aSharedMutex ;
CSS_UNO::WeakReference< CSS_LANG::XConnectionPointContainer > m_oContainerWeakReference ; // Reference to container-class!. Don't use Reference<...>
::com::sun::star::uno::WeakReference< ::com::sun::star::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 ;
CSS_UNO::Type m_aInterfaceType ;
CSS_UNO::Reference< CSS_UNO::XInterface > m_xLock ;
::com::sun::star::uno::Type m_aInterfaceType ;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xLock ;
}; // class OConnectionPointHelper
// The namespace aliases are only used in this header
#undef CSS_UNO
#undef CSS_LANG
} // namespace unocontrols
#endif // #ifndef _OCONNECTIONPOINTHELPER_HXX
......
UnoControls/source/inc/progressbar.hxx
Dosyayı görüntüle @ 8b035102
......@@ -47,10 +47,6 @@
namespace unocontrols{
#define CSS_UNO ::com::sun::star::uno
#define CSS_LANG ::com::sun::star::lang
#define CSS_AWT ::com::sun::star::awt
//____________________________________________________________________________________________________________
// defines
//____________________________________________________________________________________________________________
......@@ -73,8 +69,8 @@ namespace unocontrols{
// classes
//____________________________________________________________________________________________________________
class ProgressBar : public CSS_AWT::XControlModel
, public CSS_AWT::XProgressBar
class ProgressBar : public ::com::sun::star::awt::XControlModel
, public ::com::sun::star::awt::XProgressBar
, public BaseControl
{
......@@ -101,7 +97,7 @@ public:
@onerror
*/
ProgressBar( const CSS_UNO::Reference< CSS_LANG::XMultiServiceFactory >& xFactory );
ProgressBar( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
/**_________________________________________________________________________________________________________
@short
......@@ -135,8 +131,8 @@ public:
@onerror
*/
virtual CSS_UNO::Any SAL_CALL queryInterface( const CSS_UNO::Type& aType )
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
throw( ::com::sun::star::uno::RuntimeException );
/**_______________________________________________________________________________________________________
@short increment refcount
......@@ -187,8 +183,8 @@ public:
@onerror
*/
virtual CSS_UNO::Sequence< CSS_UNO::Type > SAL_CALL getTypes()
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes()
throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XAggregation
......@@ -207,8 +203,8 @@ public:
@onerror
*/
CSS_UNO::Any SAL_CALL queryAggregation( const CSS_UNO::Type& aType )
throw( CSS_UNO::RuntimeException );
::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType )
throw( ::com::sun::star::uno::RuntimeException );
//________________________________________________________________________________________________________
// XProgressBar
......@@ -228,7 +224,7 @@ public:
*/
virtual void SAL_CALL setForegroundColor( sal_Int32 nColor )
throw( CSS_UNO::RuntimeException );
throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -244,7 +240,7 @@ public:
*/
virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor )
throw( CSS_UNO::RuntimeException );
throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -259,7 +255,7 @@ public:
@onerror
*/
virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( CSS_UNO::RuntimeException );
virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -277,7 +273,7 @@ public:
virtual void SAL_CALL setRange(
sal_Int32 nMin ,
sal_Int32 nMax
) throw( CSS_UNO::RuntimeException );
) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -292,7 +288,7 @@ public:
@onerror
*/
virtual sal_Int32 SAL_CALL getValue() throw( CSS_UNO::RuntimeException );
virtual sal_Int32 SAL_CALL getValue() throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XWindow
......@@ -317,7 +313,7 @@ public:
sal_Int32 nWidth ,
sal_Int32 nHeight ,
sal_Int16 nFlags
) throw( CSS_UNO::RuntimeException );
) throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// XControl
......@@ -337,8 +333,8 @@ public:
*/
virtual sal_Bool SAL_CALL setModel(
const CSS_UNO::Reference< CSS_AWT::XControlModel >& xModel
) throw( CSS_UNO::RuntimeException );
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xModel
) throw( ::com::sun::star::uno::RuntimeException );
/**_________________________________________________________________________________________________________
@short
......@@ -353,8 +349,8 @@ public:
@onerror
*/
virtual CSS_UNO::Reference< CSS_AWT::XControlModel > SAL_CALL getModel()
throw( CSS_UNO::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel()
throw( ::com::sun::star::uno::RuntimeException );
//__________________________________________________________________________________________________________
// BaseControl
......@@ -373,7 +369,7 @@ public:
@onerror
*/
static const CSS_UNO::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
static const ::com::sun::star::uno::Sequence< ::rtl::OUString > impl_getStaticSupportedServiceNames();
/**_________________________________________________________________________________________________________
@short
......@@ -412,7 +408,7 @@ protected:
virtual void impl_paint(
sal_Int32 nX ,
sal_Int32 nY ,
const CSS_UNO::Reference< CSS_AWT::XGraphics >& xGraphics
const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics
);
/**_________________________________________________________________________________________________________
......@@ -437,7 +433,7 @@ protected:
private:
sal_Bool m_bHorizontal ; // orientation for steps [true=horizontal/false=vertikal]
CSS_AWT::Size m_aBlockSize ; // width and height of a block [>=0,0]
::com::sun::star::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]
......@@ -447,11 +443,6 @@ private:
}; // class ProgressBar
// The namespace aliases are only used in the header
#undef CSS_UNO
#undef CSS_LANG
#undef CSS_AWT
} // namespace unocontrols
#endif // #ifndef _UNOCONTROLS_PROGRESSBAR_CTRL_HXX
......
scaddins/source/analysis/analysis.cxx
Dosyayı görüntüle @ 8b035102
......@@ -467,7 +467,7 @@ static const sal_uInt32 nNumOfLoc = SAL_N_ELEMENTS(pLang);
void AnalysisAddIn::InitDefLocales( void )
{
pDefLocales = new CSS::lang::Locale[ nNumOfLoc ];
pDefLocales = new ::com::sun::star::lang::Locale[ nNumOfLoc ];
for( sal_uInt32 n = 0 ; n < nNumOfLoc ; n++ )
{
......@@ -477,7 +477,7 @@ void AnalysisAddIn::InitDefLocales( void )
}
inline const CSS::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
inline const ::com::sun::star::lang::Locale& AnalysisAddIn::GetLocale( sal_uInt32 nInd )
{
if( !pDefLocales )
InitDefLocales();
......@@ -501,11 +501,11 @@ SEQofLocName SAL_CALL AnalysisAddIn::getCompatibilityNames( const STRING& aProgr
SEQofLocName aRet( nCount );
CSS::sheet::LocalizedName* pArray = aRet.getArray();
::com::sun::star::sheet::LocalizedName* pArray = aRet.getArray();
for( sal_uInt32 n = 0 ; n < nCount ; n++ )
{
pArray[ n ] = CSS::sheet::LocalizedName( GetLocale( n ), *r.Get( n ) );
pArray[ n ] = ::com::sun::star::sheet::LocalizedName( GetLocale( n ), *r.Get( n ) );
}
return aRet;
......@@ -1184,7 +1184,7 @@ STRING SAL_CALL AnalysisAddIn::getImsub( const STRING& aNum1, const STRING& aNum
}
STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( CSS::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE
STRING SAL_CALL AnalysisAddIn::getImsum( constREFXPS&, const SEQSEQ( STRING )& aNum1, const SEQ( ::com::sun::star::uno::Any )& aFollowingPars ) THROWDEF_RTE_IAE
{
ComplexList z_list;
......
scaddins/source/analysis/analysis.hxx
Dosyayı görüntüle @ 8b035102
......@@ -51,19 +51,19 @@ class ConvertDataList;
class ResMgr;
REF( CSS::uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance( const REF( CSS::lang::XMultiServiceFactory )& );
REF( ::com::sun::star::uno::XInterface ) SAL_CALL AnalysisAddIn_CreateInstance( const REF( ::com::sun::star::lang::XMultiServiceFactory )& );
class AnalysisAddIn : public cppu::WeakImplHelper5<
CSS::sheet::XAddIn,
CSS::sheet::XCompatibilityNames,
CSS::sheet::addin::XAnalysis,
CSS::lang::XServiceName,
CSS::lang::XServiceInfo >
::com::sun::star::sheet::XAddIn,
::com::sun::star::sheet::XCompatibilityNames,
::com::sun::star::sheet::addin::XAnalysis,
::com::sun::star::lang::XServiceName,
::com::sun::star::lang::XServiceInfo >
{
private:
CSS::lang::Locale aFuncLoc;
CSS::lang::Locale* pDefLocales;
::com::sun::star::lang::Locale aFuncLoc;
::com::sun::star::lang::Locale* pDefLocales;
FuncDataList* pFD;
double* pFactDoubles;
ConvertDataList* pCDL;
......@@ -75,18 +75,18 @@ private:
STRING GetDisplFuncStr( sal_uInt16 nFuncNum ) THROWDEF_RTE;
STRING GetFuncDescrStr( sal_uInt16 nResId, sal_uInt16 nStrIndex ) THROWDEF_RTE;
void InitDefLocales( void );
inline const CSS::lang::Locale& GetLocale( sal_uInt32 nInd );
inline const ::com::sun::star::lang::Locale& GetLocale( sal_uInt32 nInd );
void InitData( void );
/// Converts an Any to sal_Int32 in the range from 0 to 4 (date calculation mode).
sal_Int32 getDateMode(
const CSS::uno::Reference< CSS::beans::XPropertySet >& xPropSet,
const CSS::uno::Any& rAny )
throw( CSS::uno::RuntimeException, CSS::lang::IllegalArgumentException );
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xPropSet,
const ::com::sun::star::uno::Any& rAny )
throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException );
public:
AnalysisAddIn(
const CSS::uno::Reference< CSS::lang::XMultiServiceFactory >& xServiceFact );
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFact );
virtual ~AnalysisAddIn();
double FactDouble( sal_Int32 nNum ) THROWDEF_RTE_IAE;
......@@ -107,8 +107,8 @@ public:
virtual SEQofLocName SAL_CALL getCompatibilityNames( const STRING& aProgrammaticName ) THROWDEF_RTE;
// XLocalizable
virtual void SAL_CALL setLocale( const CSS::lang::Locale& eLocale ) THROWDEF_RTE;
virtual CSS::lang::Locale SAL_CALL getLocale( ) THROWDEF_RTE;
virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& eLocale ) THROWDEF_RTE;
virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) THROWDEF_RTE;
// XServiceName
virtual STRING SAL_CALL getServiceName( ) THROWDEF_RTE;
......
scaddins/source/analysis/analysisdefs.hxx
Dosyayı görüntüle @ 8b035102
......@@ -29,24 +29,23 @@
#ifndef ANALYSISDEFS_HXX
#define ANALYSISDEFS_HXX
#define CSS ::com::sun::star
#define XPROPSET CSS::beans::XPropertySet
#define REF(c) CSS::uno::Reference< c >
#define XPROPSET ::com::sun::star::beans::XPropertySet
#define REF(c) ::com::sun::star::uno::Reference< c >
#define constREFXPS const REF(XPROPSET)
#define SEQ(c) CSS::uno::Sequence< c >
#define SEQSEQ(c) CSS::uno::Sequence< CSS::uno::Sequence< c > >
#define SEQofLocName SEQ( CSS::sheet::LocalizedName )
#define ANY CSS::uno::Any
#define SEQ(c) ::com::sun::star::uno::Sequence< c >
#define SEQSEQ(c) ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< c > >
#define SEQofLocName SEQ( ::com::sun::star::sheet::LocalizedName )
#define ANY ::com::sun::star::uno::Any
#define SEQ_ANY SEQ(ANY)
#define STRING ::rtl::OUString
#define STRFROMASCII(s) STRING::createFromAscii( s )
#define STRFROMANSI(s) STRING( s, strlen( s ), RTL_TEXTENCODING_MS_1252 )
#define THROWDEF_RTE throw(CSS::uno::RuntimeException)
#define THROW_RTE throw CSS::uno::RuntimeException()
#define THROWDEF_RTE_IAE throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException)
#define THROW_IAE throw CSS::lang::IllegalArgumentException()
#define THROWDEF_RTE_IAE_NCE throw(CSS::uno::RuntimeException,CSS::lang::IllegalArgumentException,CSS::sheet::NoConvergenceException)
#define THROW_NCE throw CSS::sheet::NoConvergenceException()
#define THROWDEF_RTE throw(::com::sun::star::uno::RuntimeException)
#define THROW_RTE throw ::com::sun::star::uno::RuntimeException()
#define THROWDEF_RTE_IAE throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException)
#define THROW_IAE throw ::com::sun::star::lang::IllegalArgumentException()
#define THROWDEF_RTE_IAE_NCE throw(::com::sun::star::uno::RuntimeException,::com::sun::star::lang::IllegalArgumentException,::com::sun::star::sheet::NoConvergenceException)
#define THROW_NCE throw ::com::sun::star::sheet::NoConvergenceException()
#define CHK_Freq ( nFreq != 1 && nFreq != 2 && nFreq != 4 )
#define CHK_FINITE(d) if( !::rtl::math::isFinite( d ) ) THROW_IAE
......
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