dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 10 ++
dbaccess/source/core/api/query.cxx | 17 +++
dbaccess/source/core/api/querydescriptor.cxx | 9 +-
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 9 +-
dbaccess/source/core/dataaccess/commandcontainer.cxx | 8 +
dbaccess/source/core/dataaccess/commanddefinition.cxx | 8 +
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 9 +-
dbaccess/source/core/dataaccess/documentcontainer.cxx | 9 +-
dbaccess/source/core/dataaccess/documentdefinition.cxx | 9 +-
dbaccess/source/filter/xml/xmlHelper.cxx | 71 +++++++++-------
dbaccess/source/inc/apitools.hxx | 31 ------
dbaccess/source/ui/uno/ColumnModel.cxx | 8 +
12 files changed, 125 insertions(+), 73 deletions(-)
New commits:
commit 10649a5b3a3813915969ace07ac4ddaafe709718
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Tue Nov 9 22:01:26 2021 +0100
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Wed Nov 10 16:30:46 2021 +0100
Replace some macros in dbaccess part 2
Remove MAP_CONST_TEXT + MAP_CONST_ROW
+ IMPLEMENT_SERVICE_INFO3 + IMPLEMENT_GETTYPES3 + IMPLEMENT_GETTYPES2
Change-Id: I56e96a782eda1e570a43cb6bad3fa5e52bc08d2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124960
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 31455e055727..94ddd8600a8a 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -285,7 +285,15 @@ css::uno::Sequence<sal_Int8>
OSingleSelectQueryComposer::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES3(OSingleSelectQueryComposer,OSubComponent,OSingleSelectQueryComposer_BASE,OPropertyContainer)
+css::uno::Sequence< css::uno::Type > OSingleSelectQueryComposer::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OSubComponent::getTypes( ),
+ OSingleSelectQueryComposer_BASE::getTypes( ),
+ OPropertyContainer::getTypes( )
+ );
+}
+
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
// XSingleSelectQueryAnalyzer
diff --git a/dbaccess/source/core/api/query.cxx
b/dbaccess/source/core/api/query.cxx
index cc5e7753b262..ebaba24a2a9d 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -105,7 +105,15 @@ css::uno::Sequence<sal_Int8> OQuery::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES3(OQuery,OQueryDescriptor_Base,ODataSettings,OContentHelper);
+css::uno::Sequence< css::uno::Type > OQuery::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OQueryDescriptor_Base::getTypes( ),
+ ODataSettings::getTypes( ),
+ OContentHelper::getTypes( )
+ );
+}
+
IMPLEMENT_FORWARD_XINTERFACE3(
OQuery,OContentHelper,OQueryDescriptor_Base,ODataSettings)
void OQuery::rebuildColumns()
@@ -204,7 +212,12 @@ void OQuery::rebuildColumns()
}
// XServiceInfo
-IMPLEMENT_SERVICE_INFO3(OQuery, "com.sun.star.sdb.dbaccess.OQuery",
SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERY, "com.sun.star.sdb.QueryDefinition")
+IMPLEMENT_SERVICE_INFO_IMPLNAME(OQuery, "com.sun.star.sdb.dbaccess.OQuery")
+IMPLEMENT_SERVICE_INFO_SUPPORTS(OQuery)
+css::uno::Sequence< OUString > SAL_CALL OQuery::getSupportedServiceNames( )
+{
+ return { SERVICE_SDB_DATASETTINGS, SERVICE_SDB_QUERY,
"com.sun.star.sdb.QueryDefinition" };
+}
// css::beans::XPropertyChangeListener
void SAL_CALL OQuery::propertyChange( const PropertyChangeEvent& _rSource )
diff --git a/dbaccess/source/core/api/querydescriptor.cxx
b/dbaccess/source/core/api/querydescriptor.cxx
index 9a70092512e0..52948614519a 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -63,7 +63,14 @@ css::uno::Sequence<sal_Int8>
OQueryDescriptor::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES2(OQueryDescriptor,OQueryDescriptor_Base,ODataSettings);
+css::uno::Sequence< css::uno::Type > OQueryDescriptor::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OQueryDescriptor_Base::getTypes( ),
+ ODataSettings::getTypes( )
+ );
+}
+
IMPLEMENT_FORWARD_XINTERFACE3(
OQueryDescriptor,OWeakObject,OQueryDescriptor_Base,ODataSettings)
void OQueryDescriptor::registerProperties()
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 629727930859..258cfc473a90 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -142,7 +142,14 @@ css::uno::Sequence<sal_Int8>
OComponentDefinition::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES3(OComponentDefinition,ODataSettings,OContentHelper,OComponentDefinition_BASE);
+css::uno::Sequence< css::uno::Type > OComponentDefinition::getTypes()
+{
+ return ::comphelper::concatSequences(
+ ODataSettings::getTypes( ),
+ OContentHelper::getTypes( ),
+ OComponentDefinition_BASE::getTypes( )
+ );
+}
IMPLEMENT_FORWARD_XINTERFACE3(
OComponentDefinition,OContentHelper,ODataSettings,OComponentDefinition_BASE)
OUString SAL_CALL OComponentDefinition::getImplementationName()
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx
b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 55087272b992..8afb81520e2d 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -52,7 +52,13 @@ OCommandContainer::~OCommandContainer()
}
IMPLEMENT_FORWARD_XINTERFACE2(
OCommandContainer,ODefinitionContainer,OCommandContainer_BASE)
-IMPLEMENT_GETTYPES2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE);
+css::uno::Sequence< css::uno::Type > OCommandContainer::getTypes()
+{
+ return ::comphelper::concatSequences(
+ ODefinitionContainer::getTypes( ),
+ OCommandContainer_BASE::getTypes( )
+ );
+}
css::uno::Sequence<sal_Int8> OCommandContainer::getImplementationId()
{
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx
b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 41ce139a8dc1..2a5397018b0e 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -81,7 +81,13 @@ css::uno::Sequence<sal_Int8>
OCommandDefinition::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES2(OCommandDefinition,OCommandDefinition_Base,OComponentDefinition);
+css::uno::Sequence< css::uno::Type > OCommandDefinition::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OCommandDefinition_Base::getTypes( ),
+ OComponentDefinition::getTypes( )
+ );
+}
IMPLEMENT_FORWARD_XINTERFACE2(
OCommandDefinition,OComponentDefinition,OCommandDefinition_Base)
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2(OCommandDefinition,OCommandDefinition_PROP)
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 5b3772983d7c..53824f87388f 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -135,7 +135,14 @@ ODefinitionContainer::~ODefinitionContainer()
}
IMPLEMENT_FORWARD_XINTERFACE2(
ODefinitionContainer,OContentHelper,ODefinitionContainer_Base)
-IMPLEMENT_GETTYPES2(ODefinitionContainer,OContentHelper,ODefinitionContainer_Base);
+css::uno::Sequence< css::uno::Type > ODefinitionContainer::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OContentHelper::getTypes( ),
+ ODefinitionContainer_Base::getTypes( )
+ );
+}
+
css::uno::Sequence<sal_Int8> ODefinitionContainer::getImplementationId()
{
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 07c669e70fd9..8267b0a571ee 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -115,7 +115,14 @@ css::uno::Sequence<sal_Int8>
ODocumentContainer::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES3(ODocumentContainer,ODefinitionContainer,OPropertyStateContainer,ODocumentContainer_Base);
+css::uno::Sequence< css::uno::Type > ODocumentContainer::getTypes()
+{
+ return ::comphelper::concatSequences(
+ ODefinitionContainer::getTypes( ),
+ OPropertyStateContainer::getTypes( ),
+ ODocumentContainer_Base::getTypes( )
+ );
+}
IMPLEMENT_SERVICE_INFO_IMPLNAME(ODocumentContainer,
"com.sun.star.comp.dba.ODocumentContainer");
IMPLEMENT_SERVICE_INFO_SUPPORTS(ODocumentContainer);
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(ODocumentContainer)
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 4bc72018b873..e4dc881a1a63 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -475,7 +475,14 @@ css::uno::Sequence<sal_Int8>
ODocumentDefinition::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES3(ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base);
+css::uno::Sequence< css::uno::Type > ODocumentDefinition::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OContentHelper::getTypes( ),
+ OPropertyStateContainer::getTypes( ),
+ ODocumentDefinition_Base::getTypes( )
+ );
+}
IMPLEMENT_FORWARD_XINTERFACE3(
ODocumentDefinition,OContentHelper,OPropertyStateContainer,ODocumentDefinition_Base)
void ODocumentDefinition::registerProperties()
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx
b/dbaccess/source/filter/xml/xmlHelper.cxx
index 0501a73d160d..65227360307e 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -95,38 +95,48 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetColumnStylesPropertySetMa
rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetCellStylesPropertySetMapper( bool bForExport )
{
-#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context,
SvtSaveOptions::ODFSVER_010, false }
static const XMLPropertyMapEntry s_aCellStylesProperties[] =
{
{ PROPERTY_ALIGN, sizeof(PROPERTY_ALIGN)-1, XML_NAMESPACE_FO,
XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN|XML_TYPE_PROP_PARAGRAPH,
CTF_DB_COLUMN_TEXT_ALIGN, SvtSaveOptions::ODFSVER_010, false },
- MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE,
XML_FONT_NAME, XML_TYPE_STRING, 0 ),
- MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO,
XML_COLOR, XML_TYPE_COLOR, 0 ),
- MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
-
- MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE,
XML_FONT_RELIEF,
XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE,
XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE,
XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE,
XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE,
XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO,
XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE,
XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ),
-
- MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE,
XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE,
XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO,
XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_STYLE,
XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TYPE,
XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_WIDTH,
XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT( "CharStrikeout", XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TEXT,
XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE,
XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
- MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_STYLE,
XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_TYPE,
XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT( "CharUnderline", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_WIDTH,
XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT( "CharUnderlineColor", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_CONST_TEXT( "CharUnderlineHasColor", XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_COLOR,
XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO,
XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE,
XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_MODE,
XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ { PROPERTY_FONTNAME, sizeof(PROPERTY_FONTNAME)-1,
XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_TEXTCOLOR, sizeof(PROPERTY_TEXTCOLOR)-1, XML_NAMESPACE_FO,
XML_COLOR, XML_TYPE_COLOR|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_TEXTLINECOLOR, sizeof(PROPERTY_TEXTLINECOLOR)-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
+
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_TEXTRELIEF, sizeof(PROPERTY_TEXTRELIEF)-1,
XML_NAMESPACE_STYLE, XML_FONT_RELIEF,
+
XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_TEXTEMPHASIS, sizeof(PROPERTY_TEXTEMPHASIS)-1,
XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE,
XML_TYPE_CONTROL_TEXT_EMPHASIZE|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTCHARWIDTH, sizeof(PROPERTY_FONTCHARWIDTH)-1,
XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16|XML_TYPE_PROP_TEXT,
0 , SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTCHARSET, sizeof(PROPERTY_FONTCHARSET)-1,
XML_NAMESPACE_STYLE, XML_FONT_CHARSET,
XML_TYPE_TEXT_FONTENCODING|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTFAMILY, sizeof(PROPERTY_FONTFAMILY)-1,
XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC,
XML_TYPE_TEXT_FONTFAMILY|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTHEIGHT, sizeof(PROPERTY_FONTHEIGHT)-1,
XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTKERNING, sizeof(PROPERTY_FONTKERNING)-1,
XML_NAMESPACE_STYLE, XML_LETTER_KERNING,
+ XML_TYPE_BOOL|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTORIENTATION, sizeof(PROPERTY_FONTORIENTATION)-1,
XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE,
XML_TYPE_ROTATION_ANGLE|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTPITCH, sizeof(PROPERTY_FONTPITCH)-1,
XML_NAMESPACE_STYLE, XML_FONT_PITCH,
XML_TYPE_TEXT_FONTPITCH|XML_TYPE_PROP_TEXT, 0 , SvtSaveOptions::ODFSVER_010,
false },
+ { PROPERTY_FONTSLANT, sizeof(PROPERTY_FONTSLANT)-1, XML_NAMESPACE_FO,
XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_STYLE,
+
XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
+ { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TYPE,
+
XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
+ { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_WIDTH,
+
XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
+ { "CharStrikeout", sizeof("CharStrikeout")-1, XML_NAMESPACE_STYLE,
XML_TEXT_LINE_THROUGH_TEXT,
+
XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTSTYLENAME, sizeof(PROPERTY_FONTSTYLENAME)-1,
XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
+ { "CharUnderline", sizeof("CharUnderline")-1, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_STYLE,
+
XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { "CharUnderline", sizeof("CharUnderline")-1, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_TYPE,
+
XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { "CharUnderline", sizeof("CharUnderline")-1, XML_NAMESPACE_STYLE,
XML_TEXT_UNDERLINE_WIDTH,
+
XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { "CharUnderlineColor", sizeof("CharUnderlineColor")-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
+
XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
+ { "CharUnderlineHasColor", sizeof("CharUnderlineHasColor")-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR,
+
XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTWEIGHT, sizeof(PROPERTY_FONTWEIGHT)-1,
XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT|XML_TYPE_PROP_TEXT, 0 ,
SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTWIDTH, sizeof(PROPERTY_FONTWIDTH)-1,
XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH|XML_TYPE_PROP_TEXT, 0
, SvtSaveOptions::ODFSVER_010, false },
+ { PROPERTY_FONTWORDLINEMODE, sizeof(PROPERTY_FONTWORDLINEMODE)-1,
XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE,
+ XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY|XML_TYPE_PROP_TEXT,
0 , SvtSaveOptions::ODFSVER_010, false },
{ nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFSVER_010, false}
};
rtl::Reference < XMLPropertyHandlerFactory> xFac = new
/*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory();
@@ -135,10 +145,9 @@ rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetCellStylesPropertySetMapp
rtl::Reference < XMLPropertySetMapper >
OXMLHelper::GetRowStylesPropertySetMapper()
{
-#define MAP_CONST_ROW( name, prefix, token, type, context ) { name,
sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context,
SvtSaveOptions::ODFSVER_010, false }
static const XMLPropertyMapEntry s_aStylesProperties[] =
{
- MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE,
XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0),
+ { PROPERTY_ROW_HEIGHT, sizeof(PROPERTY_ROW_HEIGHT)-1,
XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE|XML_TYPE_PROP_TABLE_ROW,
0, SvtSaveOptions::ODFSVER_010, false },
{ nullptr, 0, 0, XML_TOKEN_INVALID, 0 , 0,
SvtSaveOptions::ODFSVER_010, false}
};
rtl::Reference < XMLPropertyHandlerFactory> xFac = new
OPropertyHandlerFactory();
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 654ed00573c2..00001864b4c8 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -96,37 +96,6 @@ public:
}
-
-#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1,
serviceasciiname2, serviceasciiname3) \
- IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- css::uno::Sequence< OUString > SAL_CALL
classname::getSupportedServiceNames( ) \
- { \
- return { serviceasciiname1, serviceasciiname2, serviceasciiname3 }; \
- } \
-
-
-// XTypeProvider helpers
-
-#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \
- css::uno::Sequence< css::uno::Type > classname::getTypes() \
- { \
- return ::comphelper::concatSequences( \
- baseclass1::getTypes( ), \
- baseclass2::getTypes( ) \
- ); \
- }
-
-#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 )
\
- css::uno::Sequence< css::uno::Type > classname::getTypes() \
- { \
- return ::comphelper::concatSequences( \
- baseclass1::getTypes( ), \
- baseclass2::getTypes( ), \
- baseclass3::getTypes( ) \
- ); \
- }
-
// helper for declaring/implementing classes based on the OPropertyContainer
and an OPropertyArrayUsageHelper
#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \
virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL
getPropertySetInfo() override; \
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx
b/dbaccess/source/ui/uno/ColumnModel.cxx
index cadc33075c9a..f2b100fe4b05 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -104,7 +104,13 @@ css::uno::Sequence<sal_Int8>
OColumnControlModel::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-IMPLEMENT_GETTYPES2(OColumnControlModel,OColumnControlModel_BASE,comphelper::OPropertyContainer)
+css::uno::Sequence< css::uno::Type > OColumnControlModel::getTypes()
+{
+ return ::comphelper::concatSequences(
+ OColumnControlModel_BASE::getTypes( ),
+ OPropertyContainer::getTypes( )
+ );
+}
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OColumnControlModel)
OUString SAL_CALL OColumnControlModel::getImplementationName()
{
