[Libreoffice-commits] core.git: cui/source dbaccess/source dtrans/source forms/source fpicker/source framework/inc include/canvas include/oox include/sfx2 include/tools include/ucbhelper include/vbahelper oox/source sc/source sd/source svx/source sw/source ucb/source
Noel Grandin
noel at peralex.com
Mon Mar 14 11:07:16 UTC 2016
cui/source/customize/cfg.src | 5 -
dbaccess/source/core/api/querydescriptor.hxx | 4
dbaccess/source/inc/apitools.hxx | 62 ++++----------
dbaccess/source/ui/browser/sbabrw.src | 59 +++++--------
dtrans/source/win32/ftransl/ftransl.cxx | 3
forms/source/component/DatabaseForm.cxx | 90 +++++++++++----------
forms/source/inc/property.hxx | 8 -
fpicker/source/office/iodlg.src | 27 ++----
framework/inc/macros/xinterface.hxx | 64 +++-----------
framework/inc/macros/xtypeprovider.hxx | 107 +++++++------------------
include/canvas/verbosetrace.hxx | 32 -------
include/oox/core/relations.hxx | 5 -
include/sfx2/childwin.hxx | 24 -----
include/tools/mempool.hxx | 24 +----
include/tools/pstm.hxx | 5 -
include/ucbhelper/macros.hxx | 33 +++----
include/vbahelper/vbahelperinterface.hxx | 43 +++-------
oox/source/docprop/ooxmldocpropimport.cxx | 2
sc/source/ui/dbgui/outline.src | 7 -
sc/source/ui/navipi/navipi.src | 54 +++++-------
sd/source/ui/app/res_bmp.src | 10 --
svx/source/dialog/imapdlg.src | 45 ++++------
sw/source/core/inc/frame.hxx | 5 -
sw/source/core/layout/wsfrm.cxx | 5 -
sw/source/ui/app/mn.src | 105 +++++++++++-------------
sw/source/ui/utlui/utlui.src | 21 ++--
sw/source/uibase/dbui/mailmergechildwindow.src | 15 +--
sw/source/uibase/dialog/regionsw.src | 19 +---
sw/source/uibase/inc/navipi.hxx | 5 -
sw/source/uibase/ribbar/workctrl.src | 51 +++++------
sw/source/uibase/utlui/navipi.cxx | 18 +++-
sw/source/uibase/utlui/navipi.src | 88 +++++++++-----------
ucb/source/ucp/tdoc/tdoc_provider.cxx | 2
ucb/source/ucp/tdoc/tdoc_provider.hxx | 3
34 files changed, 408 insertions(+), 642 deletions(-)
New commits:
commit 218cd09611583437c05c33e2aa3b2b81cb416f98
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 14 10:49:08 2016 +0200
inline some use-once macros
Change-Id: I7ebd8fe70b083a772118a1aab8cdfbf795d6f1e5
Reviewed-on: https://gerrit.libreoffice.org/23235
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 0ac1b96..b9a515b 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -26,9 +26,6 @@
#define TEXT_DELETE_NODOTS \
Text [ en-US ] = "Delete" ;\
-#define TEXT_TEXT_ONLY \
- Text [ en-US ] = "Text only" ;\
-
Menu MODIFY_TOOLBAR
{
ItemList =
@@ -68,7 +65,7 @@ Menu MODIFY_TOOLBAR
Identifier = ID_TEXT_ONLY ;
RadioCheck = TRUE ;
AutoCheck = TRUE ;
- TEXT_TEXT_ONLY
+ Text [ en-US ] = "Text only" ;
};
MenuItem
{
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index 5209e1d..10d93f1 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -79,7 +79,9 @@ public:
// css::lang::XUnoTunnel
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
- DECLARE_IMPLEMENTATION_ID( );
+ virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
+ static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
+
// css::lang::XServiceInfo
virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 0d342c5..1687155 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -89,13 +89,6 @@ public:
return sal_False; \
} \
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
- css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
- { \
- css::uno::Sequence< OUString > aSupported { serviceasciiname }; \
- return aSupported; \
- } \
-
#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
{ \
@@ -120,32 +113,6 @@ public:
return aSupported; \
} \
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
- css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
- { \
- css::uno::Sequence< OUString > aSupported(2); \
- aSupported[0] = serviceasciiname1; \
- aSupported[1] = serviceasciiname2; \
- return aSupported; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
- css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
- { \
- css::uno::Sequence< OUString > aSupported(3); \
- aSupported[0] = serviceasciiname1; \
- aSupported[1] = serviceasciiname2; \
- aSupported[2] = serviceasciiname3; \
- return aSupported; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
- css::uno::Reference< css::uno::XInterface > \
- SAL_CALL classname::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) \
- { \
- return static_cast< XServiceInfo* >(new classname(_rxORB)); \
- } \
-
#define DECLARE_SERVICE_INFO_STATIC() \
DECLARE_SERVICE_INFO(); \
static OUString SAL_CALL getImplementationName_Static( ) throw (css::uno::RuntimeException); \
@@ -156,29 +123,42 @@ public:
#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
+ css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
+ { \
+ return css::uno::Sequence< OUString > { serviceasciiname }; \
+ } \
+
#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2)
+ css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
+ { \
+ return css::uno::Sequence< OUString > { serviceasciiname1, serviceasciiname2 }; \
+ }
+
#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \
- IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
+ css::uno::Reference< css::uno::XInterface > \
+ SAL_CALL classname::Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxORB) \
+ { \
+ return static_cast< XServiceInfo* >(new classname(_rxORB)); \
+ }
+
#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
+ css::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) \
+ { \
+ return css::uno::Sequence< OUString > { serviceasciiname1, serviceasciiname2, serviceasciiname3 }; \
+ } \
-// XTypeProvider helpers
-#define DECLARE_IMPLEMENTATION_ID( ) \
- virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; \
- static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \
+// XTypeProvider helpers
#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \
css::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index dcd75df..0aba65f 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -55,49 +55,40 @@ String RID_STR_TABLES_CONTAINER
Text [ en-US ] = "Tables";
};
-#define MID_EDIT_DATABASE \
- Identifier = ID_TREE_EDIT_DATABASE ; \
- HelpId = HID_BROWSER_EDIT_DATABASE; \
- Text [ en-US ] = "Edit ~Database File..." ;\
-
-#define MID_ADMINISTRATE \
- Identifier = ID_TREE_ADMINISTRATE ; \
- HelpId = HID_BROWSER_ADMINISTRATE; \
- Text [ en-US ] = "Registered databases ..." ;\
-
-#define MID_CLOSECONN \
- Identifier = ID_TREE_CLOSE_CONN ; \
- HelpId = HID_BROWSER_CLOSECONN ; \
- Text [ en-US ] = "Disco~nnect" ; \
-
Menu MENU_BROWSER_DEFAULTCONTEXT
{
ItemList =
{
- MenuItem \
- { \
- MID_EDIT_DATABASE \
- }; \
- MenuItem \
- { \
- MID_CLOSECONN \
- }; \
- MenuItem \
- { \
- Separator = TRUE; \
- }; \
+ MenuItem
+ {
+ Identifier = ID_TREE_EDIT_DATABASE ;
+ HelpId = HID_BROWSER_EDIT_DATABASE ;
+ Text [ en-US ] = "Edit ~Database File..." ;
+ };
+ MenuItem
+ {
+ Identifier = ID_TREE_CLOSE_CONN ;
+ HelpId = HID_BROWSER_CLOSECONN ;
+ Text [ en-US ] = "Disco~nnect" ;
+ };
+ MenuItem
+ {
+ Separator = TRUE;
+ };
MenuItem {
Identifier = SID_COPY ;
Command = ".uno:Copy" ;
Text [ en-US ] = "~Copy" ;
};
- MenuItem \
- { \
- Separator = TRUE; \
- }; \
- MenuItem \
- { \
- MID_ADMINISTRATE \
+ MenuItem
+ {
+ Separator = TRUE;
+ };
+ MenuItem
+ {
+ Identifier = ID_TREE_ADMINISTRATE ;
+ HelpId = HID_BROWSER_ADMINISTRATE;
+ Text [ en-US ] = "Registered databases ..." ;
};
};
};
diff --git a/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index 6a17ca4..073255e 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.cxx
@@ -37,7 +37,6 @@
#define IMPL_NAME "com.sun.star.datatransfer.DataFormatTranslator"
-#define MODULE_PRIVATE
#define CPPUTYPE_SEQSALINT8 cppu::UnoType<Sequence< sal_Int8 >>::get()
#define CPPUTYPE_DEFAULT CPPUTYPE_SEQSALINT8
#define CPPUTYPE_OUSTR cppu::UnoType<OUString>::get()
@@ -60,7 +59,7 @@ using namespace com::sun::star::container;
// helper functions
-namespace MODULE_PRIVATE
+namespace
{
Sequence< OUString > SAL_CALL DataFormatTranslator_getSupportedServiceNames( )
{
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 8d9eb17..bf1b7d1 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -1332,48 +1332,54 @@ void ODatabaseForm::describeFixedAndAggregateProperties(
Sequence< Property >& _rProps,
Sequence< Property >& _rAggregateProps ) const
{
- BEGIN_DESCRIBE_AGGREGATION_PROPERTIES(22, m_xAggregateSet)
- // we want to "override" the privileges, since we have additional "AllowInsert" etc. properties
- RemoveProperty( _rAggregateProps, PROPERTY_PRIVILEGES );
-
- // InsertOnly is also to be overridden, since we sometimes change it ourself
- RemoveProperty( _rAggregateProps, PROPERTY_INSERTONLY );
-
- // we remove and re-declare the DataSourceName property, 'cause we want it to be constrained, and the
- // original property of our aggregate isn't
- RemoveProperty( _rAggregateProps, PROPERTY_DATASOURCE );
-
- // for connection sharing, we need to override the ActiveConnection property, too
- RemoveProperty( _rAggregateProps, PROPERTY_ACTIVE_CONNECTION );
-
- // the Filter property is also overwritten, since we have some implicit filters
- // (e.g. the ones which result from linking master fields to detail fields
- // via column names instead of parameters)
- RemoveProperty( _rAggregateProps, PROPERTY_FILTER );
- RemoveProperty( _rAggregateProps, PROPERTY_APPLYFILTER );
-
- DECL_IFACE_PROP4(ACTIVE_CONNECTION, XConnection, BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED);
- DECL_BOOL_PROP2 ( APPLYFILTER, BOUND, MAYBEDEFAULT );
- DECL_PROP1 ( NAME, OUString, BOUND );
- DECL_PROP1 ( MASTERFIELDS, Sequence< OUString >, BOUND );
- DECL_PROP1 ( DETAILFIELDS, Sequence< OUString >, BOUND );
- DECL_PROP2 ( DATASOURCE, OUString, BOUND, CONSTRAINED );
- DECL_PROP3 ( CYCLE, TabulatorCycle, BOUND, MAYBEVOID, MAYBEDEFAULT );
- DECL_PROP2 ( FILTER, OUString, BOUND, MAYBEDEFAULT );
- DECL_BOOL_PROP2 ( INSERTONLY, BOUND, MAYBEDEFAULT );
- DECL_PROP1 ( NAVIGATION, NavigationBarMode, BOUND );
- DECL_BOOL_PROP1 ( ALLOWADDITIONS, BOUND );
- DECL_BOOL_PROP1 ( ALLOWEDITS, BOUND );
- DECL_BOOL_PROP1 ( ALLOWDELETIONS, BOUND );
- DECL_PROP2 ( PRIVILEGES, sal_Int32, TRANSIENT, READONLY );
- DECL_PROP1 ( TARGET_URL, OUString, BOUND );
- DECL_PROP1 ( TARGET_FRAME, OUString, BOUND );
- DECL_PROP1 ( SUBMIT_METHOD, FormSubmitMethod, BOUND );
- DECL_PROP1 ( SUBMIT_ENCODING, FormSubmitEncoding, BOUND );
- DECL_BOOL_PROP3 ( DYNAMIC_CONTROL_BORDER, BOUND, MAYBEVOID, MAYBEDEFAULT );
- DECL_PROP3 ( CONTROL_BORDER_COLOR_FOCUS, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT );
- DECL_PROP3 ( CONTROL_BORDER_COLOR_MOUSE, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT );
- DECL_PROP3 ( CONTROL_BORDER_COLOR_INVALID, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT );
+ _rProps.realloc( 22 );
+ css::beans::Property* pProperties = _rProps.getArray();
+
+ if (m_xAggregateSet.is())
+ _rAggregateProps = m_xAggregateSet->getPropertySetInfo()->getProperties();
+
+
+ // we want to "override" the privileges, since we have additional "AllowInsert" etc. properties
+ RemoveProperty( _rAggregateProps, PROPERTY_PRIVILEGES );
+
+ // InsertOnly is also to be overridden, since we sometimes change it ourself
+ RemoveProperty( _rAggregateProps, PROPERTY_INSERTONLY );
+
+ // we remove and re-declare the DataSourceName property, 'cause we want it to be constrained, and the
+ // original property of our aggregate isn't
+ RemoveProperty( _rAggregateProps, PROPERTY_DATASOURCE );
+
+ // for connection sharing, we need to override the ActiveConnection property, too
+ RemoveProperty( _rAggregateProps, PROPERTY_ACTIVE_CONNECTION );
+
+ // the Filter property is also overwritten, since we have some implicit filters
+ // (e.g. the ones which result from linking master fields to detail fields
+ // via column names instead of parameters)
+ RemoveProperty( _rAggregateProps, PROPERTY_FILTER );
+ RemoveProperty( _rAggregateProps, PROPERTY_APPLYFILTER );
+
+ DECL_IFACE_PROP4( ACTIVE_CONNECTION,XConnection, BOUND, TRANSIENT, MAYBEVOID, CONSTRAINED);
+ DECL_BOOL_PROP2 ( APPLYFILTER, BOUND, MAYBEDEFAULT );
+ DECL_PROP1 ( NAME, OUString, BOUND );
+ DECL_PROP1 ( MASTERFIELDS, Sequence< OUString >, BOUND );
+ DECL_PROP1 ( DETAILFIELDS, Sequence< OUString >, BOUND );
+ DECL_PROP2 ( DATASOURCE, OUString, BOUND, CONSTRAINED );
+ DECL_PROP3 ( CYCLE, TabulatorCycle, BOUND, MAYBEVOID, MAYBEDEFAULT );
+ DECL_PROP2 ( FILTER, OUString, BOUND, MAYBEDEFAULT );
+ DECL_BOOL_PROP2 ( INSERTONLY, BOUND, MAYBEDEFAULT );
+ DECL_PROP1 ( NAVIGATION, NavigationBarMode, BOUND );
+ DECL_BOOL_PROP1 ( ALLOWADDITIONS, BOUND );
+ DECL_BOOL_PROP1 ( ALLOWEDITS, BOUND );
+ DECL_BOOL_PROP1 ( ALLOWDELETIONS, BOUND );
+ DECL_PROP2 ( PRIVILEGES, sal_Int32, TRANSIENT, READONLY );
+ DECL_PROP1 ( TARGET_URL, OUString, BOUND );
+ DECL_PROP1 ( TARGET_FRAME, OUString, BOUND );
+ DECL_PROP1 ( SUBMIT_METHOD, FormSubmitMethod, BOUND );
+ DECL_PROP1 ( SUBMIT_ENCODING, FormSubmitEncoding, BOUND );
+ DECL_BOOL_PROP3 ( DYNAMIC_CONTROL_BORDER, BOUND, MAYBEVOID, MAYBEDEFAULT );
+ DECL_PROP3 ( CONTROL_BORDER_COLOR_FOCUS, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT );
+ DECL_PROP3 ( CONTROL_BORDER_COLOR_MOUSE, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT );
+ DECL_PROP3 ( CONTROL_BORDER_COLOR_INVALID, sal_Int32, BOUND, MAYBEVOID, MAYBEDEFAULT );
END_DESCRIBE_PROPERTIES();
}
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 220aa32..0fe9750 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -124,14 +124,6 @@ public:
css::beans::Property* pProperties = _rProps.getArray(); \
-#define BEGIN_DESCRIBE_AGGREGATION_PROPERTIES( count, aggregate ) \
- _rProps.realloc( count ); \
- css::beans::Property* pProperties = _rProps.getArray(); \
- \
- if (aggregate.is()) \
- _rAggregateProps = aggregate->getPropertySetInfo()->getProperties(); \
-
-
#define DECL_PROP0(varname, type) \
DECL_PROP_IMPL(varname, type) 0)
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index 775b6ee..b25dcc8 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -22,20 +22,6 @@
#include "iodlg.hrc"
#include "OfficeFilePicker.hrc"
-#define FILEPICKER_IL_IDLIST \
- IdList = \
- { \
- IMG_FILEDLG_BTN_UP; \
- IMG_FILEDLG_BTN_STD; \
- IMG_FILEDLG_CREATEFOLDER; \
- IMG_FILEDLG_PLACE_LOCAL; \
- IMG_FILEDLG_PLACE_REMOTE; \
- }; \
- IdCount = \
- { \
- 5; \
- };
-
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
// image lists ***************************************************************
@@ -44,7 +30,18 @@ ImageList RID_FILEPICKER_IMAGES
{
Prefix = "fp";
MASKCOLOR
- FILEPICKER_IL_IDLIST
+ IdList =
+ {
+ IMG_FILEDLG_BTN_UP;
+ IMG_FILEDLG_BTN_STD;
+ IMG_FILEDLG_CREATEFOLDER;
+ IMG_FILEDLG_PLACE_LOCAL;
+ IMG_FILEDLG_PLACE_REMOTE;
+ };
+ IdCount =
+ {
+ 5;
+ };
};
// strings *******************************************************************
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index 4adf324..3639685 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -63,9 +63,10 @@ ________________________________________________________________________________
}
// private
-// implementation of XInterface::queryInterface() with max. 12 other interfaces!
+// complete implementation of XInterface with max. 12 other interfaces!
-#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES ) \
+#define PRIVATE_DEFINE_XINTERFACE( CLASS, BASECLASS, INTERFACES ) \
+ PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS ) \
css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) \
{ \
/* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \
@@ -82,10 +83,11 @@ ________________________________________________________________________________
return aReturn; \
}
+
// private
// implementation of XInterface::queryInterface() with more than 12 other interfaces!
-
-#define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \
+#define PRIVATE_DEFINE_XINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \
+ PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS ) \
css::uno::Any SAL_CALL CLASS::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) \
{ \
/* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ \
@@ -108,16 +110,6 @@ ________________________________________________________________________________
return aReturn; \
}
-// private
-// complete implementation of XInterface for different use cases
-
-#define PRIVATE_DEFINE_XINTERFACE( CLASS, BASECLASS, INTERFACES ) \
- PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS ) \
- PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES )
-
-#define PRIVATE_DEFINE_XINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND ) \
- PRIVATE_DEFINE_XINTERFACE_ACQUIRE_RELEASE( CLASS, BASECLASS ) \
- PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND )
// private
// help macros to replace INTERFACES in queryInterface() [see before]
@@ -133,44 +125,20 @@ ________________________________________________________________________________
INTERFACE1
//#endif // #ifdef ENABLE_SERVICEDEBUG
-#define PRIVATE_DEFINE_INTERFACE_2( INTERFACE1, INTERFACE2 ) \
- PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ), \
- INTERFACE2
-
-#define PRIVATE_DEFINE_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ) \
- PRIVATE_DEFINE_INTERFACE_2( INTERFACE1, INTERFACE2 ), \
- INTERFACE3
-
-#define PRIVATE_DEFINE_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ) \
- PRIVATE_DEFINE_INTERFACE_3( INTERFACE1, INTERFACE2, INTERFACE3 ), \
- INTERFACE4
-
-#define PRIVATE_DEFINE_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ) \
- PRIVATE_DEFINE_INTERFACE_4( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4 ), \
- INTERFACE5
-
#define PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ) \
- PRIVATE_DEFINE_INTERFACE_5( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5 ), \
+ PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 ), \
+ INTERFACE2, \
+ INTERFACE3, \
+ INTERFACE4, \
+ INTERFACE5, \
INTERFACE6
-#define PRIVATE_DEFINE_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ) \
- PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \
- INTERFACE7
-
-#define PRIVATE_DEFINE_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ) \
- PRIVATE_DEFINE_INTERFACE_7( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7 ), \
- INTERFACE8
-
-#define PRIVATE_DEFINE_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ) \
- PRIVATE_DEFINE_INTERFACE_8( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8 ), \
- INTERFACE9
-
-#define PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ) \
- PRIVATE_DEFINE_INTERFACE_9( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9 ), \
- INTERFACE10
-
#define PRIVATE_DEFINE_INTERFACE_11( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10, INTERFACE11 ) \
- PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ), \
+ PRIVATE_DEFINE_INTERFACE_6( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6 ), \
+ INTERFACE7, \
+ INTERFACE8, \
+ INTERFACE9, \
+ INTERFACE10, \
INTERFACE11
// public
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 21dc77b..73a9e5d 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -59,9 +59,32 @@ ________________________________________________________________________________
}
// private
-// implementation of XTypeProvider::getTypes() with max. 12 interfaces!
+// help macros to replace TYPES in getTypes() [see before]
+
+#define PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \
+ cppu::UnoType<TYPE1>::get(), \
+ cppu::UnoType<TYPE2>::get(), \
+ cppu::UnoType<TYPE3>::get(), \
+ cppu::UnoType<TYPE4>::get(), \
+ cppu::UnoType<TYPE5>::get(), \
+ cppu::UnoType<TYPE6>::get()
-#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES ) \
+#define PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \
+ PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \
+ cppu::UnoType<TYPE7>::get(), \
+ cppu::UnoType<TYPE8>::get(), \
+ cppu::UnoType<TYPE9>::get()
+
+#define PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \
+ PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \
+ cppu::UnoType<TYPE10>::get(), \
+ cppu::UnoType<TYPE11>::get()
+
+// private
+// complete implementation of XTypeProvider with max. 12 interfaces!
+
+#define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES ) \
+ PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception ) \
{ \
/* Optimize this method ! */ \
@@ -87,10 +110,11 @@ ________________________________________________________________________________
return pTypeCollection->getTypes(); \
}
+
// private
// implementation of XTypeProvider::getTypes() with more than 12 interfaces!
-
-#define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \
+#define PRIVATE_DEFINE_XTYPEPROVIDER_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \
+ PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
css::uno::Sequence< css::uno::Type > SAL_CALL CLASS::getTypes() throw( css::uno::RuntimeException, std::exception ) \
{ \
/* Optimize this method ! */ \
@@ -138,66 +162,6 @@ ________________________________________________________________________________
return *pTypeCollection; \
}
-// private
-// help macros to replace TYPES in getTypes() [see before]
-
-#define PRIVATE_DEFINE_TYPE_1( TYPE1 ) \
- cppu::UnoType<TYPE1>::get()
-
-#define PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 ) \
- PRIVATE_DEFINE_TYPE_1( TYPE1 ), \
- cppu::UnoType<TYPE2>::get()
-
-#define PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 ) \
- PRIVATE_DEFINE_TYPE_2( TYPE1, TYPE2 ), \
- cppu::UnoType<TYPE3>::get()
-
-#define PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ) \
- PRIVATE_DEFINE_TYPE_3( TYPE1, TYPE2, TYPE3 ), \
- cppu::UnoType<TYPE4>::get()
-
-#define PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ) \
- PRIVATE_DEFINE_TYPE_4( TYPE1, TYPE2, TYPE3, TYPE4 ), \
- cppu::UnoType<TYPE5>::get()
-
-#define PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ) \
- PRIVATE_DEFINE_TYPE_5( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5 ), \
- cppu::UnoType<TYPE6>::get()
-
-#define PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ) \
- PRIVATE_DEFINE_TYPE_6( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6 ), \
- cppu::UnoType<TYPE7>::get()
-
-#define PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ) \
- PRIVATE_DEFINE_TYPE_7( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7 ), \
- cppu::UnoType<TYPE8>::get()
-
-#define PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ) \
- PRIVATE_DEFINE_TYPE_8( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8 ), \
- cppu::UnoType<TYPE9>::get()
-
-#define PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ) \
- PRIVATE_DEFINE_TYPE_9( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9 ), \
- cppu::UnoType<TYPE10>::get()
-
-#define PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ) \
- PRIVATE_DEFINE_TYPE_10( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10 ), \
- cppu::UnoType<TYPE11>::get()
-
-#define PRIVATE_DEFINE_TYPE_12( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12 ) \
- PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \
- cppu::UnoType<TYPE12>::get()
-
-// private
-// complete implementation of XTypeProvider
-
-#define PRIVATE_DEFINE_XTYPEPROVIDER( CLASS, TYPES ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES )
-
-#define PRIVATE_DEFINE_XTYPEPROVIDER_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS ) \
- PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND )
// public
// declaration of XTypeProvider
@@ -245,19 +209,8 @@ ________________________________________________________________________________
// implementation of XTypeProvider with 20 additional interfaces for getTypes()
#define DEFINE_XTYPEPROVIDER_21( CLASS, TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11, TYPE12, TYPE13, TYPE14, TYPE15, TYPE16, TYPE17, TYPE18, TYPE19, TYPE20, TYPE21 ) \
PRIVATE_DEFINE_XTYPEPROVIDER_LARGE ( CLASS, \
- (PRIVATE_DEFINE_TYPE_12 ( TYPE1 , \
- TYPE2 , \
- TYPE3 , \
- TYPE4 , \
- TYPE5 , \
- TYPE6 , \
- TYPE7 , \
- TYPE8 , \
- TYPE9 , \
- TYPE10 , \
- TYPE11 , \
- TYPE12 \
- )), \
+ (PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ), \
+ cppu::UnoType<TYPE12>::get()), \
(PRIVATE_DEFINE_TYPE_9 ( TYPE13 , \
TYPE14 , \
TYPE15 , \
diff --git a/include/canvas/verbosetrace.hxx b/include/canvas/verbosetrace.hxx
deleted file mode 100644
index a5bc61b..0000000
--- a/include/canvas/verbosetrace.hxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_CANVAS_VERBOSETRACE_HXX
-#define INCLUDED_CANVAS_VERBOSETRACE_HXX
-
-#include <sal/config.h>
-
-#include <sal/detail/log.h>
-
-#define VERBOSE_TRACE(...) \
- SAL_DETAIL_INFO_IF_FORMAT(true, "canvas.level2", __VA_ARGS__)
-
-#endif /* INCLUDED_CANVAS_VERBOSETRACE_HXX */
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index 0186349..7663cb5 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -39,11 +39,6 @@ namespace core {
#define CREATE_OFFICEDOC_RELATION_TYPE_STRICT( ascii ) \
( "http://purl.oclc.org/ooxml/officeDocument/relationships/" ascii )
-/** Expands to an OUString containing a 'package' relation type created from
- the passed literal(!) ASCII(!) character array. */
-#define CREATE_PACKAGE_RELATION_TYPE( ascii ) \
- ( "http://schemas.openxmlformats.org/package/2006/relationships/" ascii )
-
/** Expands to an OUString containing an MS Office specific relation type
created from the passed literal(!) ASCII(!) character array. */
#define CREATE_MSOFFICE_RELATION_TYPE( ascii ) \
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 1afc54d..8469fbc 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -215,36 +215,12 @@ public:
};
-//! soon obsolete !
-#define SFX_DECL_CHILDWINDOW_CONTEXT(Class) \
- static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \
- SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
- static void RegisterChildWindowContext(SfxModule *pMod=nullptr); \
-
//! The Macro of the future ...
#define SFX_DECL_CHILDWINDOWCONTEXT(Class) \
static SfxChildWindowContext* CreateImpl(vcl::Window *pParent, \
SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \
static void RegisterChildWindowContext(sal_uInt16, SfxModule *pMod=nullptr); \
-//! soon obsolete !
-#define SFX_IMPL_CHILDWINDOW_CONTEXT(Class, MyID, ShellClass) \
- SfxChildWindowContext* Class::CreateImpl( vcl::Window *pParent, \
- SfxBindings *pBindings, SfxChildWinInfo* pInfo ) \
- { \
- SfxChildWindowContext *pContext = new Class(pParent, \
- /* cast is safe here! */static_cast< sal_uInt16 >(ShellClass::GetInterfaceId()), \
- pBindings,pInfo); \
- return pContext; \
- } \
- void Class::RegisterChildWindowContext(SfxModule* pMod) \
- { \
- SfxChildWinContextFactory *pFact = new SfxChildWinContextFactory( \
- Class::CreateImpl, \
- /* cast is safe here! */static_cast< sal_uInt16 >(ShellClass::GetInterfaceId()) ); \
- SfxChildWindowContext::RegisterChildWindowContext(pMod, MyID, pFact); \
- }
-
//! The Macro of the future ...
// As a parameter and because of ContextId, CreateImpl must be handed the
// factory. As long as Id is set to 0 and patched in
diff --git a/include/tools/mempool.hxx b/include/tools/mempool.hxx
index ef3fe6c..4ff29d2 100644
--- a/include/tools/mempool.hxx
+++ b/include/tools/mempool.hxx
@@ -43,9 +43,6 @@ public:
#define DECL_FIXEDMEMPOOL_NEW_DECL() \
static void * operator new( size_t n )
-#define DECL_FIXEDMEMPOOL_NEW_IMPL( Class ) \
-void * Class::operator new( size_t n )
-
#define IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \
{ \
if ( n == sizeof( Class ) ) \
@@ -54,16 +51,9 @@ void * Class::operator new( size_t n )
return ::operator new(n); \
}
-#define DECL_FIXEDMEMPOOL_NEW_INLINE( Class, aPool ) \
-DECL_FIXEDMEMPOOL_NEW_DECL() \
-IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool )
-
#define DECL_FIXEDMEMPOOL_DEL_DECL() \
static void operator delete( void * p, size_t n )
-#define DECL_FIXEDMEMPOOL_DEL_IMPL( Class ) \
-void Class::operator delete( void * p, size_t n )
-
#define IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool ) \
{ \
if ( n == sizeof( Class ) ) \
@@ -72,16 +62,14 @@ void Class::operator delete( void * p, size_t n )
::operator delete(p); \
}
-#define DECL_FIXEDMEMPOOL_DEL_INLINE( Class, aPool ) \
-DECL_FIXEDMEMPOOL_DEL_DECL() \
-IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
-
#define DECL_FIXEDMEMPOOL_NEWDEL( Class ) \
private: \
static FixedMemPool aPool; \
public: \
- DECL_FIXEDMEMPOOL_NEW_INLINE( Class, aPool ) \
- DECL_FIXEDMEMPOOL_DEL_INLINE( Class, aPool )
+ DECL_FIXEDMEMPOOL_NEW_DECL() \
+ IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \
+ DECL_FIXEDMEMPOOL_DEL_DECL() \
+ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
#define IMPL_FIXEDMEMPOOL_NEWDEL( Class ) \
FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) );
@@ -95,9 +83,9 @@ IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
#define IMPL_FIXEDMEMPOOL_NEWDEL_DLL( Class ) \
FixedMemPool Class::aPool( SAL_STRINGIFY( Class ), sizeof( Class ) ); \
- DECL_FIXEDMEMPOOL_NEW_IMPL( Class ) \
+ void * Class::operator new( size_t n ) \
IMPL_FIXEDMEMPOOL_NEW_BODY( Class, aPool ) \
- DECL_FIXEDMEMPOOL_DEL_IMPL( Class ) \
+ void Class::operator delete( void * p, size_t n ) \
IMPL_FIXEDMEMPOOL_DEL_BODY( Class, aPool )
#endif
diff --git a/include/tools/pstm.hxx b/include/tools/pstm.hxx
index ffbaac1..b948f15 100644
--- a/include/tools/pstm.hxx
+++ b/include/tools/pstm.hxx
@@ -59,7 +59,7 @@ public:
virtual void Load( SvPersistStream & ) override; \
virtual void Save( SvPersistStream & ) override;
-#define PRV_SV_IMPL_PERSIST( Class ) \
+#define SV_IMPL_PERSIST1( Class, Super1 ) \
void * Class::CreateInstance( SvPersistBase ** ppBase )\
{ \
Class * p = new Class(); \
@@ -76,9 +76,6 @@ public:
return rStm; \
}
-#define SV_IMPL_PERSIST1( Class, Super1 ) \
- PRV_SV_IMPL_PERSIST( Class )
-
class SvPersistStream;
class SvPersistBase : public SvRttiBase
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 483be34..57de0ed 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -185,16 +185,6 @@ Class::getSupportedServiceNames() \
return getSupportedServiceNames_Static(); \
}
-#define XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \
-static css::uno::Reference< css::uno::XInterface > SAL_CALL \
-Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \
- throw( css::uno::Exception ) \
-{ \
- css::lang::XServiceInfo* pX = \
- static_cast<css::lang::XServiceInfo*>(new Class( rSMgr )); \
- return css::uno::Reference< css::uno::XInterface >::query( pX ); \
-}
-
#define XSERVICEINFO_CREATE_INSTANCE_IMPL_CTX( Class ) \
static css::uno::Reference< css::uno::XInterface > SAL_CALL \
Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \
@@ -254,15 +244,20 @@ Class::getSupportedServiceNames_Static()
// 1 service name
#define XSERVICEINFO_IMPL_1( Class, ImplName, Service1 ) \
-XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
-XSERVICEINFO_CREATE_INSTANCE_IMPL( Class ) \
- \
-css::uno::Sequence< OUString > \
-Class::getSupportedServiceNames_Static() \
-{ \
- css::uno::Sequence< OUString > aSNS { Service1 }; \
- return aSNS; \
-}
+ XSERVICEINFO_COMMOM_IMPL( Class, ImplName ) \
+ static css::uno::Reference< css::uno::XInterface > SAL_CALL \
+ Class##_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) \
+ throw( css::uno::Exception ) \
+ { \
+ css::lang::XServiceInfo* pX = \
+ static_cast<css::lang::XServiceInfo*>(new Class( rSMgr )); \
+ return css::uno::Reference< css::uno::XInterface >::query( pX ); \
+ } \
+ css::uno::Sequence< OUString > \
+ Class::getSupportedServiceNames_Static() \
+ { \
+ return css::uno::Sequence< OUString > { Service1 }; \
+ }
// 1 service name
#define XSERVICEINFO_IMPL_1_CTX( Class, ImplName, Service1 ) \
diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx
index 1ec9915..d722007 100644
--- a/include/vbahelper/vbahelperinterface.hxx
+++ b/include/vbahelper/vbahelperinterface.hxx
@@ -108,33 +108,6 @@ public:
};
-/** Helper macro to implement the method 'getServiceImplName()' of the
- 'ooo.vba.XHelperInterface' interface. Will return the class name as service
- implementation name.
- */
-#define VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \
-OUString classname::getServiceImplName() \
-{ \
- return OUString( #classname ); \
-}
-
-
-/** Helper macro to implement the method 'getServiceNames()' for a single
- service name.
- */
-#define VBAHELPER_IMPL_GETSERVICENAMES( classname, servicename ) \
-css::uno::Sequence< OUString > classname::getServiceNames() \
-{ \
- static css::uno::Sequence< OUString > saServiceNames; \
- if( saServiceNames.getLength() == 0 ) \
- { \
- saServiceNames.realloc( 1 ); \
- saServiceNames[ 0 ] = servicename; \
- } \
- return saServiceNames; \
-}
-
-
/** Helper macro to declare the methods 'getServiceImplName()' and
'getServiceNames()' of the 'ooo.vba.XHelperInterface' interface in a class
declaration.
@@ -149,8 +122,20 @@ css::uno::Sequence< OUString > classname::getServiceNames() \
return the class name as service implementation name.
*/
#define VBAHELPER_IMPL_XHELPERINTERFACE( classname, servicename ) \
-VBAHELPER_IMPL_GETSERVICEIMPLNAME( classname ) \
-VBAHELPER_IMPL_GETSERVICENAMES( classname, servicename )
+OUString classname::getServiceImplName() \
+{ \
+ return OUString( #classname ); \
+} \
+css::uno::Sequence< OUString > classname::getServiceNames() \
+{ \
+ static css::uno::Sequence< OUString > saServiceNames; \
+ if( saServiceNames.getLength() == 0 ) \
+ { \
+ saServiceNames.realloc( 1 ); \
+ saServiceNames[ 0 ] = servicename; \
+ } \
+ return saServiceNames; \
+}
#endif
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 5f2199f..5af495f 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -141,7 +141,7 @@ void SAL_CALL DocumentPropertiesImport::importProperties(
aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE_STRICT( "metadata/core-properties" ) );
// MS Office seems to have a bug, so we have to do similar handling
if( !aCoreStreams.hasElements() )
- aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_PACKAGE_RELATION_TYPE( "metadata/core-properties" ) );
+ aCoreStreams = lclGetRelatedStreams( rxSource, "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties" );
Sequence< InputSource > aExtStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "extended-properties" ) );
// OOXML strict
diff --git a/sc/source/ui/dbgui/outline.src b/sc/source/ui/dbgui/outline.src
index 1434634..a1f9fec 100644
--- a/sc/source/ui/dbgui/outline.src
+++ b/sc/source/ui/dbgui/outline.src
@@ -22,15 +22,12 @@
// Imageliste hier, damit sie nicht in ui.src beim Zusammenbauen der
// "echten" Imagelisten stoert
-#define OUTLINE_ID_LIST \
- IdList = { 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; }; \
- IdCount = { 12; };
-
ImageList RID_OUTLINEBITMAPS
{
Prefix = "ou";
MaskColor = STD_MASKCOLOR;
- OUTLINE_ID_LIST
+ IdList = { 1; 2; 3; 4; 5; 6; 7; 8; 9; 10; 11; 12; };
+ IdCount = { 12; };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index 7b68de7..64335b0 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -19,34 +19,6 @@
#include "navipi.hrc"
-#define SC_NAVI_CMD_IDLIST \
- IdList = \
- { \
- IID_DATA ; \
- IID_UP ; \
- IID_DOWN ; \
- IID_SCENARIOS ; \
- IID_DROPMODE ; \
- IID_CHANGEROOT ; \
- IID_ZOOMOUT ; \
- }; \
- IdCount = { 8 ; };
-
-// SC_CONTENT_...
-#define SC_NAVI_CONT_IDLIST \
- IdList = \
- { \
- 1 ; \
- 2 ; \
- 3 ; \
- 4 ; \
- 5 ; \
- 6 ; \
- 7 ; \
- 8 ; \
- }; \
- IdCount = { 8 ; };
-
Window RID_SCDLG_NAVIGATOR
{
SVLook = TRUE ;
@@ -118,7 +90,17 @@ Window RID_SCDLG_NAVIGATOR
{
Prefix = "na";
MaskColor = STD_MASKCOLOR ;
- SC_NAVI_CMD_IDLIST
+ IdList =
+ {
+ IID_DATA ;
+ IID_UP ;
+ IID_DOWN ;
+ IID_SCENARIOS ;
+ IID_DROPMODE ;
+ IID_CHANGEROOT ;
+ IID_ZOOMOUT ;
+ };
+ IdCount = { 8 ; };
};
ToolBox TBX_CMD
{
@@ -218,7 +200,19 @@ ImageList RID_IMAGELIST_NAVCONT
{
Prefix = "nc";
MaskColor = STD_MASKCOLOR ;
- SC_NAVI_CONT_IDLIST
+ // SC_CONTENT_...
+ IdList =
+ {
+ 1 ;
+ 2 ;
+ 3 ;
+ 4 ;
+ 5 ;
+ 6 ;
+ 7 ;
+ 8 ;
+ };
+ IdCount = { 8 ; };
};
Image RID_IMG_DROP_URL
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index a138c19..c81f408 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -267,12 +267,6 @@ Bitmap BMP_GRAPHIC
File = "graphic.bmp" ;
};
-#define SfxStyleFamiliesRes1\
- Text [ en-US ] = "Graphic Styles" ;\
-
-#define SfxStyleFamiliesRes2\
- Text [ en-US ] = "Presentation Styles" ;\
-
String STR_STYLE_FILTER_USED
{
Text [ en-US ] = "Applied Styles" ;
@@ -292,7 +286,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
{
SfxStyleFamilyItem RID_GRAPHICSTYLEFAMILY
{
- SfxStyleFamiliesRes1
+ Text [ en-US ] = "Graphic Styles" ;
StyleFamily = SFX_STYLE_FAMILY_PARA ;
FilterList [ en-US ] =
{
@@ -304,7 +298,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
};
SfxStyleFamilyItem RID_PRESENTATIONSTYLEFAMILY
{
- SfxStyleFamiliesRes2
+ Text [ en-US ] = "Presentation Styles" ;
StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
FilterList [ en-US ] =
{
diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src
index 96eb7c9..9ea6100 100644
--- a/svx/source/dialog/imapdlg.src
+++ b/svx/source/dialog/imapdlg.src
@@ -20,34 +20,31 @@
#include "helpid.hrc"
#include "imapdlg.hrc"
-#define IMAPDLG_IDLIST \
- IdList = \
- { \
- TBI_APPLY ; \
- TBI_OPEN ; \
- TBI_SAVEAS ; \
- TBI_SELECT ; \
- TBI_RECT ; \
- TBI_CIRCLE ; \
- TBI_POLY ; \
- TBI_FREEPOLY ; \
- TBI_POLYEDIT ; \
- TBI_POLYMOVE ; \
- TBI_POLYINSERT ; \
- TBI_POLYDELETE ; \
- TBI_UNDO ; \
- TBI_REDO ; \
- TBI_ACTIVE ; \
- TBI_MACRO ; \
- TBI_PROPERTY ; \
- }; \
- IdCount = { 17 ; };
-
ImageList IL_IMAPDLG
{
Prefix = "id";
MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ;
- IMAPDLG_IDLIST
+ IdList =
+ {
+ TBI_APPLY ;
+ TBI_OPEN ;
+ TBI_SAVEAS ;
+ TBI_SELECT ;
+ TBI_RECT ;
+ TBI_CIRCLE ;
+ TBI_POLY ;
+ TBI_FREEPOLY ;
+ TBI_POLYEDIT ;
+ TBI_POLYMOVE ;
+ TBI_POLYINSERT ;
+ TBI_POLYDELETE ;
+ TBI_UNDO ;
+ TBI_REDO ;
+ TBI_ACTIVE ;
+ TBI_MACRO ;
+ TBI_PROPERTY ;
+ };
+ IdCount = { 17 ; };
};
/******************************************************************************/
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index f594111..8a18f61 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -1161,11 +1161,6 @@ extern SwRectFn fnRectHori, fnRectVert, fnRectB2T, fnRectVL2R, fnRectVertL2R;
fnRect = bVert ? \
( bRev ? fnRectVL2R : ( bVertL2R ? fnRectVertL2R : fnRectVert ) ): \
( bRev ? fnRectB2T : fnRectHori ); }
-#define SWRECTFN2( pFrame ) bool bVert = pFrame->IsVertical(); \
- bool bVertL2R = pFrame->IsVertLR(); \
- bool bNeighb = pFrame->IsNeighbourFrame(); \
- SwRectFn fnRect = bVert == bNeighb ? \
- fnRectHori : ( bVertL2R ? fnRectVertL2R : fnRectVert );
#define POS_DIFF( aFrame1, aFrame2 ) \
( (aFrame1.*fnRect->fnGetTop)() != (aFrame2.*fnRect->fnGetTop)() || \
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 23d586b..832a2b6 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -453,7 +453,10 @@ Size SwFrame::ChgSize( const Size& aNewSize )
if ( GetUpper() )
{
- SWRECTFN2( this )
+ bool bNeighb = IsNeighbourFrame();
+ SwRectFn fnRect = IsVertical() == bNeighb ?
+ fnRectHori : ( IsVertLR() ? fnRectVertL2R : fnRectVert );
+
SwRect aNew( Point(0,0), aNewSize );
(maFrame.*fnRect->fnSetWidth)( (aNew.*fnRect->fnGetWidth)() );
long nNew = (aNew.*fnRect->fnGetHeight)();
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 3bc37bb..d6dac73 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -29,66 +29,63 @@
Description: Menu Window
------------------------------------------------------------------------*/
-#define MN_ANNOTATIONS \
- MenuItem\
- {\
- Identifier = FN_REPLY ;\
- HelpID = CMD_FN_REPLY ;\
- Text [ en-US ] = "Reply" ;\
- };\
- SEPARATOR ; \
- MenuItem\
- {\
- Identifier = FN_DELETE_COMMENT ;\
- HelpID = CMD_FN_DELETE_COMMENT ;\
- Text [ en-US ] = "Delete ~Comment" ;\
- };\
- MenuItem\
- {\
- Identifier = FN_DELETE_NOTE_AUTHOR ;\
- HelpId = CMD_FN_DELETE_NOTE_AUTHOR ;\
- Text [ en-US ] = "Delete ~All Comments by $1" ;\
- };\
- MenuItem\
- {\
- Identifier = FN_DELETE_ALL_NOTES ;\
- HelpId = CMD_FN_DELETE_ALL_NOTES ;\
- Text [ en-US ] = "~Delete All Comments" ;\
- };\
- MenuItem\
- {\
- Identifier = FN_FORMAT_ALL_NOTES ;\
- HelpId = CMD_FN_FORMAT_ALL_NOTES ;\
- Text [ en-US ] = "~Format All Comments..." ;\
- };\
- /*
- MenuItem\
- {\
- Identifier = FN_HIDE_NOTE ;\
- HelpId = CMD_FN_HIDE_NOTE ;\
- Text [ en-US ] = "~Hide comment" ;\
- };\
- MenuItem\
- {\
- Identifier = FN_HIDE_NOTE_AUTHOR ;\
- HelpId = CMD_FN_HIDE_NOTE_AUTHOR ;\
- Text [ en-US ] = "Hide ~author" ;\
- };\
- MenuItem\
- {\
- Identifier = FN_HIDE_ALL_NOTES ;\
- HelpId = CMD_FN_HIDE_ALL_NOTES ;\
- Text [ en-US ] = "Hide all ~comments" ;\
- };
- */
-
/*--Popups---------------------------------------------------------------*/
Menu MN_ANNOTATION_BUTTON
{
ItemList =
{
- MN_ANNOTATIONS
+ MenuItem
+ {
+ Identifier = FN_REPLY ;
+ HelpID = CMD_FN_REPLY ;
+ Text [ en-US ] = "Reply" ;
+ };
+ SEPARATOR ;
+ MenuItem
+ {
+ Identifier = FN_DELETE_COMMENT ;
+ HelpID = CMD_FN_DELETE_COMMENT ;
+ Text [ en-US ] = "Delete ~Comment" ;
+ };
+ MenuItem
+ {
+ Identifier = FN_DELETE_NOTE_AUTHOR ;
+ HelpId = CMD_FN_DELETE_NOTE_AUTHOR ;
+ Text [ en-US ] = "Delete ~All Comments by $1" ;
+ };
+ MenuItem
+ {
+ Identifier = FN_DELETE_ALL_NOTES ;
+ HelpId = CMD_FN_DELETE_ALL_NOTES ;
+ Text [ en-US ] = "~Delete All Comments" ;
+ };
+ MenuItem
+ {
+ Identifier = FN_FORMAT_ALL_NOTES ;
+ HelpId = CMD_FN_FORMAT_ALL_NOTES ;
+ Text [ en-US ] = "~Format All Comments..." ;
+ };
+ /*
+ MenuItem
+ {
+ Identifier = FN_HIDE_NOTE ;
+ HelpId = CMD_FN_HIDE_NOTE ;
+ Text [ en-US ] = "~Hide comment" ;
+ };
+ MenuItem
+ {
+ Identifier = FN_HIDE_NOTE_AUTHOR ;
+ HelpId = CMD_FN_HIDE_NOTE_AUTHOR ;
+ Text [ en-US ] = "Hide ~author" ;
+ };
+ MenuItem
+ {
+ Identifier = FN_HIDE_ALL_NOTES ;
+ HelpId = CMD_FN_HIDE_ALL_NOTES ;
+ Text [ en-US ] = "Hide all ~comments" ;
+ };
+ */
};
};
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index 80eca77..77098a9 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -324,22 +324,19 @@ String STR_HYPH_TITLE
Text [ en-US ] = "Hyphenation";
};
-#define IMGLIST_IDS\
- IdList = \
- { \
- IMG_COLLAPSE;\
- IMG_EXPAND ;\
- IMG_DB ;\
- IMG_DBTABLE ;\
- IMG_DBQUERY ;\
- }; \
- IdCount = 5
-
ImageList ILIST_DB_DLG
{
Prefix = "sx";
MaskColor = IMAGE_MASK_COLOR;
- IMGLIST_IDS;
+ IdList =
+ {
+ IMG_COLLAPSE;
+ IMG_EXPAND ;
+ IMG_DB ;
+ IMG_DBTABLE ;
+ IMG_DBQUERY ;
+ };
+ IdCount = 5;
};
Image IMG_VIEWLAYOUT_AUTOMATIC
{
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
index 68b37f0..b3ea062 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ b/sw/source/uibase/dbui/mailmergechildwindow.src
@@ -30,19 +30,16 @@ String ST_CONTINUE
Text[ en-US ] = "~Continue";
};
-#define IMGLIST2_IDS\
- IdList = \
- { \
- FN_FORMULA_CANCEL ;\
- FN_FORMULA_APPLY ;\
- }; \
- IdCount = 2
-
ImageList ILIST
{
Prefix = "sc";
MaskColor = IMAGE_MASK_COLOR;
- IMGLIST2_IDS;
+ IdList =
+ {
+ FN_FORMULA_CANCEL ;
+ FN_FORMULA_APPLY ;
+ };
+ IdCount = 2;
};
String ST_TASK
diff --git a/sw/source/uibase/dialog/regionsw.src b/sw/source/uibase/dialog/regionsw.src
index 1e99ba9..a9770e1 100644
--- a/sw/source/uibase/dialog/regionsw.src
+++ b/sw/source/uibase/dialog/regionsw.src
@@ -22,21 +22,18 @@
#include "globals.hrc"
#include "helpid.h"
-#define DLG_IMAGE_IDLIST \
- IdList = \
- { \
- BMP_HIDE /*1*/ ;\
- BMP_NO_HIDE /*2*/ ;\
- BMP_PROT_HIDE /*3*/ ;\
- BMP_PROT_NO_HIDE /*4*/ ;\
- }; \
- IdCount = { 4 ; };
-
ImageList IL_SECTION_BITMAPS
{
Prefix = "re";
MaskColor = IMAGE_MASK_COLOR ;
- DLG_IMAGE_IDLIST
+ IdList =
+ {
+ BMP_HIDE /*1*/ ;
+ BMP_NO_HIDE /*2*/ ;
+ BMP_PROT_HIDE /*3*/ ;
+ BMP_PROT_NO_HIDE /*4*/ ;
+ };
+ IdCount = { 4 ; };
};
String STR_REG_DUPLICATE
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 21a5a77..83f3aad 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -170,7 +170,10 @@ public:
SfxBindings*,
SfxChildWinInfo* );
- SFX_DECL_CHILDWINDOW_CONTEXT( SwNavigationChild )
+ //! soon obsolete !
+ static SfxChildWindowContext* CreateImpl(vcl::Window *pParent,
+ SfxBindings *pBindings, SfxChildWinInfo* pInfo );
+ static void RegisterChildWindowContext(SfxModule *pMod=nullptr);
};
#endif
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
index ba22b8b..5aefe65 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -23,37 +23,34 @@
#include "helpid.h"
#include "cmdid.h"
-#define SCROLL_IMAGE_IDLIST \
- IdList = \
- { \
- NID_NEXT ; \
- NID_PREV ; \
- NID_TBL ; \
- NID_FRM ; \
- NID_PGE ; \
- NID_DRW ; \
- NID_CTRL ; \
- NID_REG ; \
- NID_BKM ; \
- NID_GRF ; \
- NID_OLE ; \
- NID_OUTL ; \
- NID_SEL ; \
- NID_FTN ; \
- NID_MARK ; \
- NID_POSTIT ; \
- NID_SRCH_REP ; \
- NID_INDEX_ENTRY; \
- NID_TABLE_FORMULA; \
- NID_TABLE_FORMULA_ERROR; \
- }; \
- IdCount = { 20 ; };
-
ImageList IL_VALUES
{
Prefix = "sr";
MaskColor = IMAGE_MASK_COLOR ;
- SCROLL_IMAGE_IDLIST
+ IdList =
+ {
+ NID_NEXT ;
+ NID_PREV ;
+ NID_TBL ;
+ NID_FRM ;
+ NID_PGE ;
+ NID_DRW ;
+ NID_CTRL ;
+ NID_REG ;
+ NID_BKM ;
+ NID_GRF ;
+ NID_OLE ;
+ NID_OUTL ;
+ NID_SEL ;
+ NID_FTN ;
+ NID_MARK ;
+ NID_POSTIT ;
+ NID_SRCH_REP ;
+ NID_INDEX_ENTRY;
+ NID_TABLE_FORMULA;
+ NID_TABLE_FORMULA_ERROR;
+ };
+ IdCount = { 20 ; };
};
String ST_TBL
{
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 70fdbd2..08cba78 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -60,7 +60,23 @@
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::frame;
-SFX_IMPL_CHILDWINDOW_CONTEXT( SwNavigationChild, SID_NAVIGATOR, SwView )
+//! soon obsolete !
+SfxChildWindowContext* SwNavigationChild::CreateImpl( vcl::Window *pParent,
+ SfxBindings *pBindings, SfxChildWinInfo* pInfo )
+{
+ SfxChildWindowContext *pContext = new SwNavigationChild(pParent,
+ /* cast is safe here! */static_cast< sal_uInt16 >(SwView::GetInterfaceId()),
+ pBindings,pInfo);
+ return pContext;
+}
+void SwNavigationChild::RegisterChildWindowContext(SfxModule* pMod)
+{
+ SfxChildWinContextFactory *pFact = new SfxChildWinContextFactory(
+ SwNavigationChild::CreateImpl,
+ /* cast is safe here! */static_cast< sal_uInt16 >(SwView::GetInterfaceId()) );
+ SfxChildWindowContext::RegisterChildWindowContext(pMod, SID_NAVIGATOR, pFact);
+}
+
// Filter the control characters out of the Outline-Entry
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index c1463cd..5d09491 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -37,39 +37,37 @@ Window DLG_NAVIGATION_PI
{
198;
};
-#define NAVI_IDLIST \
- IdList = \
- { \
- FN_UP ; \
- FN_DOWN ; \
- FN_SELECT_HEADER ; \
- FN_SELECT_FOOTER ; \
- FN_SELECT_FOOTNOTE ; \
- FN_SHOW_CONTENT_BOX ; \
- FN_SHOW_ROOT ; \
- FN_ITEM_UP ; \
- FN_ITEM_DOWN ; \
- FN_ITEM_LEFT ; \
- FN_ITEM_RIGHT ; \
- FN_DROP_REGION ; \
- FN_OUTLINE_LEVEL ; \
- FN_SELECT_SET_AUTO_BOOKMARK ; \
- FN_DROP_REGION_LINK ; \
- FN_DROP_REGION_COPY ; \
- FN_GLOBAL_SWITCH ; \
- FN_GLOBAL_EDIT ; \
- FN_GLOBAL_UPDATE ; \
- FN_GLOBAL_OPEN ; \
- FN_GLOBAL_SAVE_CONTENT ; \
- FN_CREATE_NAVIGATION ; \
- }; \
- IdCount = { 21 ; };
ImageList IL_CONTENT
{
Prefix = "sc";
MaskColor = IMAGE_MASK_COLOR ;
- NAVI_IDLIST
+ IdList =
+ {
+ FN_UP ;
+ FN_DOWN ;
+ FN_SELECT_HEADER ;
+ FN_SELECT_FOOTER ;
+ FN_SELECT_FOOTNOTE ;
+ FN_SHOW_CONTENT_BOX ;
+ FN_SHOW_ROOT ;
+ FN_ITEM_UP ;
+ FN_ITEM_DOWN ;
+ FN_ITEM_LEFT ;
+ FN_ITEM_RIGHT ;
+ FN_DROP_REGION ;
+ FN_OUTLINE_LEVEL ;
+ FN_SELECT_SET_AUTO_BOOKMARK ;
+ FN_DROP_REGION_LINK ;
+ FN_DROP_REGION_COPY ;
+ FN_GLOBAL_SWITCH ;
+ FN_GLOBAL_EDIT ;
+ FN_GLOBAL_UPDATE ;
+ FN_GLOBAL_OPEN ;
+ FN_GLOBAL_SAVE_CONTENT ;
+ FN_CREATE_NAVIGATION ;
+ };
+ IdCount = { 21 ; };
};
Toolbox TB_CONTENT
{
@@ -312,29 +310,27 @@ Window DLG_NAVIGATION_PI
Value = 5 ;
};
};
-#define NAVI_ENTRY_IDS \
- IdList = \
- { \
- 20000 ; \
- 20001 ; \
- 20002 ; \
- 20003 ; \
- 20004 ; \
- 20005 ; \
- 20006 ; \
- 20007 ; \
- 20008 ; \
- 20009 ; \
- 20010 ; \
- 20011 ; \
- }; \
- IdCount = { 12 ; };
ImageList IMG_NAVI_ENTRYBMP
{
Prefix = "nc";
MaskColor = IMAGE_MASK_COLOR ;
- NAVI_ENTRY_IDS
+ IdList =
+ {
+ 20000 ;
+ 20001 ;
+ 20002 ;
+ 20003 ;
+ 20004 ;
+ 20005 ;
+ 20006 ;
+ 20007 ;
+ 20008 ;
+ 20009 ;
+ 20010 ;
+ 20011 ;
+ };
+ IdCount = { 12 ; };
};
String STR_ACCESS_TL_GLOBAL
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 844dea9..a4f809c 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -104,7 +104,7 @@ XTYPEPROVIDER_IMPL_4( ContentProvider,
XSERVICEINFO_IMPL_1_CTX(
ContentProvider,
OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ),
- TDOC_CONTENT_PROVIDER_SERVICE_NAME );
+ "com.sun.star.ucb.TransientDocumentsContentProvider" );
// Service factory implementation.
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 68b3950..d119c8d 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -39,9 +39,6 @@ namespace com { namespace sun { namespace star { namespace frame {
namespace tdoc_ucp {
-#define TDOC_CONTENT_PROVIDER_SERVICE_NAME \
- "com.sun.star.ucb.TransientDocumentsContentProvider"
-
#define TDOC_ROOT_CONTENT_TYPE \
"application/" TDOC_URL_SCHEME "-root"
#define TDOC_DOCUMENT_CONTENT_TYPE \
More information about the Libreoffice-commits
mailing list