summaryrefslogtreecommitdiff
path: root/filter/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-10-01 23:02:44 +0300
committerTor Lillqvist <tml@iki.fi>2012-10-01 23:05:37 +0300
commit8c04828bb1a6fefe258b5412db8e1b31a5b8cbb6 (patch)
tree5568711f2b041cdb4aa9619e11ea3ec4907bd373 /filter/source
parent616023b7a73511a73fcc88e8ebfdcd4bb050812e (diff)
Use prefix
Change-Id: Ie741222944bf8ed6cacd5a3037f8aa75a6a4dec3
Diffstat (limited to 'filter/source')
-rw-r--r--filter/source/flash/flash.component2
-rw-r--r--filter/source/flash/swfuno.cxx2
-rw-r--r--filter/source/msfilter/msfilter.component2
-rw-r--r--filter/source/msfilter/services.cxx2
-rw-r--r--filter/source/pdf/pdffilter.component2
-rw-r--r--filter/source/pdf/pdfuno.cxx2
-rw-r--r--filter/source/placeware/placeware.component2
-rw-r--r--filter/source/placeware/uno.cxx2
-rw-r--r--filter/source/t602/filterenv.cxx6
-rw-r--r--filter/source/xmlfilteradaptor/genericfilter.cxx2
-rw-r--r--filter/source/xmlfilteradaptor/xmlfa.component2
-rw-r--r--filter/source/xmlfilterdetect/fdcomp.cxx6
-rw-r--r--filter/source/xmlfilterdetect/xmlfd.component2
-rw-r--r--filter/source/xsltdialog/xmlfilterdialogcomponent.cxx2
-rw-r--r--filter/source/xsltdialog/xsltdlg.component2
-rw-r--r--filter/source/xsltfilter/XSLTFilter.cxx2
-rw-r--r--filter/source/xsltfilter/xsltfilter.component2
17 files changed, 17 insertions, 25 deletions
diff --git a/filter/source/flash/flash.component b/filter/source/flash/flash.component
index 1ce69b3549bc..79e1e68c4a1e 100644
--- a/filter/source/flash/flash.component
+++ b/filter/source/flash/flash.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="flash"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.Impress.FlashExportDialog">
<service name="com.sun.star.Impress.FlashExportDialog"/>
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index b3501532056b..49addf4a3273 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -54,7 +54,7 @@ using namespace ::swf;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL flash_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/msfilter/msfilter.component b/filter/source/msfilter/msfilter.component
index 64128aa1385b..e3ea7e583876 100644
--- a/filter/source/msfilter/msfilter.component
+++ b/filter/source/msfilter/msfilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="msfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.vba.VBAMacroResolver">
<service name="com.sun.star.script.vba.VBAMacroResolver"/>
diff --git a/filter/source/msfilter/services.cxx b/filter/source/msfilter/services.cxx
index 9586d4219ee2..4e4a77eb88ec 100644
--- a/filter/source/msfilter/services.cxx
+++ b/filter/source/msfilter/services.cxx
@@ -60,7 +60,7 @@ static ::cppu::ImplementationEntry const spServices[] =
} // namespace
-extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
+extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL msfilter_component_getFactory( const char* pImplName, void* pServiceManager, void* pRegistryKey )
{
return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey, spServices );
}
diff --git a/filter/source/pdf/pdffilter.component b/filter/source/pdf/pdffilter.component
index 438d697a77b1..e9b84a54ca59 100644
--- a/filter/source/pdf/pdffilter.component
+++ b/filter/source/pdf/pdffilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="pdffilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.PDF.PDFDialog">
<service name="com.sun.star.document.PDFDialog"/>
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index fe5ab0a44a91..a885a8203434 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL pdffilter_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
OUString aImplName( OUString::createFromAscii( pImplName ) );
void* pRet = 0;
diff --git a/filter/source/placeware/placeware.component b/filter/source/placeware/placeware.component
index 9a6ca703ef2d..0ec5ef8d64b0 100644
--- a/filter/source/placeware/placeware.component
+++ b/filter/source/placeware/placeware.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="placeware"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Impress.PlaceWareExportFilter">
<service name="com.sun.star.document.ExportFilter"/>
diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx
index cd0396d8f2f8..1574803a7240 100644
--- a/filter/source/placeware/uno.cxx
+++ b/filter/source/placeware/uno.cxx
@@ -51,7 +51,7 @@ using namespace ::pwp;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL placeware_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/t602/filterenv.cxx b/filter/source/t602/filterenv.cxx
index 1963ddba8635..6154dbfe3b14 100644
--- a/filter/source/t602/filterenv.cxx
+++ b/filter/source/t602/filterenv.cxx
@@ -44,11 +44,7 @@ using namespace T602ImportFilter;
extern "C"
{
-#ifdef DISABLE_DYNLOADING
-#define component_getFactory t602filter_component_getFactory
-#endif
-
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL t602filter_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index 5f9fe9e939fe..67bc53698cf7 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::registry;
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfa_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/xmlfilteradaptor/xmlfa.component b/filter/source/xmlfilteradaptor/xmlfa.component
index d835782c2f38..97ffd4eb68b7 100644
--- a/filter/source/xmlfilteradaptor/xmlfa.component
+++ b/filter/source/xmlfilteradaptor/xmlfa.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfa"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Writer.XmlFilterAdaptor">
<service name="com.sun.star.document.ExportFilter"/>
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx
index b12cdb31ac03..004d11006e50 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -45,11 +45,7 @@ static cppu::ImplementationEntry const services[] = {
}
-#ifdef DISABLE_DYNLOADING
-#define component_getFactory xmlfd_component_getFactory
-#endif
-
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL xmlfd_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/filter/source/xmlfilterdetect/xmlfd.component b/filter/source/xmlfilterdetect/xmlfd.component
index 3796b0e1fb46..798e940c3ca5 100644
--- a/filter/source/xmlfilterdetect/xmlfd.component
+++ b/filter/source/xmlfilterdetect/xmlfd.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xmlfd"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.filters.XMLFilterDetect">
<service name="com.sun.star.document.ExtendedTypeDetection"/>
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index ed77cd3fd47f..3cc5b0ec59e7 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -392,7 +392,7 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& aArgu
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltdlg_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /* pRegistryKey */ )
{
void * pRet = 0;
diff --git a/filter/source/xsltdialog/xsltdlg.component b/filter/source/xsltdialog/xsltdlg.component
index 086208f4f830..5f6815646920 100644
--- a/filter/source/xsltdialog/xsltdlg.component
+++ b/filter/source/xsltdialog/xsltdlg.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltdlg"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="XMLFilterDialogComponent">
<service name="com.sun.star.comp.ui.XSLTFilterDialog"/>
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index ba8503f7238a..63de5a63dda3 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -575,7 +575,7 @@ using namespace XSLT;
extern "C"
{
- SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(const sal_Char * pImplName,
+ SAL_DLLPUBLIC_EXPORT void * SAL_CALL xsltfilter_component_getFactory(const sal_Char * pImplName,
void * pServiceManager, void * /* pRegistryKey */)
{
void * pRet = 0;
diff --git a/filter/source/xsltfilter/xsltfilter.component b/filter/source/xsltfilter/xsltfilter.component
index 5fb985c983bb..b1cf36275c5c 100644
--- a/filter/source/xsltfilter/xsltfilter.component
+++ b/filter/source/xsltfilter/xsltfilter.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xsltfilter"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.documentconversion.XSLTFilter">
<service name="com.sun.star.documentconversion.XSLTFilter"/>
generated by cgit (git 2.34.1) at 2024-07-19 19:37:46 +0000