mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extensions: remove COMPMOD preprocessor defines

Browse Source 
COMPMOD_RESPREFIX=abp was unused ever since initial commit in 2001.

COMPMOD_NAMESPACE was used to set the namespace name qualifier of
the helper in componentmodule.hxx to the extension's namespace name.

I don't see why this is necessary as the helper is always compiled in
a separate extension library.

Change-Id: I287607008db3dc0ebc32731536747a921c91807d
Reviewed-on: https://gerrit.libreoffice.org/39184
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Jochen Nitschke 2017-06-23 21:25:26 +02:00 committed by Noel Grandin
parent e61c97f08e
commit 97ee2bbd40
21 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compilerplugins/clang/vclwidgets.cxx
View File

@ -373,7 +373,7 @@ bool VCLWidgets::VisitVarDecl(const VarDecl * pVarDecl) {
|| tc.Class("list").StdNamespace() || tc.Class("list").StdNamespace()
|| tc.Class("mem_fun1_t").StdNamespace() || tc.Class("mem_fun1_t").StdNamespace()
// registration template thing, doesn't actually allocate anything we need to care about // registration template thing, doesn't actually allocate anything we need to care about
|| tc.Class("OMultiInstanceAutoRegistration").Namespace("dbp").GlobalNamespace()) || tc.Class("OMultiInstanceAutoRegistration").Namespace("compmodule").GlobalNamespace())
{ {
return true; return true;
} }

5
extensions/Library_abp.mk
View File

@ -19,11 +19,6 @@ $(eval $(call gb_Library_set_include,abp,\
-I$(SRCDIR)/extensions/source/inc \ -I$(SRCDIR)/extensions/source/inc \
)) ))
$(eval $(call gb_Library_add_defs,abp,\
-DCOMPMOD_NAMESPACE=abp \
-DCOMPMOD_RESPREFIX=abp \
))
$(eval $(call gb_Library_use_external,abp,boost_headers)) $(eval $(call gb_Library_use_external,abp,boost_headers))
$(eval $(call gb_Library_use_sdk_api,abp)) $(eval $(call gb_Library_use_sdk_api,abp))

4
extensions/Library_dbp.mk
View File

@ -19,10 +19,6 @@ $(eval $(call gb_Library_set_include,dbp,\
-I$(SRCDIR)/extensions/source/inc \ -I$(SRCDIR)/extensions/source/inc \
)) ))
$(eval $(call gb_Library_add_defs,dbp,\
-DCOMPMOD_NAMESPACE=dbp \
))
$(eval $(call gb_Library_use_external,dbp,boost_headers)) $(eval $(call gb_Library_use_external,dbp,boost_headers))
$(eval $(call gb_Library_use_sdk_api,dbp)) $(eval $(call gb_Library_use_sdk_api,dbp))

8
extensions/source/abpilot/abspilot.cxx
View File

@ -105,7 +105,7 @@ namespace abp
#else #else
m_aSettings.eType = AST_OTHER; m_aSettings.eType = AST_OTHER;
#endif #endif
m_aSettings.sDataSourceName = ModuleRes(RID_STR_DEFAULT_NAME); m_aSettings.sDataSourceName = compmodule::ModuleRes(RID_STR_DEFAULT_NAME);
m_aSettings.bRegisterDataSource = false; m_aSettings.bRegisterDataSource = false;
m_aSettings.bEmbedDataSource = false; m_aSettings.bEmbedDataSource = false;
m_aSettings.bIgnoreNoTable = false; m_aSettings.bIgnoreNoTable = false;
@ -116,7 +116,7 @@ namespace abp
typeSelectionChanged( m_aSettings.eType ); typeSelectionChanged( m_aSettings.eType );
OUString sDialogTitle = ModuleRes(RID_STR_ABSOURCEDIALOGTITLE); OUString sDialogTitle = compmodule::ModuleRes(RID_STR_ABSOURCEDIALOGTITLE);
setTitleBase(sDialogTitle); setTitleBase(sDialogTitle);
SetHelpId(HID_ABSPILOT); SetHelpId(HID_ABSPILOT);
} }
@ -137,7 +137,7 @@ namespace abp
OUString sDisplayName; OUString sDisplayName;
if ( nResId ) if ( nResId )
{ {
sDisplayName = ModuleRes(nResId); sDisplayName = compmodule::ModuleRes(nResId);
} }
return sDisplayName; return sDisplayName;
@ -260,7 +260,7 @@ namespace abp
if ( aTables.empty() ) if ( aTables.empty() )
{ {
if (RET_YES != ScopedVclPtrInstance<MessageDialog>(this, ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VclButtonsType::YesNo)->Execute()) if (RET_YES != ScopedVclPtrInstance<MessageDialog>(this, compmodule::ModuleRes(( getSettings().eType == AST_EVOLUTION_GROUPWISE ? RID_STR_QRY_NO_EVO_GW : RID_STR_QRY_NOTABLES)), VclMessageType::Question, VclButtonsType::YesNo)->Execute())
{ {
// cannot ask the user, or the user chose to use this data source, though there are no tables // cannot ask the user, or the user chose to use this data source, though there are no tables
bAllow = false; bAllow = false;

2
extensions/source/abpilot/admininvokationimpl.cxx
View File

@ -74,7 +74,7 @@ namespace abp
*pArguments++ <<= PropertyValue("ParentWindow", -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE); *pArguments++ <<= PropertyValue("ParentWindow", -1, makeAny(xDialogParent), PropertyState_DIRECT_VALUE);
// the title of the dialog // the title of the dialog
OUString sAdminDialogTitle(ModuleRes(RID_STR_ADMINDIALOGTITLE)); OUString sAdminDialogTitle(compmodule::ModuleRes(RID_STR_ADMINDIALOGTITLE));
*pArguments++ <<= PropertyValue("Title", -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE); *pArguments++ <<= PropertyValue("Title", -1, makeAny(sAdminDialogTitle), PropertyState_DIRECT_VALUE);
// the name of the new data source // the name of the new data source

4
extensions/source/abpilot/datasourcehandling.cxx
View File

@ -583,8 +583,8 @@ namespace abp
{ {
// prepend some context info // prepend some context info
SQLContext aDetailedError; SQLContext aDetailedError;
aDetailedError.Message = ModuleRes(RID_STR_NOCONNECTION); aDetailedError.Message = compmodule::ModuleRes(RID_STR_NOCONNECTION);
aDetailedError.Details = ModuleRes(RID_STR_PLEASECHECKSETTINGS); aDetailedError.Details = compmodule::ModuleRes(RID_STR_PLEASECHECKSETTINGS);
aDetailedError.NextException = aError; aDetailedError.NextException = aError;
// handle (aka display) the new context info // handle (aka display) the new context info
xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) ); xInteractions->handle( new OInteractionRequest( makeAny( aDetailedError ) ) );

2
extensions/source/abpilot/fieldmappingimpl.cxx
View File

@ -73,7 +73,7 @@ namespace abp
// create an instance of the dialog service // create an instance of the dialog service
Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent ); Reference< XWindow > xDialogParent = VCLUnoHelper::GetInterface( _pParent );
OUString sTitle(ModuleRes(RID_STR_FIELDDIALOGTITLE)); OUString sTitle(compmodule::ModuleRes(RID_STR_FIELDDIALOGTITLE));
Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB, Reference< XExecutableDialog > xDialog = AddressBookSourceDialog::createWithDataSource(_rxORB,
// the parent window // the parent window
xDialogParent, xDialogParent,

2
extensions/source/abpilot/fieldmappingpage.cxx
View File

@ -67,7 +67,7 @@ namespace abp
const AddressSettings& rSettings = getSettings(); const AddressSettings& rSettings = getSettings();
OUString sHint; OUString sHint;
if ( rSettings.aFieldMapping.empty() ) if ( rSettings.aFieldMapping.empty() )
sHint = ModuleRes(RID_STR_NOFIELDSASSIGNED); sHint = compmodule::ModuleRes(RID_STR_NOFIELDSASSIGNED);
m_pHint->SetText( sHint ); m_pHint->SetText( sHint );
} }

2
extensions/source/abpilot/typeselectionpage.cxx
View File

@ -226,7 +226,7 @@ namespace abp
if (AST_INVALID == getSelectedType( )) if (AST_INVALID == getSelectedType( ))
{ {
ScopedVclPtrInstance< MessageDialog > aError(this, ModuleRes(RID_STR_NEEDTYPESELECTION)); ScopedVclPtrInstance< MessageDialog > aError(this, compmodule::ModuleRes(RID_STR_NEEDTYPESELECTION));
aError->Execute(); aError->Execute();
return false; return false;
} }

2
extensions/source/abpilot/unodialogabp.cxx
View File

@ -150,7 +150,7 @@ org_openoffice_comp_abp_OAddressBookSourcePilot(
css::uno::XComponentContext *context, css::uno::XComponentContext *context,
css::uno::Sequence<css::uno::Any> const &) css::uno::Sequence<css::uno::Any> const &)
{ {
abp::OModule::setResourceFilePrefix("abp"); compmodule::OModule::setResourceFilePrefix("abp");
return cppu::acquire(new abp::OABSPilotUno(context)); return cppu::acquire(new abp::OABSPilotUno(context));
} }

2
extensions/source/abpilot/unodialogabp.hxx
View File

@ -33,7 +33,7 @@ namespace abp
typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno > OABSPilotUno_PBase; typedef ::comphelper::OPropertyArrayUsageHelper< OABSPilotUno > OABSPilotUno_PBase;
/// the UNO wrapper for the address book source pilot /// the UNO wrapper for the address book source pilot
class OABSPilotUno class OABSPilotUno
:public OModuleResourceClient :public compmodule::OModuleResourceClient
,public svt::OGenericUnoDialog ,public svt::OGenericUnoDialog
,public OABSPilotUno_JBase ,public OABSPilotUno_JBase
,public OABSPilotUno_PBase ,public OABSPilotUno_PBase

2
extensions/source/dbpilots/commonpagesdbp.cxx
View File

@ -450,7 +450,7 @@ namespace dbp
get(m_pStoreYes, "yesRadiobutton"); get(m_pStoreYes, "yesRadiobutton");
get(m_pStoreNo, "noRadiobutton"); get(m_pStoreNo, "noRadiobutton");
get(m_pStoreWhere, "storeInFieldCombobox"); get(m_pStoreWhere, "storeInFieldCombobox");
SetText(ModuleRes(RID_STR_OPTION_DB_FIELD_TITLE)); SetText(compmodule::ModuleRes(RID_STR_OPTION_DB_FIELD_TITLE));
announceControls(*m_pStoreYes, *m_pStoreNo, *m_pStoreWhere); announceControls(*m_pStoreYes, *m_pStoreNo, *m_pStoreWhere);
m_pStoreWhere->SetDropDownLineCount(10); m_pStoreWhere->SetDropDownLineCount(10);

4
extensions/source/dbpilots/controlwizard.cxx
View File

@ -230,7 +230,7 @@ namespace dbp
nCommandTypeResourceId = RID_STR_TYPE_COMMAND; nCommandTypeResourceId = RID_STR_TYPE_COMMAND;
break; break;
} }
m_pFormContentType->SetText(ModuleRes(nCommandTypeResourceId)); m_pFormContentType->SetText(compmodule::ModuleRes(nCommandTypeResourceId));
} }
OControlWizardPage_Base::initializePage(); OControlWizardPage_Base::initializePage();
@ -606,7 +606,7 @@ namespace dbp
// prepend an extra SQLContext explaining what we were doing // prepend an extra SQLContext explaining what we were doing
SQLContext aContext; SQLContext aContext;
aContext.Message = ModuleRes(RID_STR_COULDNOTOPENTABLE); aContext.Message = compmodule::ModuleRes(RID_STR_COULDNOTOPENTABLE);
aContext.NextException = aSQLException; aContext.NextException = aSQLException;
// create an interaction handler to display this exception // create an interaction handler to display this exception

4
extensions/source/dbpilots/dbpservices.cxx
View File

@ -32,7 +32,7 @@ extern "C" void SAL_CALL dbp_initializeModule()
createRegistryInfo_OGroupBoxWizard(); createRegistryInfo_OGroupBoxWizard();
createRegistryInfo_OListComboWizard(); createRegistryInfo_OListComboWizard();
createRegistryInfo_OGridWizard(); createRegistryInfo_OGridWizard();
::dbp::OModule::setResourceFilePrefix("dbp"); compmodule::OModule::setResourceFilePrefix("dbp");
s_bInit = true; s_bInit = true;
} }
} }
@ -48,7 +48,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dbp_component_getFactory(
Reference< XInterface > xRet; Reference< XInterface > xRet;
if (pServiceManager && pImplementationName) if (pServiceManager && pImplementationName)
{ {
xRet = ::dbp::OModule::getComponentFactory( xRet = compmodule::OModule::getComponentFactory(
OUString::createFromAscii(pImplementationName), OUString::createFromAscii(pImplementationName),
static_cast< XMultiServiceFactory* >(pServiceManager)); static_cast< XMultiServiceFactory* >(pServiceManager));
} }

6
extensions/source/dbpilots/gridwizard.cxx
View File

@ -60,7 +60,7 @@ namespace dbp
m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT); m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT);
m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL); m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL);
m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH); m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH);
setTitleBase(ModuleRes(RID_STR_GRIDWIZARD_TITLE)); setTitleBase(compmodule::ModuleRes(RID_STR_GRIDWIZARD_TITLE));
// if we do not need the data source selection page ... // if we do not need the data source selection page ...
if (!needDatasourceSelection()) if (!needDatasourceSelection())
@ -160,11 +160,11 @@ namespace dbp
case DataType::TIMESTAMP: case DataType::TIMESTAMP:
aColumnServiceNames.push_back(OUString("DateField")); aColumnServiceNames.push_back(OUString("DateField"));
aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_DATEPOSTFIX)); aColumnLabelPostfixes.push_back(compmodule::ModuleRes(RID_STR_DATEPOSTFIX));
aFormFieldNames.push_back(*pSelectedFields); aFormFieldNames.push_back(*pSelectedFields);
aColumnServiceNames.push_back(OUString("TimeField")); aColumnServiceNames.push_back(OUString("TimeField"));
aColumnLabelPostfixes.push_back(ModuleRes(RID_STR_TIMEPOSTFIX)); aColumnLabelPostfixes.push_back(compmodule::ModuleRes(RID_STR_TIMEPOSTFIX));
break; break;
default: default:

4
extensions/source/dbpilots/groupboxwiz.cxx
View File

@ -55,7 +55,7 @@ namespace dbp
m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT); m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT);
m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL); m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL);
m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH);
setTitleBase(ModuleRes(RID_STR_GROUPWIZARD_TITLE)); setTitleBase(compmodule::ModuleRes(RID_STR_GROUPWIZARD_TITLE));
} }
@ -468,7 +468,7 @@ namespace dbp
OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent ) OOptionDBFieldPage::OOptionDBFieldPage( OControlWizard* _pParent )
:ODBFieldPage(_pParent) :ODBFieldPage(_pParent)
{ {
setDescriptionText(ModuleRes(RID_STR_GROUPWIZ_DBFIELD)); setDescriptionText(compmodule::ModuleRes(RID_STR_GROUPWIZ_DBFIELD));
} }

8
extensions/source/dbpilots/listcombowizard.cxx
View File

@ -73,11 +73,11 @@ namespace dbp
{ {
case FormComponentType::LISTBOX: case FormComponentType::LISTBOX:
m_bListBox = true; m_bListBox = true;
setTitleBase(ModuleRes(RID_STR_LISTWIZARD_TITLE)); setTitleBase(compmodule::ModuleRes(RID_STR_LISTWIZARD_TITLE));
return true; return true;
case FormComponentType::COMBOBOX: case FormComponentType::COMBOBOX:
m_bListBox = false; m_bListBox = false;
setTitleBase(ModuleRes(RID_STR_COMBOWIZARD_TITLE)); setTitleBase(compmodule::ModuleRes(RID_STR_COMBOWIZARD_TITLE));
return true; return true;
} }
return false; return false;
@ -354,7 +354,7 @@ namespace dbp
get(m_pSelectTableField, "selectfield"); get(m_pSelectTableField, "selectfield");
get(m_pDisplayedField, "displayfield"); get(m_pDisplayedField, "displayfield");
get(m_pInfo, "info"); get(m_pInfo, "info");
m_pInfo->SetText(ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX)); m_pInfo->SetText(compmodule::ModuleRes( isListBox() ? RID_STR_FIELDINFO_LISTBOX : RID_STR_FIELDINFO_COMBOBOX));
m_pSelectTableField->SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected)); m_pSelectTableField->SetSelectHdl(LINK(this, OContentFieldSelection, OnFieldSelected));
m_pSelectTableField->SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked)); m_pSelectTableField->SetDoubleClickHdl(LINK(this, OContentFieldSelection, OnTableDoubleClicked));
} }
@ -505,7 +505,7 @@ namespace dbp
OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent ) OComboDBFieldPage::OComboDBFieldPage( OControlWizard* _pParent )
:ODBFieldPage(_pParent) :ODBFieldPage(_pParent)
{ {
setDescriptionText(ModuleRes(RID_STR_COMBOWIZ_DBFIELD)); setDescriptionText(compmodule::ModuleRes(RID_STR_COMBOWIZ_DBFIELD));
} }

2
extensions/source/dbpilots/unoautopilot.hxx
View File

@ -36,7 +36,7 @@ namespace dbp
class OUnoAutoPilot class OUnoAutoPilot
:public OUnoAutoPilot_Base :public OUnoAutoPilot_Base
,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > > ,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > >
,public OModuleResourceClient ,public compmodule::OModuleResourceClient
{ {
explicit OUnoAutoPilot(const css::uno::Reference< css::uno::XComponentContext >& _rxORB) explicit OUnoAutoPilot(const css::uno::Reference< css::uno::XComponentContext >& _rxORB)
: OUnoAutoPilot_Base(_rxORB) : OUnoAutoPilot_Base(_rxORB)

6
extensions/source/dbpilots/wizardservices.cxx
View File

@ -29,21 +29,21 @@
// the registration methods // the registration methods
extern "C" void SAL_CALL createRegistryInfo_OGroupBoxWizard() extern "C" void SAL_CALL createRegistryInfo_OGroupBoxWizard()
{ {
static ::dbp::OMultiInstanceAutoRegistration< static compmodule::OMultiInstanceAutoRegistration<
::dbp::OUnoAutoPilot< ::dbp::OGroupBoxWizard, ::dbp::OGroupBoxSI > ::dbp::OUnoAutoPilot< ::dbp::OGroupBoxWizard, ::dbp::OGroupBoxSI >
> aAutoRegistration; > aAutoRegistration;
} }
extern "C" void SAL_CALL createRegistryInfo_OListComboWizard() extern "C" void SAL_CALL createRegistryInfo_OListComboWizard()
{ {
static ::dbp::OMultiInstanceAutoRegistration< static compmodule::OMultiInstanceAutoRegistration<
::dbp::OUnoAutoPilot< ::dbp::OListComboWizard, ::dbp::OListComboSI > ::dbp::OUnoAutoPilot< ::dbp::OListComboWizard, ::dbp::OListComboSI >
> aAutoRegistration; > aAutoRegistration;
} }
extern "C" void SAL_CALL createRegistryInfo_OGridWizard() extern "C" void SAL_CALL createRegistryInfo_OGridWizard()
{ {
static ::dbp::OMultiInstanceAutoRegistration< static compmodule::OMultiInstanceAutoRegistration<
::dbp::OUnoAutoPilot< ::dbp::OGridWizard, ::dbp::OGridSI > ::dbp::OUnoAutoPilot< ::dbp::OGridWizard, ::dbp::OGridSI >
> aAutoRegistration; > aAutoRegistration;
} }

4
extensions/source/inc/componentmodule.cxx
View File

@ -30,7 +30,7 @@
ensureImpl() ensureImpl()
namespace COMPMOD_NAMESPACE namespace compmodule
{ {
@ -259,7 +259,7 @@ namespace COMPMOD_NAMESPACE
} }
} // namespace COMPMOD_NAMESPACE } // namespace compmodule
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

7
extensions/source/inc/componentmodule.hxx
View File

@ -23,9 +23,6 @@
/** you may find this file helpful if you implement a component (in it's own library) which can't use /** you may find this file helpful if you implement a component (in it's own library) which can't use
the usual infrastructure.<br/> the usual infrastructure.<br/>
More precise, you find helper classes to ease the use of resources and the registration of services. More precise, you find helper classes to ease the use of resources and the registration of services.
<p>
You need to define a preprocessor variable COMPMOD_NAMESPACE in order to use this file. Set it to a string
which should be used as namespace for the classes defined herein.</p>
*/ */
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
@ -41,7 +38,7 @@
class ResMgr; class ResMgr;
namespace COMPMOD_NAMESPACE namespace compmodule
{ {
@ -193,7 +190,7 @@ typedef css::uno::Reference< css::lang::XSingleServiceFactory > (SAL_CALL *Facto
OModule::revokeComponent(TYPE::getImplementationName_Static()); OModule::revokeComponent(TYPE::getImplementationName_Static());
} }
} // namespace COMPMOD_NAMESPACE } // namespace compmodule
#endif // INCLUDED_EXTENSIONS_SOURCE_INC_COMPONENTMODULE_HXX #endif // INCLUDED_EXTENSIONS_SOURCE_INC_COMPONENTMODULE_HXX