[Libreoffice-commits] .: 2 commits - fileaccess/source framework/source framework/util sfx2/inc sfx2/source sfx2/util shell/source svx/source svx/util xmloff/source xmloff/util
Michael Meeks
michael at kemper.freedesktop.org
Fri Jun 24 07:08:28 PDT 2011
fileaccess/source/FileAccess.cxx | 4 ++--
fileaccess/source/fileacc.component | 2 +-
framework/source/lomenubar/exports.cxx | 4 ++--
framework/util/lomenubar.component | 2 +-
sfx2/inc/sfx2/sfxuno.hxx | 4 ++--
sfx2/source/appl/appuno.cxx | 4 ++--
sfx2/util/sfx.component | 2 +-
shell/source/tools/lngconvex/lngconvex.cxx | 6 +++---
svx/source/core/coreservices.cxx | 4 ++--
svx/source/unodialogs/textconversiondlgs/services.cxx | 4 ++--
svx/source/unodraw/unoctabl.cxx | 4 ++--
svx/util/svx.component | 2 +-
svx/util/svxcore.component | 3 ++-
svx/util/textconversiondlgs.component | 2 +-
xmloff/source/core/facreg.cxx | 4 ++--
xmloff/source/transform/XMLFilterRegistration.cxx | 6 +++---
xmloff/source/transform/xof.component | 2 +-
xmloff/util/xo.component | 2 +-
18 files changed, 31 insertions(+), 30 deletions(-)
New commits:
commit 60e8d375393dd5ddd7b12265cbd2707dd8510165
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Jun 24 15:07:10 2011 +0100
use sal_uInt16 instead of USHORT on unix
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 1c58c1d..bc370ae 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -339,8 +339,8 @@ void add_group_entries(
for (size_t i = 0; i < key_count; i++)
{
- ByteString iso_lang = aConfig.GetKeyName(sal::static_int_cast<USHORT>(i));
- ByteString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<USHORT>(i));
+ ByteString iso_lang = aConfig.GetKeyName(sal::static_int_cast<sal_uInt16>(i));
+ ByteString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<sal_uInt16>(i));
iso_lang_identifier myiso_lang( iso_lang );
LanguageType ltype = MsLangId::convertIsoNamesToLanguage(myiso_lang.language(), myiso_lang.country());
if( ( ltype & 0x0200 ) == 0 && map[ ltype ].empty() )
@@ -412,7 +412,7 @@ void read_ulf_file(const std::string& FileName, Substitutor& Substitutor)
Config config(tmpfile_url.getStr());
size_t grpcnt = config.GetGroupCount();
for (size_t i = 0; i < grpcnt; i++)
- add_group_entries(config, config.GetGroupName(sal::static_int_cast<USHORT>(i)), Substitutor);
+ add_group_entries(config, config.GetGroupName(sal::static_int_cast<sal_uInt16>(i)), Substitutor);
}
void read_file(
commit 6d5ce0c101bbaa43fd789ab705774a24f91dd28e
Author: Matus Kukan <matus.kukan at gmail.com>
Date: Fri Jun 24 14:53:52 2011 +0100
update component factory methods to use new prefixes, to add lib merging
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index 1644c27..aa00c74 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -866,13 +866,13 @@ Sequence< rtl::OUString > FileAccess_getSupportedServiceNames()
extern "C"
{
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL fileacc_component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL fileacc_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
diff --git a/fileaccess/source/fileacc.component b/fileaccess/source/fileacc.component
index 3f14d40..f580c4b 100755
--- a/fileaccess/source/fileacc.component
+++ b/fileaccess/source/fileacc.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="fileacc"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.SimpleFileAccess">
<service name="com.sun.star.ucb.SimpleFileAccess"/>
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index eb04e5f..97d5cb6 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.cxx
@@ -54,13 +54,13 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >&
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName,
+SAL_DLLPUBLIC_EXPORT void SAL_CALL lomenubar_component_getImplementationEnvironment(const sal_Char** ppEnvTypeName,
uno_Environment** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName ,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL lomenubar_component_getFactory(const sal_Char* pImplName ,
void* pServiceManager,
void* /*pRegistryKey*/ )
{
diff --git a/framework/util/lomenubar.component b/framework/util/lomenubar.component
index 628bcb7..279ab3a 100755
--- a/framework/util/lomenubar.component
+++ b/framework/util/lomenubar.component
@@ -27,7 +27,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="lomenubar"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="org.libreoffice.comp.framework.lomenubar.FrameJob">
<service name="com.sun.star.task.Job"/>
diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx
index 06c81df..1e5f8b8 100644
--- a/sfx2/inc/sfx2/sfxuno.hxx
+++ b/sfx2/inc/sfx2/sfxuno.hxx
@@ -590,7 +590,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
}
//************************************************************************************************************************
-// definition for "extern c component_getFactory()"
+// definition for "extern c sfx_component_getFactory()"
//************************************************************************************************************************
#define CREATEFACTORY(CLASS) \
\
@@ -598,7 +598,7 @@ bool GetEncryptionData_Impl( const SfxItemSet* pSet, ::com::sun::star::uno::Sequ
xFactory = CLASS::impl_createFactory( xServiceManager );
//************************************************************************************************************************
-// definition for "extern c component_getFactory()"
+// definition for "extern c sfx_component_getFactory()"
//************************************************************************************************************************
#define IF_NAME_CREATECOMPONENTFACTORY(CLASS) \
\
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 04b674d..8c0cc6f 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -2143,14 +2143,14 @@ SFX_IMPL_SINGLEFACTORY( TestMouseClickHandler );
extern "C" {
-SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment(
+SFX2_DLLPUBLIC void SAL_CALL sfx_component_getImplementationEnvironment(
const sal_Char** ppEnvironmentTypeName ,
uno_Environment** )
{
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-SFX2_DLLPUBLIC void* SAL_CALL component_getFactory(
+SFX2_DLLPUBLIC void* SAL_CALL sfx_component_getFactory(
const sal_Char* pImplementationName ,
void* pServiceManager ,
void* )
diff --git a/sfx2/util/sfx.component b/sfx2/util/sfx.component
index dfa3d20..22ed1e4 100755
--- a/sfx2/util/sfx.component
+++ b/sfx2/util/sfx.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="sfx"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="SfxDocumentMetaData">
<service name="com.sun.star.document.DocumentProperties"/>
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
index 0e88b28..f5bf707 100644
--- a/svx/source/core/coreservices.cxx
+++ b/svx/source/core/coreservices.cxx
@@ -72,13 +72,13 @@ extern Sequence< OUString > SAL_CALL FontWorkCharacterSpacingControl_getSupporte
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SAL_DLLPUBLIC_EXPORT void SAL_CALL svxcore_component_getImplementationEnvironment (
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL svxcore_component_getFactory (
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx
index 59ec79e..f76a197 100644
--- a/svx/source/unodialogs/textconversiondlgs/services.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/services.cxx
@@ -48,13 +48,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio
extern "C"
{
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL textconversiondlgs_component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL textconversiondlgs_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return ::cppu::component_getFactoryHelper(
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 064b007..8b86066 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -256,13 +256,13 @@ extern uno::Sequence< OUString > SAL_CALL ExtrusionDepthController_getSupportedS
extern "C"
{
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
+SAL_DLLPUBLIC_EXPORT void SAL_CALL svx_component_getImplementationEnvironment (
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory (
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/svx/util/svx.component b/svx/util/svx.component
index 5907d69..3e31d96 100755
--- a/svx/util/svx.component
+++ b/svx/util/svx.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svx"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Draw.GraphicExporter">
<service name="com.sun.star.drawing.GraphicExportFilter"/>
diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component
index d266e06..3f6aeeb 100755
--- a/svx/util/svxcore.component
+++ b/svx/util/svxcore.component
@@ -25,7 +25,8 @@
* for a copy of the LGPLv3 License.
*
**********************************************************************-->
-<component xmlns="http://openoffice.org/2010/uno-components" loader="com.sun.star.loader.SharedLibrary">
+<component loader="com.sun.star.loader.SharedLibrary" prefix="svxcore"
+ xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.svx.ExtrusionDepthController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
diff --git a/svx/util/textconversiondlgs.component b/svx/util/textconversiondlgs.component
index 1847435..ebac1d6 100755
--- a/svx/util/textconversiondlgs.component
+++ b/svx/util/textconversiondlgs.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="textconversiondlgs"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog">
<service name="com.sun.star.linguistic2.ChineseTranslationDialog"/>
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index c6b07dc..ab24493 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -164,7 +164,7 @@ extern "C"
{
#endif
-XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+XMLOFF_DLLPUBLIC void SAL_CALL xo_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
@@ -178,7 +178,7 @@ XMLOFF_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal
classname##_getSupportedServiceNames() );\
}
-XMLOFF_DLLPUBLIC void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = 0;
if( pServiceManager )
diff --git a/xmloff/source/transform/XMLFilterRegistration.cxx b/xmloff/source/transform/XMLFilterRegistration.cxx
index c3e8ad5..4bdf3c4 100644
--- a/xmloff/source/transform/XMLFilterRegistration.cxx
+++ b/xmloff/source/transform/XMLFilterRegistration.cxx
@@ -142,12 +142,12 @@ extern "C"
{
#endif
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL xof_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL xof_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ )
{
void * pRet = NULL;
if( pServiceManager )
@@ -183,7 +183,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char * pImpl
}
catch( uno::Exception& )
{
- OSL_FAIL( "xof::component_getFactory: Exception!" );
+ OSL_FAIL( "xof::xof_component_getFactory: Exception!" );
}
}
diff --git a/xmloff/source/transform/xof.component b/xmloff/source/transform/xof.component
index 8f9c88f..b5254b1 100755
--- a/xmloff/source/transform/xof.component
+++ b/xmloff/source/transform/xof.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xof"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.Calc.XMLContentImporter">
<service name="com.sun.star.comp.Calc.XMLContentImporter"/>
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 7fe2119..1bbba25 100755
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="xo"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="SchXMLExport.Compact">
<service name="com.sun.star.comp.Chart.XMLExporter"/>
More information about the Libreoffice-commits
mailing list