android/Bootstrap/Makefile.shared
| 3
android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png
|binary
android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png
|binary
android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png
|binary
android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png
|binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png
|binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png
|binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png
|binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png
|binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png
|binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png
|binary
android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png
|binary
android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png
|binary
android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png
|binary
sc/inc/ScPanelFactory.hxx
| 5
sc/inc/afmtuno.hxx
| 8
sc/inc/appluno.hxx
| 60 ---
sc/inc/filtuno.hxx
| 8
sc/inc/funcuno.hxx
| 3
sc/source/filter/xml/xmlexprt.cxx
| 187 +---------
sc/source/ui/app/scdll.cxx
| 5
sc/source/ui/sidebar/ScPanelFactory.cxx
| 36 -
sc/source/ui/unoobj/afmtuno.cxx
| 21 -
sc/source/ui/unoobj/appluno.cxx
| 170 ---------
sc/source/ui/unoobj/filtuno.cxx
| 21 -
sc/source/ui/unoobj/funcuno.cxx
| 23 -
sc/util/sc.component
| 48 +-
solenv/bin/native-code.py
| 6
starmath/source/mathmlexport.cxx
| 115 ------
starmath/source/register.cxx
| 43 --
starmath/source/register.hxx
| 38 --
starmath/util/sm.component
| 18
41 files changed, 123 insertions(+), 695 deletions(-)
New commits:
commit 2d6e16fd17233f0ded2e700b7421afcf911ee95d
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sun May 3 17:08:28 2015 +0200
starmath: Convert many services to constructors.
Change-Id: Iadeb0723ec4f4d30996aa5677b936de9f11ffadc
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 98bbbe4..de06413 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -81,8 +81,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
using namespace ::xmloff::token;
-#define EXPORT_SVC_NAME "com.sun.star.xml.XMLExportFilter"
-
sal_Unicode ConvertMathToMathML( sal_Unicode cChar )
{
sal_Unicode cRes = cChar;
@@ -393,117 +391,40 @@ const uno::Sequence< sal_Int8 > &
SmXMLExport::getUnoTunnelId() throw()
return theSmXMLExportUnoTunnelId::get().getSeq();
}
-OUString SAL_CALL SmXMLExport_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Math.XMLExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL SmXMLExport_getSupportedServiceNames()
- throw()
-{
- return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
-}
-
-uno::Reference< uno::XInterface > SAL_CALL SmXMLExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
-{
- // EXPORT_OASIS is required here although there is no difference between
- // OOo and OASIS, because without the flag, a transformation to OOo would
- // be chained in.
- return (cppu::OWeakObject*)new SmXMLExport(
comphelper::getComponentContext(rSMgr), SmXMLExport_getImplementationName(),
SvXMLExportFlags::OASIS|SvXMLExportFlags::ALL );
-}
-
-OUString SAL_CALL SmXMLExportMetaOOO_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Math.XMLMetaExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
SmXMLExportMetaOOO_getSupportedServiceNames()
- throw()
-{
- return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
-}
-
-uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMetaOOO_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-throw( uno::Exception )
-{
- return (cppu::OWeakObject*)new SmXMLExport(
comphelper::getComponentContext(rSMgr),
SmXMLExportMetaOOO_getImplementationName(), SvXMLExportFlags::META );
-}
-
-OUString SAL_CALL SmXMLExportMeta_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Math.XMLOasisMetaExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL SmXMLExportMeta_getSupportedServiceNames()
-throw()
-{
- return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
-}
-
-uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMeta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-throw( uno::Exception )
-{
- return (cppu::OWeakObject*)new SmXMLExport(
comphelper::getComponentContext(rSMgr),
SmXMLExportMeta_getImplementationName(),
SvXMLExportFlags::OASIS|SvXMLExportFlags::META );
-}
-
-OUString SAL_CALL SmXMLExportSettingsOOO_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Math.XMLSettingsExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
SmXMLExportSettingsOOO_getSupportedServiceNames()
-throw()
-{
- return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
SmXMLExportSettingsOOO_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-throw( uno::Exception )
-{
- return (cppu::OWeakObject*)new SmXMLExport(
comphelper::getComponentContext(rSMgr),
SmXMLExportSettingsOOO_getImplementationName(), SvXMLExportFlags::SETTINGS );
-}
-
-OUString SAL_CALL SmXMLExportSettings_getImplementationName() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Math_XMLExporter_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
- return OUString( "com.sun.star.comp.Math.XMLOasisSettingsExporter" );
+ return cppu::acquire(new SmXMLExport(context,
"com.sun.star.comp.Math.XMLExporter",
SvXMLExportFlags::OASIS|SvXMLExportFlags::ALL));
}
-uno::Sequence< OUString > SAL_CALL
SmXMLExportSettings_getSupportedServiceNames()
-throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Math_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
- return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
+ return cppu::acquire(new SmXMLExport(context,
"com.sun.star.comp.Math.XMLMetaExporter", SvXMLExportFlags::META));
}
-uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-throw( uno::Exception )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Math_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return (cppu::OWeakObject*)new SmXMLExport(
comphelper::getComponentContext(rSMgr),
SmXMLExportSettings_getImplementationName(),
SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS );
+ return cppu::acquire(new SmXMLExport(context,
"com.sun.star.comp.Math.XMLOasisMetaExporter",
SvXMLExportFlags::OASIS|SvXMLExportFlags::META));
}
-OUString SAL_CALL SmXMLExportContent_getImplementationName() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Math_XMLSettingsExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return OUString( "com.sun.star.comp.Math.XMLContentExporter" );
+ return cppu::acquire(new SmXMLExport(context,
"com.sun.star.comp.Math.XMLSettingsExporter", SvXMLExportFlags::SETTINGS));
}
-uno::Sequence< OUString > SAL_CALL
SmXMLExportContent_getSupportedServiceNames()
- throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Math_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return uno::Sequence<OUString>{ EXPORT_SVC_NAME };
+ return cppu::acquire(new SmXMLExport(context,
"com.sun.star.comp.Math.XMLOasisSettingsExporter",
SvXMLExportFlags::OASIS|SvXMLExportFlags::SETTINGS));
}
-uno::Reference< uno::XInterface > SAL_CALL SmXMLExportContent_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
-throw( uno::Exception )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Math_XMLContentExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- // The EXPORT_OASIS flag is only required to avoid that a transformer is
- // chanied in
- return (cppu::OWeakObject*)new SmXMLExport(
comphelper::getComponentContext(rSMgr),
SmXMLExportContent_getImplementationName(),
SvXMLExportFlags::OASIS|SvXMLExportFlags::CONTENT );
+ return cppu::acquire(new SmXMLExport(context,
"com.sun.star.comp.Math.XMLContentExporter",
SvXMLExportFlags::OASIS|SvXMLExportFlags::CONTENT));
}
sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 8bd00e8..6f6062c 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -58,13 +58,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory(
const sal_Char* pIm
SmXMLImport_createInstance,
SmXMLImport_getSupportedServiceNames() );
}
- else if( SmXMLExport_getImplementationName().equalsAscii(
pImplementationName ))
- {
- xFactory = ::cppu::createSingleFactory( xServiceManager,
- SmXMLExport_getImplementationName(),
- SmXMLExport_createInstance,
- SmXMLExport_getSupportedServiceNames() );
- }
else if( SmXMLImportMeta_getImplementationName().equalsAscii(
pImplementationName ))
{
xFactory = ::cppu::createSingleFactory( xServiceManager,
@@ -72,20 +65,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory(
const sal_Char* pIm
SmXMLImportMeta_createInstance,
SmXMLImportMeta_getSupportedServiceNames() );
}
- else if( SmXMLExportMetaOOO_getImplementationName().equalsAscii(
pImplementationName ))
- {
- xFactory = ::cppu::createSingleFactory( xServiceManager,
- SmXMLExportMetaOOO_getImplementationName(),
- SmXMLExportMetaOOO_createInstance,
- SmXMLExportMetaOOO_getSupportedServiceNames() );
- }
- else if( SmXMLExportMeta_getImplementationName().equalsAscii(
pImplementationName ))
- {
- xFactory = ::cppu::createSingleFactory( xServiceManager,
- SmXMLExportMeta_getImplementationName(),
- SmXMLExportMeta_createInstance,
- SmXMLExportMeta_getSupportedServiceNames() );
- }
else if( SmXMLImportSettings_getImplementationName().equalsAscii(
pImplementationName ))
{
xFactory = ::cppu::createSingleFactory( xServiceManager,
@@ -93,27 +72,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory(
const sal_Char* pIm
SmXMLImportSettings_createInstance,
SmXMLImportSettings_getSupportedServiceNames() );
}
- else if( SmXMLExportSettingsOOO_getImplementationName().equalsAscii(
pImplementationName ))
- {
- xFactory = ::cppu::createSingleFactory( xServiceManager,
- SmXMLExportSettingsOOO_getImplementationName(),
- SmXMLExportSettingsOOO_createInstance,
- SmXMLExportSettingsOOO_getSupportedServiceNames() );
- }
- else if( SmXMLExportSettings_getImplementationName().equalsAscii(
pImplementationName ))
- {
- xFactory = ::cppu::createSingleFactory( xServiceManager,
- SmXMLExportSettings_getImplementationName(),
- SmXMLExportSettings_createInstance,
- SmXMLExportSettings_getSupportedServiceNames() );
- }
- else if( SmXMLExportContent_getImplementationName().equalsAscii(
pImplementationName ))
- {
- xFactory = ::cppu::createSingleFactory( xServiceManager,
- SmXMLExportContent_getImplementationName(),
- SmXMLExportContent_createInstance,
- SmXMLExportContent_getSupportedServiceNames() );
- }
else if( SmDocument_getImplementationName().equalsAscii(
pImplementationName ))
{
xFactory = ::sfx2::createSfxModelFactory( xServiceManager,
@@ -122,7 +80,6 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL sm_component_getFactory(
const sal_Char* pIm
SmDocument_getSupportedServiceNames() );
}
-
// Factory is valid - service was found.
if ( xFactory.is() )
{
diff --git a/starmath/source/register.hxx b/starmath/source/register.hxx
index 97b4692..988ba69a 100644
--- a/starmath/source/register.hxx
+++ b/starmath/source/register.hxx
@@ -50,44 +50,6 @@ OUString SAL_CALL
SmXMLImportSettings_getImplementationName() throw();
css::uno::Reference< css::uno::XInterface > SAL_CALL
SmXMLImportSettings_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-//MathML export
-css::uno::Sequence< OUString > SAL_CALL
- SmXMLExport_getSupportedServiceNames() throw();
-OUString SAL_CALL
- SmXMLExport_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLExport_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-css::uno::Sequence< OUString > SAL_CALL
- SmXMLExportMetaOOO_getSupportedServiceNames() throw();
-OUString SAL_CALL
- SmXMLExportMetaOOO_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLExportMetaOOO_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-css::uno::Sequence< OUString > SAL_CALL
- SmXMLExportMeta_getSupportedServiceNames() throw();
-OUString SAL_CALL
- SmXMLExportMeta_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLExportMeta_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-css::uno::Sequence< OUString > SAL_CALL
- SmXMLExportSettingsOOO_getSupportedServiceNames() throw();
-OUString SAL_CALL
- SmXMLExportSettingsOOO_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLExportSettingsOOO_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-css::uno::Sequence< OUString > SAL_CALL
- SmXMLExportSettings_getSupportedServiceNames() throw();
-OUString SAL_CALL
- SmXMLExportSettings_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLExportSettings_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-css::uno::Sequence< OUString > SAL_CALL
- SmXMLExportContent_getSupportedServiceNames() throw();
-OUString SAL_CALL
- SmXMLExportContent_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
- SmXMLExportContent_createInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory > & rSMgr) throw( css::uno::Exception );
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/util/sm.component b/starmath/util/sm.component
index 2c7507f..7444bb0 100644
--- a/starmath/util/sm.component
+++ b/starmath/util/sm.component
@@ -22,31 +22,37 @@
<implementation name="com.sun.star.comp.Math.FormulaDocument">
<service name="com.sun.star.formula.FormulaProperties"/>
</implementation>
- <implementation name="com.sun.star.comp.Math.XMLContentExporter">
+ <implementation name="com.sun.star.comp.Math.XMLContentExporter"
+ constructor="Math_XMLContentExporter_get_implementation">
<service name="com.sun.star.xml.XMLExportFilter"/>
</implementation>
- <implementation name="com.sun.star.comp.Math.XMLExporter">
+ <implementation name="com.sun.star.comp.Math.XMLExporter"
+ constructor="Math_XMLExporter_get_implementation">
<service name="com.sun.star.xml.XMLExportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.XMLImporter">
<service name="com.sun.star.xml.XMLImportFilter"/>
</implementation>
- <implementation name="com.sun.star.comp.Math.XMLMetaExporter">
+ <implementation name="com.sun.star.comp.Math.XMLMetaExporter"
+ constructor="Math_XMLMetaExporter_get_implementation">
<service name="com.sun.star.xml.XMLExportFilter"/>
</implementation>
- <implementation name="com.sun.star.comp.Math.XMLOasisMetaExporter">
+ <implementation name="com.sun.star.comp.Math.XMLOasisMetaExporter"
+ constructor="Math_XMLOasisMetaExporter_get_implementation">
<service name="com.sun.star.xml.XMLExportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.XMLOasisMetaImporter">
<service name="com.sun.star.xml.XMLImportFilter"/>
</implementation>
- <implementation name="com.sun.star.comp.Math.XMLOasisSettingsExporter">
+ <implementation name="com.sun.star.comp.Math.XMLOasisSettingsExporter"
+ constructor="Math_XMLOasisSettingsExporter_get_implementation">
<service name="com.sun.star.xml.XMLExportFilter"/>
</implementation>
<implementation name="com.sun.star.comp.Math.XMLOasisSettingsImporter">
<service name="com.sun.star.xml.XMLImportFilter"/>
</implementation>
- <implementation name="com.sun.star.comp.Math.XMLSettingsExporter">
+ <implementation name="com.sun.star.comp.Math.XMLSettingsExporter"
+ constructor="Math_XMLSettingsExporter_get_implementation">
<service name="com.sun.star.xml.XMLExportFilter"/>
</implementation>
</component>
commit 6efd08e37b81c637c6cf48e6cd903365ffbc0813
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sun May 3 18:01:44 2015 +0200
sc: Avoid registering controls.
Change-Id: I7a9afb5ce7a782713ae8fedf6cf7c9937ff652b9
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 40765e0..30947e5 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -17,8 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <editeng/eeitem.hxx>
+#include <config_features.h>
+#include <editeng/eeitem.hxx>
#include <svx/fmobjfac.hxx>
#include <svx/objfac3d.hxx>
#include <svx/tbxcolor.hxx>
@@ -152,6 +153,7 @@ void ScDLL::Init()
ScMediaShell ::RegisterInterface(pMod);
ScPageBreakShell ::RegisterInterface(pMod);
+#if HAVE_FEATURE_DESKTOP
SfxRecentFilesToolBoxControl::RegisterControl(SID_OPEN_CALC, pMod);
// Own Controller
@@ -278,6 +280,7 @@ void ScDLL::Init()
ScValidityRefChildWin::RegisterChildWindow(false, pMod);
sc::SearchResultsDlgWrapper::RegisterChildWindow(false, pMod);
+#endif
// EditEngine Field; insofar not already defined in OfficeApplication::Init
SvClassManager& rClassManager = SvxFieldItem::GetClassManager();
commit 83c03d2fa008354241333a036231ef0a78b826be
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sun May 3 16:31:32 2015 +0200
android: optipng the images.
Change-Id: Iac510a12dcca59209af75ea8d77f9290025c5c03
diff --git a/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png
index 950d615..1288718 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png and
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_bold.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png
index 399bb9c..2b60b31 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png and
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_italic.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png
index f7682ab..5b5c2e9 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png and
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_strikeout.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png
index 09f8b20..187f45e 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png and
b/android/experimental/LOAndroid3/res/drawable-hdpi/action_underline.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png
b/android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png
index 5dcee14..f5dab66 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png and
b/android/experimental/LOAndroid3/res/drawable-hdpi/handle_middle.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png
index bc60968..48b0100 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png and
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_bold.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png
index 6394cf9..3485915 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png and
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_italic.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png
index 955f1cb..4dc93b8 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png and
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_strikeout.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png
index 3b6c7f6..bbe053a 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png and
b/android/experimental/LOAndroid3/res/drawable-mdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png
index 95c985e..1cea427 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png and
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_bold.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png
index e4366f4..5117ecd 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png and
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_italic.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png
index e9eccc8..1bc46aa 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png and
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_strikeout.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png
index 421a750..c4621f4 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png and
b/android/experimental/LOAndroid3/res/drawable-xhdpi/action_underline.png differ
diff --git a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png
b/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png
index c83b7b6..02e5173 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png and
b/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_end.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png
b/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png
index 2a1774f..15940a2 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png and
b/android/experimental/LOAndroid3/res/drawable-xhdpi/handle_middle.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png
index c5256f5..2e13c60 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_bold.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png
index a5e921f..8b76698 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_italic.png differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
index 0b2c39f..090f6c2 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_strikeout.png
differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png
index 4cd7971..357bc8b 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/action_underline.png
differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png
index c489968..121ac9a 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png
and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_check_grey600_24dp.png
differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png
index cfad1bed..f9ae47e 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png
and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png
differ
diff --git
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png
index 1eab3a7..873fa7a 100644
Binary files
a/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png
and
b/android/experimental/LOAndroid3/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png
differ
commit 45bd3375427f9caebae3853a8c34ca88f1025fcf
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sun May 3 15:51:17 2015 +0200
sc: More services converted to constructors.
Change-Id: I85c66837b5bde7c8c8b7044ae8956c05f3bdb742
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 982536a..6e46216 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -236,9 +236,6 @@ public:
ScRecentFunctionsObj();
virtual ~ScRecentFunctionsObj();
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static();
-
// XRecentFunctions
virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL
getRecentFunctionIds()
throw(::com::sun::star::uno::RuntimeException,
std::exception) SAL_OVERRIDE;
@@ -267,9 +264,6 @@ public:
ScFunctionListObj();
virtual ~ScFunctionListObj();
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static();
-
// XFunctionDescriptions
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > SAL_CALL
getById( sal_Int32 nId )
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index cfef288..abbd31f 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -69,9 +69,6 @@ public:
ScFunctionAccess();
virtual ~ScFunctionAccess();
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString >
getSupportedServiceNames_Static();
-
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint
) SAL_OVERRIDE;
// XFunctionAccess
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index bb6115b..f3b1634 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -112,30 +112,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
sc_component_getFactory(
ScSpreadsheetSettings_CreateInstance,
ScSpreadsheetSettings::getSupportedServiceNames_Static() ));
}
- else if ( aImpl == ScRecentFunctionsObj::getImplementationName_Static() )
- {
- xFactory.set(cppu::createOneInstanceFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScRecentFunctionsObj::getImplementationName_Static(),
- ScRecentFunctionsObj_CreateInstance,
- ScRecentFunctionsObj::getSupportedServiceNames_Static() ));
- }
- else if ( aImpl == ScFunctionListObj::getImplementationName_Static() )
- {
- xFactory.set(cppu::createOneInstanceFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScFunctionListObj::getImplementationName_Static(),
- ScFunctionListObj_CreateInstance,
- ScFunctionListObj::getSupportedServiceNames_Static() ));
- }
- else if ( aImpl == ScFunctionAccess::getImplementationName_Static() )
- {
- xFactory.set(cppu::createOneInstanceFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScFunctionAccess::getImplementationName_Static(),
- ScFunctionAccess_CreateInstance,
- ScFunctionAccess::getSupportedServiceNames_Static() ));
- }
else if ( aImpl == ScXMLImport_getImplementationName() )
{
xFactory.set(cppu::createSingleFactory(
@@ -490,27 +466,12 @@ ScRecentFunctionsObj::~ScRecentFunctionsObj()
{
}
-// stuff for exService_...
-
-uno::Reference<uno::XInterface> SAL_CALL ScRecentFunctionsObj_CreateInstance(
- const uno::Reference<lang::XMultiServiceFactory>& /*
rSMgr */ )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+ScRecentFunctionsObj_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
ScDLL::Init();
- return (cppu::OWeakObject*)new ScRecentFunctionsObj();
-}
-
-OUString ScRecentFunctionsObj::getImplementationName_Static()
-{
- return OUString( "stardiv.StarCalc.ScRecentFunctionsObj" );
-}
-
-uno::Sequence<OUString> ScRecentFunctionsObj::getSupportedServiceNames_Static()
-{
- uno::Sequence<OUString> aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = SCRECENTFUNCTIONSOBJ_SERVICE;
- return aRet;
+ return cppu::acquire(new ScRecentFunctionsObj());
}
// XRecentFunctions
@@ -566,27 +527,12 @@ ScFunctionListObj::~ScFunctionListObj()
{
}
-// stuff for exService_...
-
-uno::Reference<uno::XInterface> SAL_CALL ScFunctionListObj_CreateInstance(
- const uno::Reference<lang::XMultiServiceFactory>& /*
rSMgr */ )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+ScFunctionListObj_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
ScDLL::Init();
- return (cppu::OWeakObject*)new ScFunctionListObj();
-}
-
-OUString ScFunctionListObj::getImplementationName_Static()
-{
- return OUString( "stardiv.StarCalc.ScFunctionListObj" );
-}
-
-uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static()
-{
- uno::Sequence<OUString> aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = SCFUNCTIONLISTOBJ_SERVICE;
- return aRet;
+ return cppu::acquire(new ScFunctionListObj());
}
static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence,
const ScFuncDesc& rDesc )
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 189ee1c..edd4898 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -198,33 +198,18 @@ void ScFunctionAccess::Notify( SfxBroadcaster&, const
SfxHint& rHint )
}
}
-// stuff for exService_...
-
-uno::Reference<uno::XInterface> SAL_CALL ScFunctionAccess_CreateInstance(
- const uno::Reference<lang::XMultiServiceFactory>& )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+ScFunctionAcceess_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
ScDLL::Init();
- return (::cppu::OWeakObject*) new ScFunctionAccess;
-}
-
-OUString ScFunctionAccess::getImplementationName_Static()
-{
- return OUString( "stardiv.StarCalc.ScFunctionAccess" );
-}
-
-uno::Sequence<OUString> ScFunctionAccess::getSupportedServiceNames_Static()
-{
- uno::Sequence<OUString> aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = SCFUNCTIONACCESS_SERVICE;
- return aRet;
+ return cppu::acquire(new ScFunctionAccess);
}
// XServiceInfo
OUString SAL_CALL ScFunctionAccess::getImplementationName()
throw(uno::RuntimeException, std::exception)
{
- return getImplementationName_Static();
+ return OUString("stardiv.StarCalc.ScFunctionAccess");
}
sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString&
rServiceName )
diff --git a/sc/util/sc.component b/sc/util/sc.component
index b7b65b1..da55b90 100644
--- a/sc/util/sc.component
+++ b/sc/util/sc.component
@@ -85,13 +85,16 @@
constructor="ScAutoFormatsObj_get_implementation">
<service name="com.sun.star.sheet.TableAutoFormats"/>
</implementation>
- <implementation name="stardiv.StarCalc.ScFunctionAccess">
+ <implementation name="stardiv.StarCalc.ScFunctionAccess"
+ constructor="ScFunctionAcceess_get_implementation">
<service name="com.sun.star.sheet.FunctionAccess"/>
</implementation>
- <implementation name="stardiv.StarCalc.ScFunctionListObj">
+ <implementation name="stardiv.StarCalc.ScFunctionListObj"
+ constructor="ScFunctionListObj_get_implementation">
<service name="com.sun.star.sheet.FunctionDescriptions"/>
</implementation>
- <implementation name="stardiv.StarCalc.ScRecentFunctionsObj">
+ <implementation name="stardiv.StarCalc.ScRecentFunctionsObj"
+ constructor="ScRecentFunctionsObj_get_implementation">
<service name="com.sun.star.sheet.RecentFunctions"/>
</implementation>
<implementation name="stardiv.StarCalc.ScSpreadsheetSettings">
commit e14e771876cb0393927893d275bf8b45c46f316f
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sun May 3 15:19:15 2015 +0200
viewer: Remove some more services.
Change-Id: I298b6a372df2bce889d81c1d716d2c9bec175323
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index e1a3b9c..8bc0840 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -40,7 +40,6 @@ core_factory_list = [
("libpackage2.a", "package2_component_getFactory"),
("libsmlo.a", "sm_component_getFactory"),
("libsotlo.a", "sot_component_getFactory"),
- ("libspelllo.a", "spell_component_getFactory"),
("libsrtrs1.a", "srtrs1_component_getFactory"),
("libstoragefdlo.a", "storagefd_component_getFactory"),
("libucb1.a", "ucb_component_getFactory"),
@@ -172,8 +171,6 @@ core_constructor_list = [
"com_sun_star_comp_sfx2_AppDispatchProvider_get_implementation",
"com_sun_star_comp_sfx2_DocumentTemplates_get_implementation",
"com_sun_star_comp_sfx2_GlobalEventBroadcaster_get_implementation",
-# starmath/util/sm.component
- "com_sun_star_comp_Math_MathTypeFilter_get_implementation",
# stoc/source/inspect/introspection.component
"com_sun_star_comp_stoc_Introspection_get_implementation",
# stoc/util/stocservices.component
@@ -299,13 +296,10 @@ writer_constructor_list = [
# filter/source/textfilterdetect/textfd.component
"com_sun_star_comp_filters_PlainTextFilterDetect_get_implementation",
# sw/util/sw.component
- "com_sun_star_comp_Writer_XMLOasisContentExporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisContentImporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisImporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisMetaImporter_get_implementation",
- "com_sun_star_comp_Writer_XMLOasisSettingsExporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisSettingsImporter_get_implementation",
- "com_sun_star_comp_Writer_XMLOasisStylesExporter_get_implementation",
"com_sun_star_comp_Writer_XMLOasisStylesImporter_get_implementation",
"com_sun_star_util_comp_FinalThreadManager_get_implementation",
# sw/util/swd.component
commit 4fd4cbbb56e51bb3fdfce8681d59215ca0241f7b
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sun May 3 15:18:26 2015 +0200
android: Plain .component files are not used from what I know.
Change-Id: I6e70dd44430a7b0e61c7618e3f0da42deadcd43d
diff --git a/android/Bootstrap/Makefile.shared
b/android/Bootstrap/Makefile.shared
index 4167ff7..e9296df 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -130,7 +130,7 @@ copy-stuff:
# android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
# extent).
#
- mkdir -p assets/lib assets/program/services
assets/ComponentTarget/i18npool/util assets/gz.unpack/program
+ mkdir -p assets/lib assets/program/services assets/gz.unpack/program
gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/offapi.rdb
>assets/gz.unpack/program/offapi.rdb
gzip -9 <$(INSTDIR)/$(LIBO_ETC_FOLDER)/types/oovbaapi.rdb
>assets/gz.unpack/program/oovbaapi.rdb
gzip -9 <$(INSTDIR)/$(LIBO_URE_MISC_FOLDER)/types.rdb
>assets/gz.unpack/program/udkapi.rdb
@@ -141,7 +141,6 @@ copy-stuff:
cp $(if
$(exampleDocument),$(exampleDocument),$(SRC_ROOT)/android/default-document/example.odt)
assets/example.odt
cp $(SRC_ROOT)/readlicense_oo/license/LICENSE assets/license.txt
cp $(SRC_ROOT)/readlicense_oo/license/NOTICE assets/notice.txt
- cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component
assets/ComponentTarget/i18npool/util
#
rm -Rf assets/share # pre-clean it
mkdir -p assets/share/config
commit 7f65fc10d069082d3b1938f37b4e6fc74cfcc3b9
Author: Jan Holesovsky <ke...@collabora.com>
Date: Sun May 3 15:17:42 2015 +0200
sc: Convert many services to constructors.
Change-Id: I8f382fec62c11760399872eae86b71214534a372
diff --git a/sc/inc/ScPanelFactory.hxx b/sc/inc/ScPanelFactory.hxx
index 69af4f0..0777fa0 100644
--- a/sc/inc/ScPanelFactory.hxx
+++ b/sc/inc/ScPanelFactory.hxx
@@ -42,11 +42,6 @@ class ScPanelFactory
public PanelFactoryInterfaceBase
{
public:
- static ::rtl::OUString SAL_CALL getImplementationName_static();
- static css::uno::Reference<css::uno::XInterface> SAL_CALL createInstance(
- const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory);
- static css::uno::Sequence<rtl::OUString> SAL_CALL
getSupportedServiceNames_static();
-
ScPanelFactory(void);
virtual ~ScPanelFactory(void);
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 5e1da0e..ca2b532 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -44,11 +44,6 @@ class ScAutoFormatObj;
#define SC_AFMTOBJ_INVALID USHRT_MAX
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- ScAutoFormatsObj_CreateInstance(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& );
-
class ScAutoFormatsObj : public ::cppu::WeakImplHelper4<
::com::sun::star::container::XNameContainer,
::com::sun::star::container::XEnumerationAccess,
@@ -63,9 +58,6 @@ public:
ScAutoFormatsObj();
virtual ~ScAutoFormatsObj();
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString>
getSupportedServiceNames_Static();
-
// XNameContainer
virtual void SAL_CALL insertByName( const OUString& aName,
const ::com::sun::star::uno::Any& aElement )
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 662b028..982536a 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -76,60 +76,6 @@ OUString SAL_CALL
ScXMLImport_Settings_getImplementationName() throw();
css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLImport_Settings_createInstance(
const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr ) throw( css::uno::Exception );
-// Calc XML export
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOOoExport_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Meta_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOOoExport_Meta_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Styles_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOOoExport_Styles_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Content_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOOoExport_Content_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Settings_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOOoExport_Settings_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw( css::uno::Exception, std::exception );
-
-// Calc XML Oasis export
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOasisExport_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Meta_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOasisExport_Meta_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Styles_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOasisExport_Styles_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr )
- throw( css::uno::Exception, std::exception );
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Content_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOasisExport_Content_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-css::uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Settings_getSupportedServiceNames() throw();
-OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw();
-css::uno::Reference< css::uno::XInterface > SAL_CALL
ScXMLOasisExport_Settings_createInstance(
- const css::uno::Reference< css::lang::XMultiServiceFactory > &
rSMgr )
- throw (css::uno::Exception, std::exception);
-
class ScSpreadsheetSettings : public cppu::WeakImplHelper3<
com::sun::star::sheet::XGlobalSheetSettings,
com::sun::star::beans::XPropertySet,
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index 5b8969b..a3126db 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -33,11 +33,6 @@ namespace com { namespace sun { namespace star { namespace
io {
class XInputStream;
} } } }
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- ScFilterOptionsObj_CreateInstance(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::lang::XMultiServiceFactory >& );
-
class ScFilterOptionsObj : public ::cppu::WeakImplHelper5<
::com::sun::star::beans::XPropertyAccess,
::com::sun::star::ui::dialogs::XExecutableDialog,
@@ -56,9 +51,6 @@ public:
ScFilterOptionsObj();
virtual ~ScFilterOptionsObj();
- static OUString getImplementationName_Static();
- static ::com::sun::star::uno::Sequence< OUString>
getSupportedServiceNames_Static();
-
// XPropertyAccess
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >
SAL_CALL getPropertyValues() throw
(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 8c21574..8cdbd82 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -244,191 +244,64 @@ OUString lcl_GetFormattedString( ScDocument* pDoc, const
ScAddress& rPos )
} // anonymous namespace
-OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLExporter_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
- return OUString( "com.sun.star.comp.Calc.XMLExporter" );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLExporter", SvXMLExportFlags::ALL));
}
-uno::Sequence< OUString > SAL_CALL ScXMLOOoExport_getSupportedServiceNames()
throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLMetaExporter_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
- const OUString aServiceName( ScXMLOOoExport_getImplementationName() );
- return uno::Sequence< OUString >( &aServiceName, 1 );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLMetaExporter", SvXMLExportFlags::META));
}
-uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw(uno::Exception, std::exception)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLStylesExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return (cppu::OWeakObject*)new ScXMLExport(
comphelper::getComponentContext(rSMgr), ScXMLOOoExport_getImplementationName(),
SvXMLExportFlags::ALL );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLStylesExporter",
SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS));
}
-OUString SAL_CALL ScXMLOOoExport_Meta_getImplementationName() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLContentExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return OUString( "com.sun.star.comp.Calc.XMLMetaExporter" );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLContentExporter",
SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS));
}
-uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Meta_getSupportedServiceNames() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLSettingsExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- const OUString aServiceName( ScXMLOOoExport_Meta_getImplementationName() );
- return uno::Sequence< OUString > ( &aServiceName, 1 );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLSettingsExporter", SvXMLExportFlags::SETTINGS));
}
-uno::Reference< uno::XInterface > SAL_CALL ScXMLOOoExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLOasisExporter_get_implementation(css::uno::XComponentContext* context,
css::uno::Sequence<css::uno::Any> const &)
{
- return (cppu::OWeakObject*)new ScXMLExport(
comphelper::getComponentContext(rSMgr),
ScXMLOOoExport_Meta_getImplementationName(), SvXMLExportFlags::META );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLOasisExporter",
SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS));
}
-OUString SAL_CALL ScXMLOOoExport_Styles_getImplementationName() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLOasisMetaExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return OUString( "com.sun.star.comp.Calc.XMLStylesExporter" );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLOasisMetaExporter",
SvXMLExportFlags::META|SvXMLExportFlags::OASIS));
}
-uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Styles_getSupportedServiceNames() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLOasisStylesExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- const OUString aServiceName( ScXMLOOoExport_Styles_getImplementationName()
);
- return uno::Sequence< OUString > ( &aServiceName, 1 );
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLOasisStylesExporter",
SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS));
}
-uno::Reference< uno::XInterface > SAL_CALL
ScXMLOOoExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLOasisContentExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return (cppu::OWeakObject*)new ScXMLExport(
comphelper::getComponentContext(rSMgr),
ScXMLOOoExport_Styles_getImplementationName(),
SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS);
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLOasisContentExporter",
SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS));
}
-OUString SAL_CALL ScXMLOOoExport_Content_getImplementationName() throw()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_XMLOasisSettingsExporter_get_implementation(css::uno::XComponentContext*
context, css::uno::Sequence<css::uno::Any> const &)
{
- return OUString( "com.sun.star.comp.Calc.XMLContentExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Content_getSupportedServiceNames() throw()
-{
- const OUString aServiceName(
ScXMLOOoExport_Content_getImplementationName() );
- return uno::Sequence< OUString > ( &aServiceName, 1 );
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
ScXMLOOoExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception)
-{
- return (cppu::OWeakObject*)new ScXMLExport(
comphelper::getComponentContext(rSMgr),
ScXMLOOoExport_Content_getImplementationName(),
SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS);
-}
-
-OUString SAL_CALL ScXMLOOoExport_Settings_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Calc.XMLSettingsExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
ScXMLOOoExport_Settings_getSupportedServiceNames() throw()
-{
- const OUString aServiceName(
ScXMLOOoExport_Settings_getImplementationName() );
- return uno::Sequence< OUString > ( &aServiceName, 1 );
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
ScXMLOOoExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw( uno::Exception, std::exception )
-{
- return (cppu::OWeakObject*)new ScXMLExport(
comphelper::getComponentContext(rSMgr),
ScXMLOOoExport_Settings_getImplementationName(), SvXMLExportFlags::SETTINGS );
-}
-
-// Oasis Filter
-
-OUString SAL_CALL ScXMLOasisExport_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Calc.XMLOasisExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL ScXMLOasisExport_getSupportedServiceNames()
throw()
-{
- const OUString aServiceName( ScXMLOasisExport_getImplementationName() );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception)
-{
- return (cppu::OWeakObject*)new
ScXMLExport(comphelper::getComponentContext(rSMgr),
ScXMLOasisExport_getImplementationName(),
SvXMLExportFlags::ALL|SvXMLExportFlags::OASIS);
-}
-
-OUString SAL_CALL ScXMLOasisExport_Meta_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Calc.XMLOasisMetaExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Meta_getSupportedServiceNames() throw()
-{
- const OUString aServiceName( ScXMLOasisExport_Meta_getImplementationName()
);
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
ScXMLOasisExport_Meta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception)
-{
- return (cppu::OWeakObject*)new
ScXMLExport(comphelper::getComponentContext(rSMgr),
ScXMLOasisExport_Meta_getImplementationName(),
SvXMLExportFlags::META|SvXMLExportFlags::OASIS);
-}
-
-OUString SAL_CALL ScXMLOasisExport_Styles_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Calc.XMLOasisStylesExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Styles_getSupportedServiceNames() throw()
-{
- const OUString aServiceName(
ScXMLOasisExport_Styles_getImplementationName() );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
ScXMLOasisExport_Styles_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw( uno::Exception, std::exception )
-{
- return (cppu::OWeakObject*)new
ScXMLExport(comphelper::getComponentContext(rSMgr),
ScXMLOasisExport_Styles_getImplementationName(),
SvXMLExportFlags::STYLES|SvXMLExportFlags::MASTERSTYLES|SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS);
-}
-
-OUString SAL_CALL ScXMLOasisExport_Content_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Calc.XMLOasisContentExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Content_getSupportedServiceNames() throw()
-{
- const OUString aServiceName(
ScXMLOasisExport_Content_getImplementationName() );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
ScXMLOasisExport_Content_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception)
-{
- return (cppu::OWeakObject*)new
ScXMLExport(comphelper::getComponentContext(rSMgr),
ScXMLOasisExport_Content_getImplementationName(),
SvXMLExportFlags::AUTOSTYLES|SvXMLExportFlags::CONTENT|SvXMLExportFlags::SCRIPTS|SvXMLExportFlags::FONTDECLS|SvXMLExportFlags::OASIS);
-}
-
-OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw()
-{
- return OUString( "com.sun.star.comp.Calc.XMLOasisSettingsExporter" );
-}
-
-uno::Sequence< OUString > SAL_CALL
ScXMLOasisExport_Settings_getSupportedServiceNames() throw()
-{
- const OUString aServiceName(
ScXMLOasisExport_Settings_getImplementationName() );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
-}
-
-uno::Reference< uno::XInterface > SAL_CALL
ScXMLOasisExport_Settings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr )
- throw (uno::Exception, std::exception)
-{
- return (cppu::OWeakObject*)new
ScXMLExport(comphelper::getComponentContext(rSMgr),
ScXMLOasisExport_Settings_getImplementationName(),
SvXMLExportFlags::SETTINGS|SvXMLExportFlags::OASIS);
+ return cppu::acquire(new ScXMLExport(context,
"com.sun.star.comp.Calc.XMLOasisSettingsExporter",
SvXMLExportFlags::SETTINGS|SvXMLExportFlags::OASIS));
}
class ScXMLShapeExport : public XMLShapeExport
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx
b/sc/source/ui/sidebar/ScPanelFactory.cxx
index b0d4c8f..f465248 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -43,30 +43,6 @@ using ::rtl::OUString;
namespace sc { namespace sidebar {
-#define IMPLEMENTATION_NAME
"org.apache.openoffice.comp.sc.sidebar.ScPanelFactory"
-#define SERVICE_NAME "com.sun.star.ui.UIElementFactory"
-
-::rtl::OUString SAL_CALL ScPanelFactory::getImplementationName_static()
-{
- return OUString(IMPLEMENTATION_NAME);
-}
-
-css::uno::Reference<css::uno::XInterface> SAL_CALL
ScPanelFactory::createInstance(
- const uno::Reference<lang::XMultiServiceFactory>& )
-{
- ::rtl::Reference<ScPanelFactory> pPanelFactory (new ScPanelFactory());
- css::uno::Reference<css::uno::XInterface> xService
(static_cast<XWeak*>(pPanelFactory.get()), css::uno::UNO_QUERY);
- return xService;
-}
-
-css::uno::Sequence<OUString> SAL_CALL
ScPanelFactory::getSupportedServiceNames_static()
-{
- css::uno::Sequence<OUString> aServiceNames (1);
- aServiceNames[0] = SERVICE_NAME;
- return aServiceNames;
-
-}
-
ScPanelFactory::ScPanelFactory (void)
: PanelFactoryInterfaceBase(m_aMutex)
{
@@ -171,7 +147,7 @@ Reference<ui::XUIElement> SAL_CALL
ScPanelFactory::createUIElement (
OUString ScPanelFactory::getImplementationName()
throw (css::uno::RuntimeException, std::exception)
{
- return getImplementationName_static();
+ return OUString("org.apache.openoffice.comp.sc.sidebar.ScPanelFactory");
}
sal_Bool ScPanelFactory::supportsService(OUString const & ServiceName)
@@ -183,9 +159,17 @@ sal_Bool ScPanelFactory::supportsService(OUString const &
ServiceName)
css::uno::Sequence<OUString> ScPanelFactory::getSupportedServiceNames()
throw (css::uno::RuntimeException, std::exception)
{
- return getSupportedServiceNames_static();
+ css::uno::Sequence<OUString> aServiceNames(1);
+ aServiceNames[0] = "com.sun.star.ui.UIElementFactory";
+ return aServiceNames;
}
} } // end of namespace sc::sidebar
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+ScPanelFactory_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new sc::sidebar::ScPanelFactory());
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 7af9a59..ab104f4 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -171,27 +171,12 @@ ScAutoFormatsObj::~ScAutoFormatsObj()
{
}
-// stuff for exService_...
-
-uno::Reference<uno::XInterface> SAL_CALL ScAutoFormatsObj_CreateInstance(
- const uno::Reference<lang::XMultiServiceFactory>& )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+ScAutoFormatsObj_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
ScDLL::Init();
- return (::cppu::OWeakObject*) new ScAutoFormatsObj;
-}
-
-OUString ScAutoFormatsObj::getImplementationName_Static()
-{
- return OUString( "stardiv.StarCalc.ScAutoFormatsObj" );
-}
-
-uno::Sequence<OUString> ScAutoFormatsObj::getSupportedServiceNames_Static()
-{
- uno::Sequence<OUString> aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = SCAUTOFORMATSOBJ_SERVICE;
- return aRet;
+ return cppu::acquire(new ScAutoFormatsObj);
}
// XTableAutoFormats
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 4704556..bb6115b 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -128,14 +128,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
sc_component_getFactory(
ScFunctionListObj_CreateInstance,
ScFunctionListObj::getSupportedServiceNames_Static() ));
}
- else if ( aImpl == ScAutoFormatsObj::getImplementationName_Static() )
- {
- xFactory.set(cppu::createOneInstanceFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScAutoFormatsObj::getImplementationName_Static(),
- ScAutoFormatsObj_CreateInstance,
- ScAutoFormatsObj::getSupportedServiceNames_Static() ));
- }
else if ( aImpl == ScFunctionAccess::getImplementationName_Static() )
{
xFactory.set(cppu::createOneInstanceFactory(
@@ -144,14 +136,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
sc_component_getFactory(
ScFunctionAccess_CreateInstance,
ScFunctionAccess::getSupportedServiceNames_Static() ));
}
- else if ( aImpl == ScFilterOptionsObj::getImplementationName_Static() )
- {
- xFactory.set(cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScFilterOptionsObj::getImplementationName_Static(),
- ScFilterOptionsObj_CreateInstance,
- ScFilterOptionsObj::getSupportedServiceNames_Static() ));
- }
else if ( aImpl == ScXMLImport_getImplementationName() )
{
xFactory.set(cppu::createSingleFactory(
@@ -192,86 +176,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
sc_component_getFactory(
ScXMLImport_Settings_createInstance,
ScXMLImport_Settings_getSupportedServiceNames() ));
}
- else if ( aImpl == ScXMLOOoExport_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOOoExport_getImplementationName(),
- ScXMLOOoExport_createInstance,
- ScXMLOOoExport_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOOoExport_Meta_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOOoExport_Meta_getImplementationName(),
- ScXMLOOoExport_Meta_createInstance,
- ScXMLOOoExport_Meta_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOOoExport_Styles_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOOoExport_Styles_getImplementationName(),
- ScXMLOOoExport_Styles_createInstance,
- ScXMLOOoExport_Styles_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOOoExport_Content_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOOoExport_Content_getImplementationName(),
- ScXMLOOoExport_Content_createInstance,
- ScXMLOOoExport_Content_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOOoExport_Settings_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOOoExport_Settings_getImplementationName(),
- ScXMLOOoExport_Settings_createInstance,
- ScXMLOOoExport_Settings_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOasisExport_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOasisExport_getImplementationName(),
- ScXMLOasisExport_createInstance,
- ScXMLOasisExport_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOasisExport_Meta_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOasisExport_Meta_getImplementationName(),
- ScXMLOasisExport_Meta_createInstance,
- ScXMLOasisExport_Meta_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOasisExport_Styles_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOasisExport_Styles_getImplementationName(),
- ScXMLOasisExport_Styles_createInstance,
- ScXMLOasisExport_Styles_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOasisExport_Content_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOasisExport_Content_getImplementationName(),
- ScXMLOasisExport_Content_createInstance,
- ScXMLOasisExport_Content_getSupportedServiceNames() );
- }
- else if ( aImpl == ScXMLOasisExport_Settings_getImplementationName() )
- {
- xFactory = cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ScXMLOasisExport_Settings_getImplementationName(),
- ScXMLOasisExport_Settings_createInstance,
- ScXMLOasisExport_Settings_getSupportedServiceNames() );
- }
else if ( aImpl == ScDocument_getImplementationName() )
{
xFactory.set(sfx2::createSfxModelFactory(
@@ -280,14 +184,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL
sc_component_getFactory(
ScDocument_createInstance,
ScDocument_getSupportedServiceNames() ));
}
- else if ( aImpl ==
::sc::sidebar::ScPanelFactory::getImplementationName_static() )
- {
- xFactory = ::cppu::createSingleFactory(
- static_cast<lang::XMultiServiceFactory*>(pServiceManager),
- ::sc::sidebar::ScPanelFactory::getImplementationName_static(),
- ::sc::sidebar::ScPanelFactory::createInstance,
- ::sc::sidebar::ScPanelFactory::getSupportedServiceNames_static() );
- }
void* pRet = NULL;
if (xFactory.is())
diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx
index 6ccd629..2246df7 100644
--- a/sc/source/ui/unoobj/filtuno.cxx
+++ b/sc/source/ui/unoobj/filtuno.cxx
@@ -111,27 +111,12 @@ ScFilterOptionsObj::~ScFilterOptionsObj()
{
}
-// stuff for exService_...
-
-uno::Reference<uno::XInterface> SAL_CALL ScFilterOptionsObj_CreateInstance(
- const uno::Reference<lang::XMultiServiceFactory>& )
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface* SAL_CALL
+Calc_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*,
css::uno::Sequence<css::uno::Any> const &)
{
SolarMutexGuard aGuard;
ScDLL::Init();
- return (::cppu::OWeakObject*) new ScFilterOptionsObj;
-}
-
-OUString ScFilterOptionsObj::getImplementationName_Static()
-{
- return OUString( SCFILTEROPTIONSOBJ_IMPLNAME );
-}
-
-uno::Sequence<OUString> ScFilterOptionsObj::getSupportedServiceNames_Static()
-{
- uno::Sequence<OUString> aRet(1);
- OUString* pArray = aRet.getArray();
- pArray[0] = SCFILTEROPTIONSOBJ_SERVICE;
- return aRet;
+ return cppu::acquire(new ScFilterOptionsObj);
}
// XPropertyAccess
diff --git a/sc/util/sc.component b/sc/util/sc.component
index 03bb057..b7b65b1 100644
--- a/sc/util/sc.component
+++ b/sc/util/sc.component
@@ -19,58 +19,70 @@
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
prefix="sc" xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.comp.Calc.FilterOptionsDialog">
+ <implementation name="com.sun.star.comp.Calc.FilterOptionsDialog"
+ constructor="Calc_FilterOptionsDialog_get_implementation">
<service name="com.sun.star.ui.dialogs.FilterOptionsDialog"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.SpreadsheetDocument">
<service name="com.sun.star.sheet.SpreadsheetDocument"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLContentExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLContentExporter"
+ constructor="Calc_XMLContentExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLContentExporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLExporter"
+ constructor="Calc_XMLExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLExporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLMetaExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLMetaExporter"
+ constructor="Calc_XMLMetaExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLMetaExporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLOasisContentExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLOasisContentExporter"
+ constructor="Calc_XMLOasisContentExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLOasisContentExporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLOasisContentImporter">
<service name="com.sun.star.comp.Calc.XMLOasisContentImporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLOasisExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLOasisExporter"
+ constructor="Calc_XMLOasisExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLOasisExporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLOasisImporter">
<service name="com.sun.star.comp.Calc.XMLOasisImporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLOasisMetaExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLOasisMetaExporter"
+ constructor="Calc_XMLOasisMetaExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLOasisMetaExporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLOasisMetaImporter">
<service name="com.sun.star.comp.Calc.XMLOasisMetaImporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLOasisSettingsExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLOasisSettingsExporter"
+ constructor="Calc_XMLOasisSettingsExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLOasisSettingsExporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLOasisSettingsImporter">
<service name="com.sun.star.comp.Calc.XMLOasisSettingsImporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLOasisStylesExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLOasisStylesExporter"
+ constructor="Calc_XMLOasisStylesExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLOasisStylesExporter"/>
</implementation>
<implementation name="com.sun.star.comp.Calc.XMLOasisStylesImporter">
<service name="com.sun.star.comp.Calc.XMLOasisStylesImporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLSettingsExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLSettingsExporter"
+ constructor="Calc_XMLSettingsExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLSettingsExporter"/>
</implementation>
- <implementation name="com.sun.star.comp.Calc.XMLStylesExporter">
+ <implementation name="com.sun.star.comp.Calc.XMLStylesExporter"
+ constructor="Calc_XMLStylesExporter_get_implementation">
<service name="com.sun.star.comp.Calc.XMLStylesExporter"/>
</implementation>
- <implementation name="stardiv.StarCalc.ScAutoFormatsObj">
+ <implementation name="stardiv.StarCalc.ScAutoFormatsObj"
+ constructor="ScAutoFormatsObj_get_implementation">
<service name="com.sun.star.sheet.TableAutoFormats"/>
</implementation>
<implementation name="stardiv.StarCalc.ScFunctionAccess">
@@ -85,7 +97,8 @@
<implementation name="stardiv.StarCalc.ScSpreadsheetSettings">
<service name="com.sun.star.sheet.GlobalSheetSettings"/>
</implementation>
- <implementation name="org.apache.openoffice.comp.sc.sidebar.ScPanelFactory">
+ <implementation name="org.apache.openoffice.comp.sc.sidebar.ScPanelFactory"
+ constructor="ScPanelFactory_get_implementation">
<service name="com.sun.star.ui.UIElementFactory"/>
</implementation>
</component>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
