[Libreoffice-commits] core.git: comphelper/source comphelper/util
comphelper/source/compare/AnyCompareFactory.cxx | 32
comphelper/source/inc/comphelper_services.hxx |1
comphelper/source/misc/comphelper_services.cxx |1
comphelper/util/comphelp.component |3 +-
4 files changed, 8 insertions(+), 29 deletions(-)
New commits:
commit a395a1137d2e9430dfd5fd20e81c9413f06a554d
Author: kripton
Date: Sat Jan 30 17:52:26 2016 +0200
tdf#74608 comphelper: Constructor feature for AnyCompareFactory
Change-Id: If5d35828a7309b6916de65282e32ce1ad459a15f
Reviewed-on: https://gerrit.libreoffice.org/21936
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx
b/comphelper/source/compare/AnyCompareFactory.cxx
index 21fa21d..9eacb4f 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -17,13 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "comphelper_module.hxx"
-#include "comphelper_services.hxx"
-
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -74,11 +72,6 @@ public:
virtual OUString SAL_CALL getImplementationName( )
throw(RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(RuntimeException, std::exception) override;
virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( )
throw(RuntimeException, std::exception) override;
-
-// XServiceInfo - static versions (used for component registration)
-static OUString SAL_CALL getImplementationName_static();
-static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
-static Reference< XInterface > SAL_CALL Create( const Reference<
XComponentContext >& );
};
sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 )
throw(css::uno::RuntimeException, std::exception)
@@ -121,11 +114,6 @@ void SAL_CALL AnyCompareFactory::initialize( const
Sequence< Any >& aArguments )
OUString SAL_CALL AnyCompareFactory::getImplementationName( ) throw(
RuntimeException, std::exception )
{
-return getImplementationName_static();
-}
-
-OUString SAL_CALL AnyCompareFactory::getImplementationName_static( )
-{
return OUString( "AnyCompareFactory" );
}
@@ -136,25 +124,17 @@ sal_Bool SAL_CALL AnyCompareFactory::supportsService(
const OUString& ServiceNam
Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( )
throw(RuntimeException, std::exception)
{
-return getSupportedServiceNames_static();
-}
-
-Sequence< OUString > SAL_CALL
AnyCompareFactory::getSupportedServiceNames_static( )
-{
const OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-Reference< XInterface > SAL_CALL AnyCompareFactory::Create(
-const Reference< XComponentContext >& rxContext )
-{
-return static_cast(new AnyCompareFactory( rxContext ));
-}
-
-void createRegistryInfo_AnyCompareFactory()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+AnyCompareFactory_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
{
-static ::comphelper::module::OAutoRegistration< AnyCompareFactory >
aAutoRegistration;
+return cppu::acquire(new AnyCompareFactory(context));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/inc/comphelper_services.hxx
b/comphelper/source/inc/comphelper_services.hxx
index 04cbcb3..0f499f3 100644
--- a/comphelper/source/inc/comphelper_services.hxx
+++ b/comphelper/source/inc/comphelper_services.hxx
@@ -22,7 +22,6 @@
#include
-void createRegistryInfo_AnyCompareFactory();
void createRegistryInfo_Map();
void createRegistryInfo_OInstanceLocker();
void createRegistryInfo_OPropertyBag();
diff --git a/comphelper/source/misc/comphelper_services.cxx
b/comphelper/source/misc/comphelper_services.cxx
index da76ced..47fdf20 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -38,7 +38,6 @@ namespace comphelper { namespace module
createRegistryInfo_SequenceOutputStream();
createRegistryInfo_SequenceInputStream();
createRegistryInfo_UNOMemoryStream();
-createRegistryInfo_AnyCompareFactory();
createRegistryInfo_OInstanceLocker();
createRegistryInfo_Map();
createRegistryInfo_OSimpleLogRing();
diff --git a/comphelper/util/comphelp.component
b/comphelper/util/comphelp.component
index a948150..4de65e1 100644
--- a/comphelper/util/comphelp.component
+++ b/comphe
[Libreoffice-commits] core.git: comphelper/source comphelper/util
comphelper/source/container/NamedPropertyValuesContainer.cxx | 33 ++-
comphelper/source/inc/comphelper_services.hxx|1
comphelper/source/misc/comphelper_services.cxx |1
comphelper/util/comphelp.component |3 -
4 files changed, 8 insertions(+), 30 deletions(-)
New commits:
commit 9ab1bdc217792e90b1b27d81128881d57152afc8
Author: kripton
Date: Fri Jan 29 00:59:41 2016 +0200
tdf#74608 comphelper: Constructor feature for NamedPropertyValuesContainer
Change-Id: I63390eca5c887bfd84846655cef6339ba9785e24
Reviewed-on: https://gerrit.libreoffice.org/21888
Tested-by: Jenkins
Reviewed-by: Matúš Kukan
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx
b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 90ce4cd..e4bb486 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -17,12 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-#include "comphelper_module.hxx"
-#include "comphelper_services.hxx"
-
#include
#include
+#include
#include
#include
#include
@@ -74,11 +71,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
) throw(css::uno::RuntimeException, std::exception) override;
-// XServiceInfo - static versions (used for component registration)
-static OUString SAL_CALL getImplementationName_static();
-static uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames_static();
-static uno::Reference< uno::XInterface > SAL_CALL Create( const
uno::Reference< uno::XComponentContext >& );
-
private:
NamedPropertyValues maProperties;
};
@@ -178,11 +170,6 @@ sal_Bool SAL_CALL
NamedPropertyValuesContainer::hasElements( )
//XServiceInfo
OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( )
throw(css::uno::RuntimeException, std::exception)
{
-return getImplementationName_static();
-}
-
-OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName_static(
)
-{
return OUString( "NamedPropertyValuesContainer" );
}
@@ -193,25 +180,17 @@ sal_Bool SAL_CALL
NamedPropertyValuesContainer::supportsService( const OUString&
css::uno::Sequence< OUString > SAL_CALL
NamedPropertyValuesContainer::getSupportedServiceNames( )
throw(css::uno::RuntimeException, std::exception)
{
-return getSupportedServiceNames_static();
-}
-
-css::uno::Sequence< OUString > SAL_CALL
NamedPropertyValuesContainer::getSupportedServiceNames_static( )
-{
const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" );
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-uno::Reference< uno::XInterface > SAL_CALL
NamedPropertyValuesContainer::Create(
-SAL_UNUSED_PARAMETER const uno::Reference<
uno::XComponentContext >&)
-{
-return static_cast(new NamedPropertyValuesContainer());
-}
-
-void createRegistryInfo_NamedPropertyValuesContainer()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+NamedPropertyValuesContainer_get_implementation(
+css::uno::XComponentContext *,
+css::uno::Sequence const &)
{
-static ::comphelper::module::OAutoRegistration<
NamedPropertyValuesContainer > aAutoRegistration;
+return cppu::acquire(new NamedPropertyValuesContainer());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/inc/comphelper_services.hxx
b/comphelper/source/inc/comphelper_services.hxx
index 602ac7a..04cbcb3 100644
--- a/comphelper/source/inc/comphelper_services.hxx
+++ b/comphelper/source/inc/comphelper_services.hxx
@@ -24,7 +24,6 @@
void createRegistryInfo_AnyCompareFactory();
void createRegistryInfo_Map();
-void createRegistryInfo_NamedPropertyValuesContainer();
void createRegistryInfo_OInstanceLocker();
void createRegistryInfo_OPropertyBag();
void createRegistryInfo_OSimpleLogRing();
diff --git a/comphelper/source/misc/comphelper_services.cxx
b/comphelper/source/misc/comphelper_services.cxx
index fe534b7..da76ced 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -38,7 +38,6 @@ namespace comphelper { namespace module
createRegistryInfo_SequenceOutputStream();
createRegistryInfo_SequenceInputStream();
createRegistryInfo_UNOMemoryStream();
-createRegistryInfo_NamedPropertyValuesContainer();
createRegistryInfo_AnyCompareFactory();
createRegistryInfo_OInstanceLocker();
[Libreoffice-commits] core.git: comphelper/source comphelper/util
comphelper/source/container/IndexedPropertyValuesContainer.cxx | 34
+-
comphelper/source/inc/comphelper_services.hxx |1
comphelper/source/misc/comphelper_services.cxx |1
comphelper/util/comphelp.component |3
4 files changed, 8 insertions(+), 31 deletions(-)
New commits:
commit 2416a2965f4d51e1b14b8539436f5f8fc16cc399
Author: kripton
Date: Thu Jan 28 02:35:52 2016 +0200
tdf#74608 comphelper: Constructor feature for IndexedPropertyValuesContainer
Change-Id: I0e9ea9e4c750918b33040dad2279fe55facd4cab
Reviewed-on: https://gerrit.libreoffice.org/21858
Tested-by: Jenkins
Reviewed-by: Matúš Kukan
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 2ab5572..914629a 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -17,11 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "comphelper_module.hxx"
-#include "comphelper_services.hxx"
-
#include
#include
+#include
#include
#include
#include
@@ -70,11 +68,6 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
throw(css::uno::RuntimeException, std::exception) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(
) throw(css::uno::RuntimeException, std::exception) override;
-// XServiceInfo - static versions (used for component registration)
-static OUString SAL_CALL getImplementationName_static();
-static uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames_static();
-static uno::Reference< uno::XInterface > SAL_CALL Create( const
uno::Reference< uno::XComponentContext >& );
-
private:
IndexedPropertyValues maProperties;
};
@@ -217,11 +210,6 @@ sal_Bool SAL_CALL
IndexedPropertyValuesContainer::hasElements( )
//XServiceInfo
OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( )
throw(css::uno::RuntimeException, std::exception)
{
-return getImplementationName_static();
-}
-
-OUString SAL_CALL
IndexedPropertyValuesContainer::getImplementationName_static( )
-{
return OUString( "IndexedPropertyValuesContainer" );
}
@@ -232,27 +220,17 @@ sal_Bool SAL_CALL
IndexedPropertyValuesContainer::supportsService( const OUStrin
css::uno::Sequence< OUString > SAL_CALL
IndexedPropertyValuesContainer::getSupportedServiceNames( )
throw(css::uno::RuntimeException, std::exception)
{
-return getSupportedServiceNames_static();
-}
-
-
-css::uno::Sequence< OUString > SAL_CALL
IndexedPropertyValuesContainer::getSupportedServiceNames_static( )
-{
const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues"
);
const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
-
-uno::Reference< uno::XInterface > SAL_CALL
IndexedPropertyValuesContainer::Create(
-SAL_UNUSED_PARAMETER const uno::Reference<
uno::XComponentContext >&)
-{
-return static_cast(new
IndexedPropertyValuesContainer());
-}
-
-void createRegistryInfo_IndexedPropertyValuesContainer()
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+IndexedPropertyValuesContainer_get_implementation(
+css::uno::XComponentContext *,
+css::uno::Sequence const &)
{
-static ::comphelper::module::OAutoRegistration<
IndexedPropertyValuesContainer > aAutoRegistration;
+return cppu::acquire(new IndexedPropertyValuesContainer());
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/comphelper/source/inc/comphelper_services.hxx
b/comphelper/source/inc/comphelper_services.hxx
index d62a16a..602ac7a 100644
--- a/comphelper/source/inc/comphelper_services.hxx
+++ b/comphelper/source/inc/comphelper_services.hxx
@@ -23,7 +23,6 @@
#include
void createRegistryInfo_AnyCompareFactory();
-void createRegistryInfo_IndexedPropertyValuesContainer();
void createRegistryInfo_Map();
void createRegistryInfo_NamedPropertyValuesContainer();
void createRegistryInfo_OInstanceLocker();
diff --git a/comphelper/source/misc/comphelper_services.cxx
b/comphelper/source/misc/comphelper_services.cxx
index 979cd36..fe534b7 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.cxx
@@ -38,7 +38,6 @@ namespace comphelper { namespace module
createRegistryInfo_SequenceOutputStream();
createRegistryInfo_SequenceInputStream();
createRegistryInfo_UNOMemoryStream();
-createRegistryInfo_IndexedPropertyValuesContainer();
createRegistryInfo_NamedPropertyValuesContainer();
[Libreoffice-commits] core.git: lotuswordpro/source lotuswordpro/util
lotuswordpro/source/filter/LotusWordProImportFilter.cxx |7
lotuswordpro/source/filter/genericfilter.cxx| 25
lotuswordpro/util/lwpfilter.component |3 +
3 files changed, 9 insertions(+), 26 deletions(-)
New commits:
commit ea6fdbaeeb51ad695f1c3754b796b7273eb4baad
Author: kripton
Date: Tue Jan 19 23:42:38 2016 +0200
tdf#74608 lotuswordpro: Constructor feature for LotusWordProImportFilter
Change-Id: I51aba68e1a220f7cf953978a10b6b62a922c989b
Reviewed-on: https://gerrit.libreoffice.org/21614
Tested-by: Jenkins
Reviewed-by: jan iversen
Tested-by: jan iversen
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index ce185d2..3f7cab5 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -97,6 +97,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT bool SAL_CALL
TestImportLWP(const OUString &rURL
return ( ReadWordproFile(aFileStream, xHandler) == 0 );
}
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+LotusWordProImportFilter_get_implementation(
+css::uno::XComponentContext *context)
+ {
+return cppu::acquire(new LotusWordProImportFilter(context));
+ }
+
sal_Bool SAL_CALL LotusWordProImportFilter::filter( const Sequence<
css::beans::PropertyValue >& aDescriptor )
throw (RuntimeException, std::exception)
{
diff --git a/lotuswordpro/source/filter/genericfilter.cxx
b/lotuswordpro/source/filter/genericfilter.cxx
index 862f332..837ba1a 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -11,30 +11,5 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::registry;
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL lotuswordpro_component_getFactory(
-const sal_Char * pImplName, void * pServiceManager, void *
/*pRegistryKey*/ )
-{
-void * pRet = nullptr;
-
-OUString implName = OUString::createFromAscii( pImplName );
-if ( pServiceManager &&
implName.equals(LotusWordProImportFilter_getImplementationName()) )
-{
-Reference< XSingleServiceFactory > xFactory( createSingleFactory(
-static_cast< XMultiServiceFactory * >( pServiceManager ),
-OUString::createFromAscii( pImplName ),
-LotusWordProImportFilter_createInstance,
LotusWordProImportFilter_getSupportedServiceNames() ) );
-
-if (xFactory.is())
-{
-xFactory->acquire();
-pRet = xFactory.get();
-}
-}
-
-return pRet;
-}
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/util/lwpfilter.component
b/lotuswordpro/util/lwpfilter.component
index 5ead1c8..bd007fb 100644
--- a/lotuswordpro/util/lwpfilter.component
+++ b/lotuswordpro/util/lwpfilter.component
@@ -1,7 +1,8 @@
http://openoffice.org/2010/uno-components";>
-
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/inc xmloff/source xmloff/util
xmloff/inc/facreg.hxx |7 ---
xmloff/source/core/facreg.cxx |3 ---
xmloff/source/meta/MetaExportComponent.cxx | 10 +-
xmloff/util/xo.component |3 ++-
4 files changed, 11 insertions(+), 12 deletions(-)
New commits:
commit 94699cdec88ae181548d108b4a96f97be1f6c365
Author: kripton
Date: Thu Nov 5 00:42:28 2015 +0300
tdf#74608 xmloff: Constructor feature for XMLMetaExportComponent
Change-Id: I3edde1291e9dec21420238edb5a05f25849ebfff
Reviewed-on: https://gerrit.libreoffice.org/19792
Reviewed-by: Matúš Kukan
Tested-by: Matúš Kukan
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index d6f6f0a..fac39c2 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -283,13 +283,6 @@ css::uno::Reference SAL_CALL
SchXMLExport_Content_createIn
css::uno::Reference const & rSMgr)
throw (css::uno::Exception);
-// meta export
-OUString SAL_CALL XMLMetaExportComponent_getImplementationName() throw();
-css::uno::Sequence SAL_CALL
XMLMetaExportComponent_getSupportedServiceNames() throw();
-css::uno::Reference SAL_CALL
XMLMetaExportComponent_createInstance(
-css::uno::Reference const & rSMgr)
-throw (css::uno::Exception);
-
// meta export OOo
OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw();
css::uno::Sequence SAL_CALL
XMLMetaExportOOO_getSupportedServiceNames() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index c9dbf27..c050b10 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -125,9 +125,6 @@ XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory(
const sal_Char * pImpl
else SINGLEFACTORY( SchXMLExport_Styles )
else SINGLEFACTORY( SchXMLExport_Content )
-// meta import/export
-else SINGLEFACTORY( XMLMetaExportComponent )
-
// meta import/export OOo
else SINGLEFACTORY( XMLMetaExportOOO )
diff --git a/xmloff/source/meta/MetaExportComponent.cxx
b/xmloff/source/meta/MetaExportComponent.cxx
index 53ce1d6..7e5d78f 100644
--- a/xmloff/source/meta/MetaExportComponent.cxx
+++ b/xmloff/source/meta/MetaExportComponent.cxx
@@ -53,7 +53,15 @@ XMLMetaExportComponent::~XMLMetaExportComponent()
{
}
-void SAL_CALL XMLMetaExportComponent::setSourceDocument( const
css::uno::Reference< css::lang::XComponent >& xDoc )
throw(css::lang::IllegalArgumentException, css::uno::RuntimeException,
std::exception)
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+XMLMetaExportComponent_get_implementation(
+css::uno::XComponentContext *context,
+css::uno::Sequence const &)
+{
+return cppu::acquire(new XMLMetaExportComponent(context,
"XMLMetaExportComponent", SvXMLExportFlags::META|SvXMLExportFlags::OASIS));
+}
+
+void SAL_CALL XMLMetaExportComponent::setSourceDocument( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException, std::exception)
{
try
{
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index efc9118..273b591 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -140,7 +140,8 @@
-
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: xmloff/inc xmloff/source xmloff/util
xmloff/inc/MetaImportComponent.hxx | 75 -
xmloff/inc/facreg.hxx |7 --
xmloff/source/core/facreg.cxx |1
xmloff/source/meta/MetaImportComponent.cxx | 63 +++-
xmloff/util/xo.component |3 -
5 files changed, 42 insertions(+), 107 deletions(-)
New commits:
commit c5d16f557c3dbac8b7c0736216e8da5d681d8075
Author: kripton
Date: Thu Oct 29 16:51:23 2015 +0300
tdf#74608 xmloff: Constructor feature for XMLMetaImportComponent.
Change-Id: I3f97625552bf993d67b537456e09c9acf3cba6b8
Reviewed-on: https://gerrit.libreoffice.org/19671
Tested-by: Jenkins
Reviewed-by: Michael Stahl
diff --git a/xmloff/inc/MetaImportComponent.hxx
b/xmloff/inc/MetaImportComponent.hxx
deleted file mode 100644
index 0df495d..000
--- a/xmloff/inc/MetaImportComponent.hxx
+++ /dev/null
@@ -1,75 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_XMLOFF_INC_METAIMPORTCOMPONENT_HXX
-#define INCLUDED_XMLOFF_INC_METAIMPORTCOMPONENT_HXX
-
-#include
-
-#include
-#include
-
-
-class XMLMetaImportComponent : public SvXMLImport
-{
-private:
-::com::sun::star::uno::Reference<
-::com::sun::star::document::XDocumentProperties> mxDocProps;
-
-public:
-// XMLMetaImportComponent() throw();
-XMLMetaImportComponent(
-const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext >& xContext
-) throw();
-
-virtual ~XMLMetaImportComponent() throw();
-
-
-protected:
-
-virtual SvXMLImportContext* CreateContext(
-sal_uInt16 nPrefix,
-const OUString& rLocalName,
-const ::com::sun::star::uno::Reference<
-::com::sun::star::xml::sax::XAttributeList > & xAttrList )
override;
-
-// XImporter
-virtual void SAL_CALL setTargetDocument( const
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& xDoc )
-throw(::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException, std::exception) override;
-};
-
-
-// global functions to support the component
-
-::com::sun::star::uno::Sequence< OUString > SAL_CALL
-XMLMetaImportComponent_getSupportedServiceNames()
-throw();
-
-OUString SAL_CALL XMLMetaImportComponent_getImplementationName()
-throw();
-
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-XMLMetaImportComponent_createInstance(
-const ::com::sun::star::uno::Reference<
-::com::sun::star::lang::XMultiServiceFactory > & )
-throw( ::com::sun::star::uno::Exception );
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index f0f415f..d6f6f0a 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -290,13 +290,6 @@ css::uno::Reference SAL_CALL
XMLMetaExportComponent_create
css::uno::Reference const & rSMgr)
throw (css::uno::Exception);
-// meta import
-OUString SAL_CALL XMLMetaImportComponent_getImplementationName() throw();
-css::uno::Sequence SAL_CALL
XMLMetaImportComponent_getSupportedServiceNames() throw();
-css::uno::Reference SAL_CALL
XMLMetaImportComponent_createInstance(
-css::uno::Reference const & rSMgr)
-throw (css::uno::Exception);
-
// meta export OOo
OUString SAL_CALL XMLMetaExportOOO_getImplementationName() throw();
css::uno::Sequence SAL_CALL
XMLMetaExportOOO_getSupportedServiceNames() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 1e38ca8..be929c2 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -127,7 +127,6 @@ XMLOFF_DLLPUBLIC void * SAL_CALL xo_component_getFactory(
const sal_Char * pImpl
// meta import/export
else SINGLEFACTORY( XMLMetaExportComponent )
-else SINGLEFACTORY( XMLMetaImportComponent )
// meta import/export OOo
else SINGLEFACTORY( XMLMetaExportOOO )
diff --git a/xmloff/s
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/wrtsh/wrtsh3.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7fccad27c97d256c0def7b51e9947f13d5c9c977
Author: kripton
Date: Thu Oct 8 21:13:42 2015 +0300
tdf#90834 Turn in-line version control history comments.
Change-Id: I525420548059f06f655daf52fe84a278abb56ff1
Reviewed-on: https://gerrit.libreoffice.org/19256
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/source/uibase/wrtsh/wrtsh3.cxx
b/sw/source/uibase/wrtsh/wrtsh3.cxx
index d90d213..b7e615d 100644
--- a/sw/source/uibase/wrtsh/wrtsh3.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh3.cxx
@@ -151,7 +151,7 @@ bool SwWrtShell::GoPrevBookmark()
void SwWrtShell::ExecMacro( const SvxMacro& rMacro, OUString* pRet, SbxArray*
pArgs )
{
-// OD 11.02.2003 #100556# - execute macro, if it is allowed.
+// execute macro, if it is allowed.
if ( IsMacroExecAllowed() )
{
GetDoc()->ExecMacro( rMacro, pRet, pArgs );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/uibase/shells/drwbassh.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 68c10e2c9db529cc9586579ed735a0823d0a3567
Author: kripton
Date: Sun Oct 4 00:05:46 2015 +0300
Replaced "n" prefix for bool variables with "b".
Change-Id: I3189e3fb8ccfb6a883945a4d637dc9330e41103c
Reviewed-on: https://gerrit.libreoffice.org/19113
Tested-by: Jenkins
Reviewed-by: Julien Nabet
diff --git a/sw/source/uibase/shells/drwbassh.cxx
b/sw/source/uibase/shells/drwbassh.cxx
index 196d1af..51707f6 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -598,12 +598,12 @@ IMPL_LINK_TYPED( SwDrawBaseShell, CheckGroupShapeNameHdl,
AbstractSvxObjectNameD
const OUString sCurrentName = pObj->GetName();
OUString sNewName;
rNameDialog.GetName(sNewName);
-bool nRet = false;
+bool bRet = false;
if (sNewName.isEmpty() || sCurrentName == sNewName)
-nRet = true;
+bRet = true;
else
{
-nRet = true;
+bRet = true;
SwDrawModel* pModel = rSh.getIDocumentDrawModelAccess().GetDrawModel();
SdrObjListIter aIter( *(pModel->GetPage(0)), IM_DEEPWITHGROUPS );
while( aIter.IsMore() )
@@ -611,12 +611,12 @@ IMPL_LINK_TYPED( SwDrawBaseShell, CheckGroupShapeNameHdl,
AbstractSvxObjectNameD
SdrObject* pTempObj = aIter.Next();
if ( pObj != pTempObj && pTempObj->GetName().equals(sNewName) )
{
-nRet = false;
+bRet = false;
break;
}
}
}
-return nRet;
+return bRet;
}
void SwDrawBaseShell::GetState(SfxItemSet& rSet)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
