[Libreoffice-commits] core.git: chart2/source dbaccess/source filter/source forms/source fpicker/source idl/inc include/basic include/sfx2 include/toolkit include/tools io/test sal/qa sax/test scp2/inc sd/source starmath/source svl/source sw/source toolkit/source ucb/source xmlhelp/source
Noel Grandin
noel at peralex.com
Sun Jul 26 23:33:59 PDT 2015
chart2/source/inc/RegressionCalculationHelper.hxx | 4 -
chart2/source/tools/RegressionCurveCalculator.cxx | 4 +
dbaccess/source/core/dataaccess/intercept.cxx | 22 +++++++
dbaccess/source/inc/apitools.hxx | 23 --------
filter/source/msfilter/eschesdo.cxx | 20 ++-----
filter/source/t602/t602filter.cxx | 12 ++--
forms/source/component/EditBase.hxx | 10 +++
forms/source/component/clickableimage.hxx | 8 ++
forms/source/inc/FormComponent.hxx | 24 --------
forms/source/richtext/richtextcontrol.cxx | 34 ++++--------
fpicker/source/office/iodlg.cxx | 6 --
idl/inc/globals.hxx | 14 ++--
include/basic/sbxcore.hxx | 16 ++---
include/sfx2/childwin.hxx | 8 --
include/sfx2/sfxuno.hxx | 26 ---------
include/toolkit/helper/macros.hxx | 51 ------------------
include/tools/pstm.hxx | 13 +---
io/test/stm/testfactreg.hxx | 8 --
sal/qa/osl/condition/osl_Condition_Const.h | 5 -
sax/test/sax/factory.hxx | 8 --
scp2/inc/macros.inc | 8 --
sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx | 3 -
starmath/source/smdetect.hxx | 12 +++-
svl/source/inc/poolio.hxx | 26 ---------
svl/source/items/poolio.cxx | 25 +++++++-
sw/source/filter/ww8/ww8scan.cxx | 9 +--
toolkit/source/awt/vclxwindow.cxx | 25 ++++++++
toolkit/source/helper/listenermultiplexer.cxx | 31 ++++++++++
ucb/source/core/ucb.cxx | 8 +-
ucb/source/ucp/ftp/ftpurl.cxx | 12 +---
ucb/source/ucp/hierarchy/hierarchycontent.cxx | 6 +-
ucb/source/ucp/hierarchy/hierarchycontent.hxx | 9 ---
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 8 --
ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 2
ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 3 -
ucb/source/ucp/package/pkgprovider.cxx | 2
ucb/source/ucp/package/pkgprovider.hxx | 5 -
ucb/source/ucp/tdoc/tdoc_content.cxx | 8 +-
ucb/source/ucp/tdoc/tdoc_content.hxx | 12 ----
xmlhelp/source/cxxhelp/provider/content.cxx | 3 -
xmlhelp/source/cxxhelp/provider/content.hxx | 4 -
41 files changed, 201 insertions(+), 336 deletions(-)
New commits:
commit 38ecca9b30e0fc5f7cc6264857f983e40dd58195
Author: Noel Grandin <noel at peralex.com>
Date: Fri Jul 24 16:22:29 2015 +0200
inline a bunch of use-once macros
no point in having a macro unless it's actually going to reduce the
number of lines of code
Change-Id: Ic8760d6506cf272d7bd088f7b3b4dcbf288099fc
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index 7f0a693..933f14e 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -26,12 +26,8 @@
#include <functional>
#include <vector>
-#define NUMBER_TO_STR(number) (OStringToOUString(::rtl::math::doubleToString( \
- number, rtl_math_StringFormat_G1, 4, '.', true ),RTL_TEXTENCODING_ASCII_US ))
-
#define UC_SPACE (sal_Unicode(' '))
#define UC_MINUS_SIGN (sal_Unicode('-'))
-// #define UC_MINUS_SIGN (sal_Unicode(0x2212))
namespace chart
{
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index d8dc8c7..1ecb681 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -89,7 +89,9 @@ OUString RegressionCurveCalculator::getFormattedString(
if( xNumFormatter.is())
aResult = xNumFormatter->convertNumberToString( nNumberFormatKey, fNumber );
else
- aResult = NUMBER_TO_STR( fNumber );
+ aResult = OStringToOUString(
+ ::rtl::math::doubleToString( fNumber, rtl_math_StringFormat_G1, 4, '.', true ),
+ RTL_TEXTENCODING_ASCII_US );
return aResult;
}
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 7059c22..6d5b85b 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -412,7 +412,27 @@ void SAL_CALL OInterceptor::documentEventOccured( const ::com::sun::star::docume
aEvt.IsEnabled = xModel.is() && xModel->isModified();
aEvt.Requery = sal_False;
- NOTIFY_LISTERNERS((*pListener),XStatusListener,statusChanged)
+ Sequence< Reference< XInterface > > aListenerSeq = pListener->getElements();
+
+ const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray();
+ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength();
+
+ _rGuard.clear();
+ while( pxInt > pxIntBegin )
+ {
+ try
+ {
+ while( pxInt > pxIntBegin )
+ {
+ --pxInt;
+ static_cast< XStatusListener* >( pxInt->get() )->statusChanged(aEvt);
+ }
+ }
+ catch( RuntimeException& )
+ {
+ }
+ }
+ _rGuard.reset();
}
}
}
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 330a7e0..2392b3b 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -289,29 +289,6 @@ public:
END_PROPERTY_SEQUENCE() \
return new ::cppu::OPropertyArrayHelper(aDescriptor);
-#define NOTIFY_LISTERNERS(_rListeners,T,method) \
- Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \
- \
- const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \
- const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \
- \
- _rGuard.clear(); \
- while( pxInt > pxIntBegin ) \
- { \
- try \
- { \
- while( pxInt > pxIntBegin ) \
- { \
- --pxInt; \
- static_cast< T* >( pxInt->get() )->method(aEvt); \
- } \
- } \
- catch( RuntimeException& ) \
- { \
- } \
- } \
- _rGuard.reset();
-
#endif // INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index cbb9c95..6e0fc27 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -156,18 +156,6 @@ void ImplEESdrWriter::ImplFlipBoundingBox( ImplEESdrObject& rObj, EscherProperty
rSolverContainer.AddShape( rObj.GetShapeRef(), nShapeID ); \
}
-#define SHAPE_TEXT( bFill ) \
-{ \
- mpEscherEx->OpenContainer( ESCHER_SpContainer ); \
- ADD_SHAPE( ESCHER_ShpInst_TextBox, 0xa00 ); \
- if ( bFill ) \
- aPropOpt.CreateFillProperties( rObj.mXPropSet, true ); \
- if( rObj.ImplGetText() ) \
- aPropOpt.CreateTextProperties( rObj.mXPropSet, \
- mpEscherEx->QueryTextID( rObj.GetShapeRef(), \
- rObj.GetShapeId() ) ); \
-}
-
sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
EscherSolverContainer& rSolverContainer,
ImplEESdrPageType ePageType, const bool bOOxmlExport )
@@ -575,7 +563,13 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
}
else if ( rObj.GetType() == "drawing.Text" )
{
- SHAPE_TEXT( true );
+ mpEscherEx->OpenContainer( ESCHER_SpContainer );
+ ADD_SHAPE( ESCHER_ShpInst_TextBox, 0xa00 );
+ aPropOpt.CreateFillProperties( rObj.mXPropSet, true );
+ if( rObj.ImplGetText() )
+ aPropOpt.CreateTextProperties( rObj.mXPropSet,
+ mpEscherEx->QueryTextID( rObj.GetShapeRef(),
+ rObj.GetShapeId() ) );
}
else if ( rObj.GetType() == "drawing.Page" )
{
diff --git a/filter/source/t602/t602filter.cxx b/filter/source/t602/t602filter.cxx
index a590b23..b8a4cb5 100644
--- a/filter/source/t602/t602filter.cxx
+++ b/filter/source/t602/t602filter.cxx
@@ -121,9 +121,6 @@ namespace T602ImportFilter {
#define _End(_nam) \
mxHandler->endElement(_nam);
-#define _Chars(_ch) \
- mxHandler->characters(OUString::createFromAscii(_ch) );
-
inistruct ini;
T602ImportFilter::T602ImportFilter(const ::com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory > &r )
@@ -738,8 +735,13 @@ void T602ImportFilter::Read602()
ch = Readchar602();
cmd602[1] = ch;
cmd602[2] = '\0';
- if(isupper(ch)) node = SETCMD; //nedodelano
- else { inschr('@'); _Chars(cmd602); node = READCH; }
+ if(isupper(ch))
+ node = SETCMD; //nedodelano
+ else {
+ inschr('@');
+ mxHandler->characters(OUString::createFromAscii(cmd602));
+ node = READCH;
+ }
} else {
inschr('@');
if(ch<32) node = SETCH;
diff --git a/forms/source/component/EditBase.hxx b/forms/source/component/EditBase.hxx
index 8d8325c..0658490 100644
--- a/forms/source/component/EditBase.hxx
+++ b/forms/source/component/EditBase.hxx
@@ -58,7 +58,15 @@ protected:
sal_Int16 getLastReadVersion() const { return m_nLastReadVersion; }
public:
- DECLARE_DEFAULT_BOUND_XTOR( OEditBaseModel );
+ OEditBaseModel(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory,
+ const OUString& _rUnoControlModelTypeName,
+ const OUString& _rDefault,
+ const bool _bSupportExternalBinding,
+ const bool _bSupportsValidation
+ );
+ DECLARE_DEFAULT_CLONE_CTOR( OEditBaseModel )
+ virtual ~OEditBaseModel();
// XPersistObject
virtual void SAL_CALL write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw ( ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/forms/source/component/clickableimage.hxx b/forms/source/component/clickableimage.hxx
index 9337b3c..7a26a97 100644
--- a/forms/source/component/clickableimage.hxx
+++ b/forms/source/component/clickableimage.hxx
@@ -91,7 +91,13 @@ namespace frm
inline void setDispatchUrlInternal(bool _bDispatch) { m_bDispatchUrlInternal = _bDispatch; }
public:
- DECLARE_DEFAULT_XTOR( OClickableImageBaseModel );
+ OClickableImageBaseModel(
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory,
+ const OUString& _rUnoControlModelTypeName,
+ const OUString& _rDefault
+ );
+ DECLARE_DEFAULT_CLONE_CTOR( OClickableImageBaseModel )
+ virtual ~OClickableImageBaseModel();
// UNO Binding
DECLARE_UNO3_AGG_DEFAULTS(OClickableImageBaseModel, OControlModel)
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 5ea0a64..6d2ff79 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -519,29 +519,7 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory \
); \
-// all xtors for an inner class of the object hierarchy
-#define DECLARE_DEFAULT_XTOR( classname ) \
- classname( \
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, \
- const OUString& _rUnoControlModelTypeName, \
- const OUString& _rDefault \
- ); \
- DECLARE_DEFAULT_CLONE_CTOR( classname ) \
- virtual ~classname() \
-
-// all xtors for an inner class of the object hierarchy which is *bound*
-#define DECLARE_DEFAULT_BOUND_XTOR( classname ) \
- classname( \
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory, \
- const OUString& _rUnoControlModelTypeName, \
- const OUString& _rDefault, \
- const bool _bSupportExternalBinding, \
- const bool _bSupportsValidation \
- ); \
- DECLARE_DEFAULT_CLONE_CTOR( classname ) \
- virtual ~classname() \
-
-// all xtors for a leas class of the object hierarchy
+// all xtors for a leaf class of the object hierarchy
#define DECLARE_DEFAULT_LEAF_XTOR( classname ) \
classname( \
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory \
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index c67a172..58c4209 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -49,24 +49,6 @@ namespace frm
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::frame;
-#define FORWARD_TO_PEER_1_RET( returnType, unoInterface, method, param1 ) \
- returnType aReturn; \
- Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \
- if ( xTypedPeer.is() ) \
- { \
- aReturn = xTypedPeer->method( param1 ); \
- } \
- return aReturn;
-
-#define FORWARD_TO_PEER_3_RET( returnType, unoInterface, method, param1, param2, param3 ) \
- returnType aReturn; \
- Reference< unoInterface > xTypedPeer( getPeer(), UNO_QUERY ); \
- if ( xTypedPeer.is() ) \
- { \
- aReturn = xTypedPeer->method( param1, param2, param3 ); \
- } \
- return aReturn;
-
ORichTextControl::ORichTextControl()
:UnoEditControl()
{
@@ -261,12 +243,24 @@ namespace frm
Reference< XDispatch > SAL_CALL ORichTextControl::queryDispatch( const ::com::sun::star::util::URL& _rURL, const OUString& _rTargetFrameName, sal_Int32 _nSearchFlags ) throw (RuntimeException, std::exception)
{
- FORWARD_TO_PEER_3_RET( Reference< XDispatch >, XDispatchProvider, queryDispatch, _rURL, _rTargetFrameName, _nSearchFlags );
+ Reference< XDispatch > aReturn;
+ Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY );
+ if ( xTypedPeer.is() )
+ {
+ aReturn = xTypedPeer->queryDispatch( _rURL, _rTargetFrameName, _nSearchFlags );
+ }
+ return aReturn;
}
Sequence< Reference< XDispatch > > SAL_CALL ORichTextControl::queryDispatches( const Sequence< DispatchDescriptor >& _rRequests ) throw (RuntimeException, std::exception)
{
- FORWARD_TO_PEER_1_RET( Sequence< Reference< XDispatch > >, XDispatchProvider, queryDispatches, _rRequests );
+ Sequence< Reference< XDispatch > > aReturn;
+ Reference< XDispatchProvider > xTypedPeer( getPeer(), UNO_QUERY );
+ if ( xTypedPeer.is() )
+ {
+ aReturn = xTypedPeer->queryDispatches( _rRequests );
+ }
+ return aReturn;
}
bool ORichTextControl::requiresNewPeer( const OUString& _rPropertyName ) const
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 387477a..6b5eaa7 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -107,9 +107,6 @@ using namespace ExtendedFilePickerElementIds;
using namespace CommonFilePickerElementIds;
using namespace InternalFilePickerElementIds;
-#define GET_DECODED_NAME(aObj) \
- aObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET )
-
// Time to wait while traveling in the filterbox until
// the browsebox gets filtered ( in ms).
#define TRAVELFILTER_TIMEOUT 750
@@ -2012,7 +2009,8 @@ short SvtFileDialog::PrepareExecute()
bool bFileToSelect = nFileNameLen != 0;
if ( bFileToSelect && aFileName[ nFileNameLen - 1 ] != '/' )
{
- _pImp->_pEdFileName->SetText( GET_DECODED_NAME( aFolderURL ) );
+ OUString aDecodedName = aFolderURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
+ _pImp->_pEdFileName->SetText( aDecodedName );
aFolderURL.removeSegment();
}
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index 014aac7..3f49ece 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -127,13 +127,13 @@ public:
IdlDll & GetIdlApp();
-#define SV_GLOBAL_HASH_ACCESS( Name ) \
- if( !GetIdlApp().pGlobalNames ) \
- GetIdlApp().pGlobalNames = new SvGlobalHashNames(); \
- return GetIdlApp().pGlobalNames->MM_##Name;
-
-#define HASH_INLINE( Name ) \
-inline SvStringHashEntry * SvHash_##Name() { SV_GLOBAL_HASH_ACCESS( Name ) }
+#define HASH_INLINE( Name ) \
+inline SvStringHashEntry * SvHash_##Name() \
+{ \
+ if( !GetIdlApp().pGlobalNames ) \
+ GetIdlApp().pGlobalNames = new SvGlobalHashNames(); \
+ return GetIdlApp().pGlobalNames->MM_##Name; \
+}
HASH_INLINE(Name)
HASH_INLINE(module)
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 6ce2e2c..45cf936 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -39,14 +39,6 @@ class SvStream;
virtual sal_uInt16 GetVersion() const SAL_OVERRIDE { return nVer; } \
virtual sal_uInt16 GetSbxId() const SAL_OVERRIDE { return nSbxId; }
-// This version of the macro defines Load/StorePrivateData()-methods
-#define SBX_DECL_PERSIST( nCre, nSbxId, nVer ) \
- virtual bool LoadPrivateData( SvStream&, sal_uInt16 ); \
- virtual bool StorePrivateData( SvStream& ) const; \
- virtual sal_uInt32 GetCreator() const { return nCre; } \
- virtual sal_uInt16 GetVersion() const { return nVer; } \
- virtual sal_uInt16 GetSbxId() const { return nSbxId; }
-
class SbxBase;
class SbxFactory;
class SbxObject;
@@ -62,7 +54,13 @@ protected:
SbxBase( const SbxBase& );
SbxBase& operator=( const SbxBase& );
virtual ~SbxBase();
- SBX_DECL_PERSIST(0,0,0);
+
+ virtual bool LoadPrivateData( SvStream&, sal_uInt16 );
+ virtual bool StorePrivateData( SvStream& ) const;
+ virtual sal_uInt32 GetCreator() const { return 0; }
+ virtual sal_uInt16 GetVersion() const { return 0; }
+ virtual sal_uInt16 GetSbxId() const { return 0; }
+
public:
TYPEINFO();
inline void SetFlags( SbxFlagBits n );
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index dc9ec5f..9dee7f6 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -349,14 +349,6 @@ public:
static_cast<SfxDockingWindow*>(GetWindow())->FillInfo( aInfo ); \
return aInfo; }
-#define SFX_IMPL_TOOLBOX(Class, MyID) \
- SFX_IMPL_CHILDWINDOW(Class, MyID) \
- SfxChildWinInfo Class::GetInfo() const \
- { \
- SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); \
- static_cast<SfxToolbox*>(GetWindow())->FillInfo( aInfo ); \
- return aInfo; }
-
bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize );
bool GetSplitSizeFromString( const OUString& rStr, Size& rSize );
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 2e773ed..7a0a213 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -65,32 +65,6 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, css::uno::Sequence< css::be
typedef sal_Int32 FrameSearchFlags;
-// macros for declaration and definition of uno-services
-
-// declaration of XInterface::queryInterface()
-// XInterface::acquire()
-// XInterface::release()
-// XTypeProvider::getTypes()
-// XTypeProvider::getImplementationId()
-// XServiceInfo::getImplementationName()
-// XServiceInfo::supportsService()
-// XServiceInfo::getSupportedServiceNames()
-// static xxx::impl_getStaticSupportedServiceNames()
-// static xxx::impl_getStaticImplementationName()
-// static xxx::impl_createInstance()
-#define SFX_DECL_XSERVICEINFO_NOFACTORY \
- /* XServiceInfo */ \
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- \
- /* Helper for XServiceInfo */ \
- static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); \
- static OUString impl_getStaticImplementationName(); \
- \
- /* Helper for registry */ \
- static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
-
#endif // INCLUDED_SFX2_SFXUNO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index bfe3a08..e84053e 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -50,31 +50,6 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference<
return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \
}
-#define IMPL_XUNOTUNNEL2( ClassName, BaseClass ) \
-sal_Int64 ClassName::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) \
-{ \
- if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( ClassName::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) ) \
- { \
- return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this)); \
- } \
- return BaseClass::getSomething( rIdentifier ); \
-} \
-namespace \
-{ \
- class the##ClassName##UnoTunnelId : public rtl::Static< UnoTunnelIdInit, the##ClassName##UnoTunnelId> {}; \
-} \
-const ::com::sun::star::uno::Sequence< sal_Int8 >& ClassName::GetUnoTunnelId() throw() \
-{ \
- return the##ClassName##UnoTunnelId::get().getSeq(); \
-} \
-ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) \
-{ \
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY ); \
- return xUT.is() ? reinterpret_cast<ClassName*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( ClassName::GetUnoTunnelId() ))) : NULL; \
-}
-
-
-
#define IMPL_IMPLEMENTATION_ID( ClassName ) \
::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) \
{ \
@@ -164,32 +139,6 @@ void ClassName::disposing( const ::com::sun::star::lang::EventObject& ) throw(::
#define DISPLAY_EXCEPTION( ClassName, MethodName, e ) (void)e;
#endif
-#define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_2PARAM( ClassName, InterfaceName, MethodName, ParamType1, ParamType2 ) \
-{ \
- ParamType1 aMulti( evt ); \
- ParamType2 aMulti2( evt2 ); \
- ::cppu::OInterfaceIteratorHelper aIt( *this ); \
- while( aIt.hasMoreElements() ) \
- { \
- ::com::sun::star::uno::Reference< InterfaceName > xListener( \
- static_cast< InterfaceName* >( aIt.next() ) ); \
- try \
- { \
- xListener->MethodName( aMulti, aMulti2 ); \
- } \
- catch(const ::com::sun::star::lang::DisposedException& e) \
- { \
- OSL_ENSURE( e.Context.is(), "caught DisposedException with empty Context field" ); \
- if ( e.Context == xListener || !e.Context.is() ) \
- aIt.remove(); \
- } \
- catch(const ::com::sun::star::uno::RuntimeException& e) \
- { \
- DISPLAY_EXCEPTION( ClassName, MethodName, e ) \
- } \
- } \
-}
-
#define IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( ClassName, InterfaceName, MethodName, ParamType1 ) \
{ \
ParamType1 aMulti( evt ); \
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index 8b69c8a..b0dc8a9 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -52,19 +52,16 @@ public:
TYPEINFO();
};
-#define SV_DECL_PERSIST( Class, CLASS_ID ) \
- TYPEINFO_OVERRIDE(); \
- static sal_Int32 StaticClassId() { return CLASS_ID; } \
+#define SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \
+ TYPEINFO_OVERRIDE(); \
+ static sal_Int32 StaticClassId() { return CLASS_ID; } \
static void * CreateInstance( SvPersistBase ** ppBase ); \
friend SvPersistStream& operator >> ( SvPersistStream & rStm, \
Class *& rpObj); \
- virtual sal_Int32 GetClassId() const SAL_OVERRIDE; \
- virtual void Load( SvPersistStream & ) SAL_OVERRIDE; \
+ virtual sal_Int32 GetClassId() const SAL_OVERRIDE; \
+ virtual void Load( SvPersistStream & ) SAL_OVERRIDE; \
virtual void Save( SvPersistStream & ) SAL_OVERRIDE;
-#define SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \
- SV_DECL_PERSIST( Class, CLASS_ID )
-
#define PRV_SV_IMPL_PERSIST( Class ) \
void * Class::CreateInstance( SvPersistBase ** ppBase )\
{ \
diff --git a/io/test/stm/testfactreg.hxx b/io/test/stm/testfactreg.hxx
index 787a6fa..2dbff6d 100644
--- a/io/test/stm/testfactreg.hxx
+++ b/io/test/stm/testfactreg.hxx
@@ -106,14 +106,6 @@ Sequence<sal_Int8> createIntSeq( sal_Int32 i );
}\
((void)0)
-#define ERROR_EXCEPTION_ASSERT(expr, Message, Exception) \
- if( !(expr)) { \
- BUILD_ERROR(expr,Message);\
- m_seqExceptions.getArray()[ m_seqExceptions.getLength()-1] = Any( Exception );\
- return; \
- } \
- ((void)0)
-
#endif // INCLUDED_IO_TEST_STM_TESTFACTREG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h
index c7158ea..61082aa 100644
--- a/sal/qa/osl/condition/osl_Condition_Const.h
+++ b/sal/qa/osl/condition/osl_Condition_Const.h
@@ -36,12 +36,9 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
-#define OSLTEST_DECLARE_USTRING( str_name, str_value ) \
- ::rtl::OUString a##str_name( str_value )
-
// condition names
-OSLTEST_DECLARE_USTRING( TestCon, "testcondition" );
+::rtl::OUString aTestCon( "testcondition" );
const char pTestString[17] = "Sun Microsystems";
diff --git a/sax/test/sax/factory.hxx b/sax/test/sax/factory.hxx
index 58bcc2f..688691c 100644
--- a/sax/test/sax/factory.hxx
+++ b/sax/test/sax/factory.hxx
@@ -75,14 +75,6 @@ Sequence<OUString> OSaxWriterTest_getSupportedServiceNames( ) throw();
}\
((void)0)
-#define ERROR_EXCEPTION_ASSERT(expr, Message, Exception) \
- if( !(expr)) { \
- BUILD_ERROR(expr,Message);\
- m_seqExceptions.getArray()[ m_seqExceptions.getLength()-1] = Any( Exception );\
- return; \
- } \
- ((void)0)
-
#endif // INCLUDED_SAX_TEST_SAX_FACTORY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 54e5bc6..86b221e 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -426,20 +426,12 @@ End
#define SCP2_URE_DL_DIR GID_DIR_URE_LIB
#if defined WNT
#define SCP2_URE_DL_NORMAL(n) n ".dll"
-#define SCP2_URE_DL_BARE(n) n ".dll"
#define SCP2_URE_DL_VER(n, v) n v ".dll"
-#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
-#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#else
#define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX)
-#define SCP2_URE_DL_BARE(n) n STRING(UNXSUFFIX)
#define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v
-#define SCP2_URE_DL_COMID_VER(n, v) \
- "lib" n STRING(COMID) STRING(UNXSUFFIX) "." v
-#define SCP2_URE_DL_COMID_NORMAL(n) \
- "lib" n STRING(COMID) STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_VER(n, v) "libuno_" n STRING(UNXSUFFIX) "." v
#define SCP2_URE_DL_UNO_NORMAL(n) "libuno_" n STRING(UNXSUFFIX)
#define SCP2_URE_DL_UNO_COMID_VER(n, v) \
diff --git a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
index d39b8bc..d31764d 100644
--- a/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
+++ b/sd/source/ui/inc/taskpane/SlideSorterCacheDisplay.hxx
@@ -168,8 +168,6 @@ void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate)
SscdSetStatus(RequestData,::sd::toolpanel::SlideSorterCacheDisplay::Status)
#define SSCD_SET_VISIBILITY(Model,Index,Visible) \
SscdSetVisibility(Model,Index,Visible)
-#define SSCD_SET_UPTODATE(Page,UpToDate) \
- SscdSetUpToDate(Page,UpToDate)
}
@@ -178,7 +176,6 @@ void SscdSetUpToDate (const SdrPage* pPage, bool bUpToDate)
#define SSCD_SET_REQUEST_CLASS(Page,RequestClass)
#define SSCD_SET_STATUS(RequestData,Status)
#define SSCD_SET_VISIBILITY(Model,Index,Visible)
-#define SSCD_SET_UPTODATE(Page,UpToDate)
#endif
diff --git a/starmath/source/smdetect.hxx b/starmath/source/smdetect.hxx
index f777326..c04d140 100644
--- a/starmath/source/smdetect.hxx
+++ b/starmath/source/smdetect.hxx
@@ -57,11 +57,19 @@ public:
explicit SmFilterDetect( const css::uno::Reference < css::lang::XMultiServiceFactory >& xFactory );
virtual ~SmFilterDetect();
- SFX_DECL_XSERVICEINFO_NOFACTORY
+ /* XServiceInfo */
+ virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ /* Helper for XServiceInfo */
+ static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames();
+ static OUString impl_getStaticImplementationName();
- // XExtendedFilterDetect
+ /* Helper for registry */
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::Exception );
+ // XExtendedFilterDetect
virtual OUString SAL_CALL detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 8575a2e..ca51c49 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.hxx
@@ -168,32 +168,6 @@ struct SfxItemPool_Impl
};
-#define CHECK_FILEFORMAT( rStream, nTag ) \
- { sal_uInt16 nFileTag; \
- rStream.ReadUInt16( nFileTag ); \
- if ( nTag != nFileTag ) \
- { \
- OSL_FAIL( #nTag ); /*! s.u. */ \
- /*! Set error code and evaluate! */ \
- (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \
- pImp->bStreaming = false; \
- return rStream; \
- } \
- }
-
-#define CHECK_FILEFORMAT2( rStream, nTag1, nTag2 ) \
- { sal_uInt16 nFileTag; \
- rStream.ReadUInt16( nFileTag ); \
- if ( nTag1 != nFileTag && nTag2 != nFileTag ) \
- { \
- OSL_FAIL( #nTag1 ); /*! s.u. */ \
- /*! Set error code and evaluate! */ \
- (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR); \
- pImp->bStreaming = false; \
- return rStream; \
- } \
- }
-
#define SFX_ITEMPOOL_VER_MAJOR sal_uInt8(2)
#define SFX_ITEMPOOL_VER_MINOR sal_uInt8(0)
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 1e0a20e..1d2e30f 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -501,8 +501,17 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
if ( !pLoadMaster )
{
// Load format version
- CHECK_FILEFORMAT2( rStream,
- SFX_ITEMPOOL_TAG_STARTPOOL_5, SFX_ITEMPOOL_TAG_STARTPOOL_4 );
+ sal_uInt16 nFileTag;
+ rStream.ReadUInt16( nFileTag );
+ if ( SFX_ITEMPOOL_TAG_STARTPOOL_5 != nFileTag && SFX_ITEMPOOL_TAG_STARTPOOL_4 != nFileTag )
+ {
+ OSL_FAIL( "SFX_ITEMPOOL_TAG_STARTPOOL_5" ); /*! s.u. */
+ /*! Set error code and evaluate! */
+ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR);
+ pImp->bStreaming = false;
+ return rStream;
+ }
+
rStream.ReadUChar( pImp->nMajorVer ).ReadUChar( pImp->nMinorVer );
// Take over format version to MasterPool
@@ -518,7 +527,17 @@ SvStream &SfxItemPool::Load(SvStream &rStream)
}
// Trick for version 1.2: skip data
- CHECK_FILEFORMAT( rStream, SFX_ITEMPOOL_TAG_TRICK4OLD );
+ sal_uInt16 nFileTag2;
+ rStream.ReadUInt16( nFileTag2 );
+ if ( SFX_ITEMPOOL_TAG_TRICK4OLD != nFileTag2 )
+ {
+ OSL_FAIL( "SFX_ITEMPOOL_TAG_TRICK4OLD" ); /*! s.u. */
+ /*! Set error code and evaluate! */
+ (rStream).SetError(SVSTREAM_FILEFORMAT_ERROR);
+ pImp->bStreaming = false;
+ return rStream;
+ }
+
rStream.SeekRel( 4 ); // Hack: Skip data due to SfxStyleSheetPool bug
}
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 0c2ad80..174f7f0 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -52,11 +52,6 @@
#include <stdio.h>
#endif
-#define ASSERT_RET_ON_FAIL( aCon, aError, aRet ) \
- OSL_ENSURE(aCon, aError); \
- if (!(aCon)) \
- return aRet;
-
using namespace ::com::sun::star::lang;
//-begin
@@ -7474,7 +7469,9 @@ sal_uInt16 wwSprmParser::GetSprmTailLen(sal_uInt16 nId, const sal_uInt8* pSprm)
// one or two bytes at the beginning at the sprm id
sal_uInt16 wwSprmParser::GetSprmId(const sal_uInt8* pSp) const
{
- ASSERT_RET_ON_FAIL(pSp, "Why GetSprmId with pSp of 0", 0);
+ OSL_ENSURE(pSp, "Why GetSprmId with pSp of 0");
+ if (!pSp)
+ return 0;
sal_uInt16 nId = 0;
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 2022f0f..c9d4bc6 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -904,7 +904,30 @@ Size VCLXWindow::ImplCalcWindowSize( const Size& rOutSz ) const
// ::com::sun::star::lang::XUnoTunnel
-IMPL_XUNOTUNNEL2( VCLXWindow, VCLXDevice )
+sal_Int64 VCLXWindow::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception)
+{
+ if( ( rIdentifier.getLength() == 16 ) && ( 0 == memcmp( VCLXWindow::GetUnoTunnelId().getConstArray(), rIdentifier.getConstArray(), 16 ) ) )
+ {
+ return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(this));
+ }
+ return VCLXDevice::getSomething( rIdentifier );
+}
+namespace
+{
+ class theVCLXWindowUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theVCLXWindowUnoTunnelId> {};
+}
+const ::com::sun::star::uno::Sequence< sal_Int8 >& VCLXWindow::GetUnoTunnelId() throw()
+{
+ return theVCLXWindowUnoTunnelId::get().getSeq();
+}
+VCLXWindow* VCLXWindow::GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace )
+{
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XUnoTunnel > xUT( rxIFace, ::com::sun::star::uno::UNO_QUERY );
+ return xUT.is() ? reinterpret_cast<VCLXWindow*>(sal::static_int_cast<sal_IntPtr>(xUT->getSomething( VCLXWindow::GetUnoTunnelId() ))) : NULL;
+}
+
+
+
// ::com::sun::star::lang::Component
void VCLXWindow::dispose( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
index b109c5f..cd0dc5f 100644
--- a/toolkit/source/helper/listenermultiplexer.cxx
+++ b/toolkit/source/helper/listenermultiplexer.cxx
@@ -155,14 +155,43 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD( ItemListenerMultiplexer, ::com::sun::st
// class TabListenerMultiplexer
IMPL_LISTENERMULTIPLEXER_BASEMETHODS( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener )
+
void TabListenerMultiplexer::inserted( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception)
IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, inserted, ::sal_Int32 )
+
void TabListenerMultiplexer::removed( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception)
IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, removed, ::sal_Int32 )
+
void TabListenerMultiplexer::changed( sal_Int32 evt, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& evt2 ) throw(::com::sun::star::uno::RuntimeException, std::exception)
-IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_2PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, changed, ::sal_Int32, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > )
+{
+ sal_Int32 aMulti( evt );
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > aMulti2( evt2 );
+ ::cppu::OInterfaceIteratorHelper aIt( *this );
+ while( aIt.hasMoreElements() )
+ {
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener > xListener(
+ static_cast< ::com::sun::star::awt::XTabListener* >( aIt.next() ) );
+ try
+ {
+ xListener->changed( aMulti, aMulti2 );
+ }
+ catch(const ::com::sun::star::lang::DisposedException& e)
+ {
+ OSL_ENSURE( e.Context.is(), "caught DisposedException with empty Context field" );
+ if ( e.Context == xListener || !e.Context.is() )
+ aIt.remove();
+ }
+ catch(const ::com::sun::star::uno::RuntimeException& e)
+ {
+ DISPLAY_EXCEPTION( TabListenerMultiplexer, changed, e )
+ }
+ }
+}
+
+
void TabListenerMultiplexer::activated( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception)
IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, activated, ::sal_Int32 )
+
void TabListenerMultiplexer::deactivated( sal_Int32 evt ) throw(::com::sun::star::uno::RuntimeException, std::exception)
IMPL_TABLISTENERMULTIPLEXER_LISTENERMETHOD_BODY_1PARAM( TabListenerMultiplexer, ::com::sun::star::awt::XTabListener, deactivated, ::sal_Int32 )
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx
index da62034..f2e88a5 100644
--- a/ucb/source/core/ucb.cxx
+++ b/ucb/source/core/ucb.cxx
@@ -53,10 +53,6 @@ using namespace com::sun::star;
using namespace ucbhelper;
-#define CONFIG_CONTENTPROVIDERS_KEY \
- "/org.openoffice.ucb.Configuration/ContentProviders"
-
-
namespace {
bool fillPlaceholders(OUString const & rInput,
@@ -888,7 +884,9 @@ bool UniversalContentBroker::getContentProviderData(
configuration::theDefaultProvider::get( m_xContext );
OUStringBuffer aFullPath;
- aFullPath.appendAscii( CONFIG_CONTENTPROVIDERS_KEY "/['" );
+ aFullPath.appendAscii(
+ "/org.openoffice.ucb.Configuration/ContentProviders"
+ "/['" );
makeAndAppendXMLName( aFullPath, rKey1 );
aFullPath.appendAscii( "']/SecondaryKeys/['" );
makeAndAppendXMLName( aFullPath, rKey2 );
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 645236f..eff2b42 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -378,12 +378,6 @@ namespace ftp {
&control)
-#define SET_DATA_CONTAINER \
- curl_easy_setopt(curl,CURLOPT_NOBODY,false); \
- MemoryContainer data; \
- curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,memory_write); \
- curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data)
-
#define SET_URL(url) \
OString urlParAscii(url.getStr(), \
url.getLength(), \
@@ -439,7 +433,11 @@ std::vector<FTPDirentry> FTPURL::list(
CURL *curl = m_pFCP->handle();
SET_CONTROL_CONTAINER;
- SET_DATA_CONTAINER;
+ curl_easy_setopt(curl,CURLOPT_NOBODY,false);
+ MemoryContainer data;
+ curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,memory_write);
+ curl_easy_setopt(curl,CURLOPT_WRITEDATA,&data);
+
OUString url(ident(true,true));
SET_URL(url);
curl_easy_setopt(curl,CURLOPT_POSTQUOTE,0);
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 44dffe6..5d5efeb 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -300,11 +300,11 @@ HierarchyContent::getSupportedServiceNames()
uno::Sequence< OUString > aSNS( 1 );
if ( m_eKind == LINK )
- aSNS.getArray()[ 0 ] = HIERARCHY_LINK_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.HierarchyLinkContent";
else if ( m_eKind == FOLDER )
- aSNS.getArray()[ 0 ] = HIERARCHY_FOLDER_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.HierarchyFolderContent";
else
- aSNS.getArray()[ 0 ] = HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.HierarchyRootFolderContent";
return aSNS;
}
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 876e944..e00a507 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -45,15 +45,6 @@ namespace hierarchy_ucp
-#define HIERARCHY_ROOT_FOLDER_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.HierarchyRootFolderContent"
-#define HIERARCHY_FOLDER_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.HierarchyFolderContent"
-#define HIERARCHY_LINK_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.HierarchyLinkContent"
-
-
-
class HierarchyContentProperties
{
public:
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 36a7148..cd3f0d9 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -52,10 +52,6 @@ using namespace hierarchy_ucp;
#define READ_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadAccess"
#define READWRITE_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadWriteAccess"
-#define CONFIG_READ_SERVICE_NAME \
- "com.sun.star.configuration.ConfigurationAccess"
-#define CONFIG_READWRITE_SERVICE_NAME \
- "com.sun.star.configuration.ConfigurationUpdateAccess"
#define CONFIG_DATA_ROOT_KEY \
"/org.openoffice.ucb.Hierarchy/Root"
@@ -500,7 +496,7 @@ HierarchyDataSource::createInstanceWithArguments(
{
// Create configuration read-only access object.
xConfigAccess = xProv->createInstanceWithArguments(
- OUString( CONFIG_READ_SERVICE_NAME ),
+ OUString( "com.sun.star.configuration.ConfigurationAccess" ),
aNewArgs );
}
else
@@ -519,7 +515,7 @@ HierarchyDataSource::createInstanceWithArguments(
// Create configuration read-write access object.
xConfigAccess = xProv->createInstanceWithArguments(
- OUString( CONFIG_READWRITE_SERVICE_NAME ),
+ OUString( "com.sun.star.configuration.ConfigurationUpdateAccess" ),
aNewArgs );
}
}
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
index 7a107c1..ac68a59 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx
@@ -106,7 +106,7 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider,
XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider,
OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ),
- HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME );
+ "com.sun.star.ucb.HierarchyContentProvider" );
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index c33795e..494e11a 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -37,9 +37,6 @@ namespace hierarchy_ucp {
-#define HIERARCHY_CONTENT_PROVIDER_SERVICE_NAME \
- "com.sun.star.ucb.HierarchyContentProvider"
-
#define HIERARCHY_URL_SCHEME \
"vnd.sun.star.hier"
#define HIERARCHY_URL_SCHEME_LENGTH 17
diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx
index 48a607d..d5d07ad 100644
--- a/ucb/source/ucp/package/pkgprovider.cxx
+++ b/ucb/source/ucp/package/pkgprovider.cxx
@@ -158,7 +158,7 @@ XTYPEPROVIDER_IMPL_3( ContentProvider,
XSERVICEINFO_IMPL_1_CTX( ContentProvider,
OUString( "com.sun.star.comp.ucb.PackageContentProvider" ),
- PACKAGE_CONTENT_PROVIDER_SERVICE_NAME );
+ "com.sun.star.ucb.PackageContentProvider" );
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 1f92241..540808e 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -31,11 +31,6 @@ namespace package_ucp {
-// UNO service name for the provider. This name will be used by the UCB to
-// create instances of the provider.
-#define PACKAGE_CONTENT_PROVIDER_SERVICE_NAME \
- "com.sun.star.ucb.PackageContentProvider"
-
// UCB Content Type.
#define PACKAGE_FOLDER_CONTENT_TYPE \
"application/" PACKAGE_URL_SCHEME "-folder"
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index c85c290..33d3909 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -314,13 +314,13 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
uno::Sequence< OUString > aSNS( 1 );
if ( m_aProps.getType() == STREAM )
- aSNS.getArray()[ 0 ] = TDOC_STREAM_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.TransientDocumentsStreamContent";
else if ( m_aProps.getType() == FOLDER )
- aSNS.getArray()[ 0 ] = TDOC_FOLDER_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.TransientDocumentsFolderContent";
else if ( m_aProps.getType() == DOCUMENT )
- aSNS.getArray()[ 0 ] = TDOC_DOCUMENT_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.TransientDocumentsDocumentContent";
else
- aSNS.getArray()[ 0 ] = TDOC_ROOT_CONTENT_SERVICE_NAME;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.TransientDocumentsRootContent";
return aSNS;
}
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 108b075..d69b4fb 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -40,18 +40,6 @@ namespace tdoc_ucp
{
-
-#define TDOC_ROOT_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.TransientDocumentsRootContent"
-#define TDOC_DOCUMENT_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.TransientDocumentsDocumentContent"
-#define TDOC_FOLDER_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.TransientDocumentsFolderContent"
-#define TDOC_STREAM_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.TransientDocumentsStreamContent"
-
-
-
enum ContentType { STREAM, FOLDER, DOCUMENT, ROOT };
class ContentProperties
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index 2e180d8..da0688f 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -140,7 +140,8 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
throw( uno::RuntimeException, std::exception )
{
uno::Sequence< OUString > aSNS( 1 );
- aSNS.getArray()[ 0 ] = MYUCP_CONTENT_SERVICE_NAME ;
+ aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CHelpContent";
+
return aSNS;
}
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index a385e49..5bb731a 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -37,10 +37,6 @@ namespace com { namespace sun { namespace star { namespace sdbc {
namespace chelp
{
-// UNO service name for the content.
-#define MYUCP_CONTENT_SERVICE_NAME \
- "com.sun.star.ucb.CHelpContent"
-
class Databases;
struct ContentProperties
More information about the Libreoffice-commits
mailing list