[Libreoffice-commits] core.git: 46 commits - accessibility/source animations/source avmedia/source basctl/source basic/source chart2/source cli_ure/source comphelper/source connectivity/source cppuhelper/source dbaccess/qa dbaccess/source editeng/source embeddedobj/source embedserv/source extensions/source filter/source forms/Library_frm.mk forms/source framework/inc framework/source include/comphelper include/cppuhelper include/svtools include/toolkit include/ucbhelper include/unotools javaunohelper/com jurt/com jurt/test jvmaccess/workbench odk/examples package/source pyuno/source qadevOOo/testdocs qadevOOo/tests reportdesign/source sc/inc scripting/java scripting/source sc/source sd/source sfx2/qa sfx2/source stoc/source stoc/test svl/source svtools/source svx/source sw/inc sw/source testtools/com toolkit/source ucbhelper/source ucb/source udkapi/com UnoControls/source unotools/source wizards/com xmerge/source
Stephan Bergmann
sbergman at redhat.com
Mon Mar 10 09:40:32 PDT 2014
UnoControls/source/base/basecontrol.cxx | 25 -
accessibility/source/extended/AccessibleBrowseBoxBase.cxx | 7
accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx | 7
accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx | 7
accessibility/source/extended/AccessibleGridControlBase.cxx | 7
accessibility/source/extended/AccessibleGridControlHeader.cxx | 7
accessibility/source/extended/AccessibleGridControlTableBase.cxx | 7
accessibility/source/extended/accessibleiconchoicectrlentry.cxx | 14
accessibility/source/extended/accessiblelistboxentry.cxx | 14
accessibility/source/standard/vclxaccessiblelistitem.cxx | 14
animations/source/animcore/animcore.cxx | 11
avmedia/source/framework/soundhandler.cxx | 21 -
basctl/source/basicide/basidectrlr.cxx | 12
basic/source/classes/sbxmod.cxx | 4
basic/source/uno/namecont.cxx | 14
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 3
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 7
chart2/source/tools/OPropertySet.cxx | 7
cli_ure/source/ure/uno/util/WeakBase.cs | 38 -
comphelper/source/property/genericpropertyset.cxx | 10
comphelper/source/property/propstate.cxx | 8
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 12
connectivity/source/drivers/postgresql/pq_fakedupdateableresultset.cxx | 12
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 12
connectivity/source/drivers/postgresql/pq_statement.cxx | 12
connectivity/source/drivers/postgresql/pq_statics.hxx | 8
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 12
connectivity/source/drivers/postgresql/pq_xbase.cxx | 12
connectivity/source/drivers/postgresql/pq_xindex.cxx | 4
connectivity/source/drivers/postgresql/pq_xkey.cxx | 4
connectivity/source/drivers/postgresql/pq_xtable.cxx | 4
connectivity/source/drivers/postgresql/pq_xuser.cxx | 2
connectivity/source/drivers/postgresql/pq_xview.cxx | 2
cppuhelper/source/factory.cxx | 8
cppuhelper/source/implbase.cxx | 9
cppuhelper/source/implbase_ex.cxx | 21 -
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 2
dbaccess/source/core/api/CRowSetDataColumn.cxx | 12
dbaccess/source/core/api/RowSet.cxx | 29 -
dbaccess/source/core/api/RowSet.hxx | 3
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 10
dbaccess/source/core/api/TableDeco.cxx | 13
dbaccess/source/core/api/callablestatement.cxx | 13
dbaccess/source/core/api/datacolumn.cxx | 12
dbaccess/source/core/api/preparedstatement.cxx | 12
dbaccess/source/core/api/querycomposer.cxx | 23 -
dbaccess/source/core/api/querydescriptor.cxx | 2
dbaccess/source/core/api/resultcolumn.cxx | 12
dbaccess/source/core/api/resultset.cxx | 13
dbaccess/source/core/api/table.cxx | 13
dbaccess/source/core/dataaccess/connection.cxx | 3
dbaccess/source/core/dataaccess/databasedocument.cxx | 12
dbaccess/source/core/dataaccess/datasource.cxx | 13
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 2
dbaccess/source/core/inc/querycomposer.hxx | 3
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 12
dbaccess/source/inc/apitools.hxx | 2
dbaccess/source/ui/browser/brwctrlr.cxx | 13
dbaccess/source/ui/browser/formadapter.cxx | 12
dbaccess/source/ui/browser/sbagrid.cxx | 12
dbaccess/source/ui/browser/unodatbr.cxx | 12
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 3
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 3
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 3
dbaccess/source/ui/uno/TableFilterDlg.cxx | 3
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 3
dbaccess/source/ui/uno/admindlg.cxx | 3
dbaccess/source/ui/uno/unosqlmessage.cxx | 3
editeng/source/accessibility/AccessibleContextBase.cxx | 7
editeng/source/uno/unofield.cxx | 7
editeng/source/uno/unopracc.cxx | 7
editeng/source/uno/unotext.cxx | 21 -
editeng/source/uno/unotext2.cxx | 14
embeddedobj/source/commonembedding/miscobj.cxx | 14
embedserv/source/embed/servprov.cxx | 12
extensions/source/abpilot/unodialogabp.cxx | 12
extensions/source/dbpilots/unoautopilot.inl | 3
extensions/source/ole/servprov.cxx | 12
extensions/source/propctrlr/MasterDetailLinkDialog.cxx | 3
extensions/source/propctrlr/controlfontdialog.cxx | 3
extensions/source/propctrlr/pcrunodialogs.cxx | 3
filter/source/flash/swfdialog.cxx | 13
filter/source/pdf/pdfdialog.cxx | 13
filter/source/svg/svgdialog.cxx | 14
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 3
forms/Library_frm.mk | 1
forms/source/component/Columns.cxx | 3
forms/source/component/DatabaseForm.cxx | 2
forms/source/component/DatabaseForm.hxx | 3
forms/source/component/FormComponent.cxx | 4
forms/source/component/FormsCollection.cxx | 2
forms/source/component/FormsCollection.hxx | 2
forms/source/inc/FormComponent.hxx | 3
forms/source/inc/ids.hxx | 29 -
forms/source/inc/property.hxx | 1
forms/source/misc/ids.cxx | 25 -
forms/source/xforms/model.cxx | 2
framework/inc/macros/xtypeprovider.hxx | 21 -
framework/source/fwe/classes/actiontriggercontainer.cxx | 25 -
framework/source/fwe/classes/actiontriggerpropertyset.cxx | 25 -
framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx | 25 -
framework/source/fwe/classes/rootactiontriggercontainer.cxx | 25 -
include/comphelper/uno3.hxx | 6
include/cppuhelper/implbase.hxx | 3
include/cppuhelper/typeprovider.hxx | 4
include/svtools/accessibleruler.hxx | 2
include/toolkit/controls/geometrycontrolmodel_impl.hxx | 12
include/toolkit/helper/macros.hxx | 12
include/ucbhelper/macros.hxx | 12
include/unotools/idhelper.hxx | 198 ----------
javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java | 34 -
jurt/com/sun/star/comp/loader/FactoryHelper.java | 23 -
jurt/test/com/sun/star/uno/AnyConverter_Test.java | 2
jvmaccess/workbench/java/TestComponent.java | 8
odk/examples/DevelopersGuide/Components/CppComponent/service1_impl.cxx | 29 -
odk/examples/DevelopersGuide/Components/JavaComponent/TestComponentB.java | 13
odk/examples/DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java | 6
odk/examples/DevelopersGuide/Components/dialogcomponent/DialogComponent.java | 12
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java | 2
package/source/xstor/owriteablestream.cxx | 3
package/source/xstor/xstorage.cxx | 3
pyuno/source/module/unohelper.py | 6
qadevOOo/testdocs/qadevlibs/source/test/Job.java | 2
qadevOOo/tests/java/mod/_fwk/JobExecutor.java | 2
reportdesign/source/core/api/ReportDefinition.cxx | 2
sc/inc/shapeuno.hxx | 1
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 7
sc/source/ui/Accessibility/AccessibleContextBase.cxx | 7
sc/source/ui/Accessibility/AccessibleCsvControl.cxx | 14
sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx | 14
sc/source/ui/Accessibility/AccessibleDocument.cxx | 7
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 7
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 7
sc/source/ui/Accessibility/AccessibleFilterMenu.cxx | 3
sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx | 7
sc/source/ui/Accessibility/AccessiblePreviewCell.cxx | 7
sc/source/ui/Accessibility/AccessiblePreviewHeaderCell.cxx | 7
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 7
sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 7
sc/source/ui/Accessibility/AccessibleTableBase.cxx | 7
sc/source/ui/unoobj/cellsuno.cxx | 42 --
sc/source/ui/unoobj/cursuno.cxx | 7
sc/source/ui/unoobj/dapiuno.cxx | 14
sc/source/ui/unoobj/docuno.cxx | 7
sc/source/ui/unoobj/fielduno.cxx | 7
sc/source/ui/unoobj/shapeuno.cxx | 48 --
sc/source/ui/unoobj/viewuno.cxx | 14
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 2
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 3
sd/source/ui/unoidl/unomodel.cxx | 7
sd/source/ui/unoidl/unopage.cxx | 14
sfx2/qa/complex/sfx2/UndoManager.java | 2
sfx2/source/dialog/backingcomp.cxx | 15
sfx2/source/doc/sfxbasemodel.cxx | 25 -
stoc/source/corereflection/crarray.cxx | 12
stoc/source/corereflection/crcomp.cxx | 12
stoc/source/corereflection/crefl.cxx | 12
stoc/source/corereflection/crenum.cxx | 12
stoc/source/corereflection/criface.cxx | 24 -
stoc/source/invocation/invocation.cxx | 12
stoc/test/javavm/testcomponent/TestComponent.java | 2
svl/source/fsstor/fsstorage.cxx | 16
svl/source/fsstor/ostreamcontainer.cxx | 15
svtools/source/control/accessibleruler.cxx | 17
svtools/source/graphic/descriptor.cxx | 7
svtools/source/graphic/graphic.cxx | 17
svtools/source/graphic/graphic.hxx | 1
svtools/source/graphic/provider.cxx | 7
svtools/source/graphic/renderer.cxx | 7
svtools/source/hatchwindow/hatchwindow.cxx | 15
svtools/source/uno/addrtempuno.cxx | 3
svtools/source/uno/unoimap.cxx | 7
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 23 -
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 29 -
svx/source/fmcomp/fmgridif.cxx | 24 -
svx/source/form/fmdpage.cxx | 12
svx/source/form/fmshimp.cxx | 12
svx/source/form/formcontroller.cxx | 12
svx/source/form/xfm_addcondition.cxx | 12
svx/source/inc/GraphCtlAccessibleContext.hxx | 2
svx/source/inc/svxrectctaccessiblecontext.hxx | 2
svx/source/table/cell.cxx | 12
svx/source/unodraw/unomod.cxx | 7
svx/source/unodraw/unopool.cxx | 7
svx/source/unodraw/unoshap2.cxx | 28 -
svx/source/unodraw/unoshap3.cxx | 7
svx/source/unodraw/unoshape.cxx | 38 -
svx/source/unogallery/unogalitem.cxx | 7
svx/source/unogallery/unogaltheme.cxx | 7
svx/source/unogallery/unogalthemeprovider.cxx | 7
sw/inc/unodraw.hxx | 1
sw/source/core/access/acccell.cxx | 7
sw/source/core/access/accdoc.cxx | 7
sw/source/core/access/accembedded.cxx | 7
sw/source/core/access/accfootnote.cxx | 7
sw/source/core/access/accgraphic.cxx | 7
sw/source/core/access/accheaderfooter.cxx | 7
sw/source/core/access/accpage.cxx | 7
sw/source/core/access/accpara.cxx | 7
sw/source/core/access/accpreview.cxx | 7
sw/source/core/access/acctable.cxx | 7
sw/source/core/access/acctextframe.cxx | 7
sw/source/core/uibase/uno/SwXDocumentSettings.cxx | 7
sw/source/core/uibase/uno/unotxvw.cxx | 7
sw/source/core/unocore/unodraw.cxx | 46 --
sw/source/core/unocore/unoflatpara.cxx | 7
sw/source/core/unocore/unoframe.cxx | 21 -
sw/source/core/unocore/unoftn.cxx | 7
sw/source/core/unocore/unoredline.cxx | 21 -
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/core/unocore/unotbl.cxx | 7
sw/source/core/unocore/unotext.cxx | 14
testtools/com/sun/star/comp/bridge/TestComponent.java | 4
toolkit/source/awt/vclxmenu.cxx | 36 -
toolkit/source/awt/vclxtopwindow.cxx | 31 -
toolkit/source/controls/geometrycontrolmodel.cxx | 9
toolkit/source/controls/grid/sortablegriddatamodel.cxx | 3
ucb/source/ucp/file/filid.cxx | 12
ucb/source/ucp/ftp/ftpcontent.cxx | 12
ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 12
ucb/source/ucp/ftp/ftpcontentprovider.cxx | 12
ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx | 12
ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 6
ucbhelper/source/provider/contentidentifier.cxx | 12
ucbhelper/source/provider/interactionrequest.cxx | 96 ----
udkapi/com/sun/star/lang/XTypeProvider.idl | 26 -
unotools/source/accessibility/accessiblerelationsethelper.cxx | 7
unotools/source/accessibility/accessiblestatesethelper.cxx | 7
wizards/com/sun/star/wizards/form/CallFormWizard.java | 26 -
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 26 -
wizards/com/sun/star/wizards/report/CallReportWizard.java | 26 -
wizards/com/sun/star/wizards/table/CallTableWizard.java | 26 -
xmerge/source/bridge/java/XMergeBridge.java | 6
233 files changed, 296 insertions(+), 2509 deletions(-)
New commits:
commit 136f1ad5ed67a39dde500f34cfdc446ddbbd10be
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:44:32 2014 +0100
xmerge: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I3ac9ca0329ceb06b09515b2f063ebf371f944dd6
diff --git a/xmerge/source/bridge/java/XMergeBridge.java b/xmerge/source/bridge/java/XMergeBridge.java
index 4cee336..93d6a33 100644
--- a/xmerge/source/bridge/java/XMergeBridge.java
+++ b/xmerge/source/bridge/java/XMergeBridge.java
@@ -554,11 +554,7 @@ public class XMergeBridge {
// Implement methods from interface XTypeProvider
public byte[] getImplementationId() {
- byte[] byteReturn = {};
-
- byteReturn = new String( "" + this.hashCode() ).getBytes();
-
- return( byteReturn );
+ return new byte[0];
}
// Implement method from interface XServiceName
commit 11b205d0dccea07cef4afd753710cd6b057186b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:43:26 2014 +0100
wizards: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I9ac8fc460fbdb957f3cae4c2cde42962daca0052
diff --git a/wizards/com/sun/star/wizards/form/CallFormWizard.java b/wizards/com/sun/star/wizards/form/CallFormWizard.java
index 937fb1a..f990142 100644
--- a/wizards/com/sun/star/wizards/form/CallFormWizard.java
+++ b/wizards/com/sun/star/wizards/form/CallFormWizard.java
@@ -128,33 +128,9 @@ public class CallFormWizard
return (booleanSupportsService);
}
- /** This method returns an array of bytes, that can be used to
- * unambiguously distinguish between two sets of types, e.g.
- * to realise hashing functionality when the object is introspected.
- * Two objects that return the same ID also have to return
- * the same set of types in getTypes(). If an unique
- * implementation Id cannot be provided this method has to
- * return an empty sequence. Important: If the object
- * aggregates other objects the ID has to be unique for the
- * whole combination of objects.
- * @return Array of bytes, in order to distinguish between two sets.
- */
public byte[] getImplementationId()
{
- byte[] byteReturn =
- {
- };
-
- try
- {
- byteReturn = (PropertyNames.EMPTY_STRING + this.hashCode()).getBytes();
- }
- catch (Exception exception)
- {
- System.err.println(exception);
- }
-
- return (byteReturn);
+ return new byte[0];
}
/** Return the class name of the component.
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index 5ddd437..315e763 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
@@ -133,34 +133,10 @@ public class CallQueryWizard
return (booleanSupportsService);
}
- /** This method returns an array of bytes, that can be used to
- * unambiguously distinguish between two sets of types, e.g.
- * to realise hashing functionality when the object is introspected.
- * Two objects that return the same ID also have to return
- * the same set of types in getTypes(). If an unique
- * implementation Id cannot be provided this method has to
- * return an empty sequence. Important: If the object
- * aggregates other objects the ID has to be unique for the
- * whole combination of objects.
- * @return Array of bytes, in order to distinguish between two sets.
- */
@Override
public byte[] getImplementationId()
{
- byte[] byteReturn =
- {
- };
-
- try
- {
- byteReturn = (PropertyNames.EMPTY_STRING + this.hashCode()).getBytes();
- }
- catch (Exception exception)
- {
- System.err.println(exception);
- }
-
- return (byteReturn);
+ return new byte[0];
}
/** Return the class name of the component.
diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index 4f284a0..af9623c 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java
@@ -160,33 +160,9 @@ public class CallReportWizard
return (booleanSupportsService);
}
- /** This method returns an array of bytes, that can be used to
- * unambiguously distinguish between two sets of types, e.g.
- * to realise hashing functionality when the object is introspected.
- * Two objects that return the same ID also have to return
- * the same set of types in getTypes(). If an unique
- * implementation Id cannot be provided this method has to
- * return an empty sequence. Important: If the object
- * aggregates other objects the ID has to be unique for the
- * whole combination of objects.
- * @return Array of bytes, in order to distinguish between two sets.
- */
public byte[] getImplementationId()
{
- byte[] byteReturn =
- {
- };
-
- try
- {
- byteReturn = (PropertyNames.EMPTY_STRING + this.hashCode()).getBytes();
- }
- catch (Exception e)
- {
- Logger.getLogger(CallReportWizard.class.getName()).log(Level.SEVERE, null, e);
- }
-
- return (byteReturn);
+ return new byte[0];
}
/** Return the class name of the component.
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 1860c3c..c092d0f 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -135,33 +135,9 @@ public class CallTableWizard
return (booleanSupportsService);
}
- /** This method returns an array of bytes, that can be used to
- * unambiguously distinguish between two sets of types, e.g.
- * to realise hashing functionality when the object is introspected.
- * Two objects that return the same ID also have to return
- * the same set of types in getTypes(). If an unique
- * implementation Id cannot be provided this method has to
- * return an empty sequence. Important: If the object
- * aggregates other objects the ID has to be unique for the
- * whole combination of objects.
- * @return Array of bytes, in order to distinguish between two sets.
- */
public byte[] getImplementationId()
{
- byte[] byteReturn =
- {
- };
-
- try
- {
- byteReturn = (PropertyNames.EMPTY_STRING + this.hashCode()).getBytes();
- }
- catch (Exception exception)
- {
- System.err.println(exception);
- }
-
- return (byteReturn);
+ return new byte[0];
}
/** Return the class name of the component.
commit a3cdc0c68b59ba206647594979dbc86c51ef2a95
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:40:15 2014 +0100
unotools: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I99cea658b20cf342f503f61c1cb91a8e29abf1ad
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index e3ae2a0..00bf5a3 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -245,16 +245,11 @@ uno::Sequence< ::com::sun::star::uno::Type>
return aTypeSequence;
}
-namespace
-{
- class theAccessibleRelationSetHelperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAccessibleRelationSetHelperUnoTunnelId > {};
-}
-
uno::Sequence<sal_Int8> SAL_CALL
AccessibleRelationSetHelper::getImplementationId (void)
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- return theAccessibleRelationSetHelperUnoTunnelId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 457a84a..55fd445 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -257,16 +257,11 @@ uno::Sequence< ::com::sun::star::uno::Type>
return aTypeSequence;
}
-namespace
-{
- class theAccessibleStateSetHelperUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theAccessibleStateSetHelperUnoTunnelId > {};
-}
-
uno::Sequence<sal_Int8> SAL_CALL
AccessibleStateSetHelper::getImplementationId (void)
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- return theAccessibleStateSetHelperUnoTunnelId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c7d2ed40de437010544ae9d0a40882732a0d0adb
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:37:26 2014 +0100
ucbhelper: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I7797ba7fdc47a5f8d2453e839d8644bf125652bd
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index e74c597..9f69cda 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -58,17 +58,7 @@ com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \
Class::getImplementationId() \
throw( com::sun::star::uno::RuntimeException, std::exception ) \
{ \
- static cppu::OImplementationId* pId = NULL; \
- if ( !pId ) \
- { \
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() ); \
- if ( !pId ) \
- { \
- static cppu::OImplementationId id( false ); \
- pId = &id; \
- } \
- } \
- return (*pId).getImplementationId(); \
+ return css::uno::Sequence<sal_Int8>(); \
}
#define GETTYPES_IMPL_START( Class ) \
diff --git a/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index 387e04d..6d389af 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.cxx
@@ -136,17 +136,7 @@ Sequence< sal_Int8 > SAL_CALL
ContentIdentifier::getImplementationId()
throw( RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index 3521968..5e51bb2 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -147,17 +147,7 @@ InteractionRequest::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionRequest::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -299,17 +289,7 @@ InteractionAbort::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionAbort::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -401,17 +381,7 @@ InteractionRetry::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionRetry::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -503,17 +473,7 @@ InteractionApprove::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionApprove::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -605,17 +565,7 @@ InteractionDisapprove::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionDisapprove::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -709,17 +659,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
InteractionSupplyAuthentication::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -973,17 +913,7 @@ InteractionSupplyName::queryInterface( const uno::Type & rType )
uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyName::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -1090,17 +1020,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
InteractionReplaceExistingData::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
commit a3858b40f376465ed08874ad1697f1178da6f633
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:34:55 2014 +0100
ucb: simplify deprecated XTypeProvider.getImplementationId
Change-Id: Ifece71871e3af4021f885c5dac1b6c406d2962b2
diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 0fb38f5..b33c63b 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -84,17 +84,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
FileContentIdentifier::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index 88641aa..7bc48eb 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -145,17 +145,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContent::getImplementationId()
throw( css::uno::RuntimeException,
std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index 0232bd5..94837e4 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -76,17 +76,7 @@ Sequence<sal_Int8> SAL_CALL
FTPContentIdentifier::getImplementationId()
throw(RuntimeException, std::exception)
{
- static cppu::OImplementationId* pId = NULL;
- if(!pId)
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 0b2c578..8e12847 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -84,17 +84,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL FTPContentProvider::getImplementationId(
throw( css::uno::RuntimeException,
std::exception )
{
- static cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index 1a5ddcc..8bfac5f 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -127,17 +127,7 @@ uno::Sequence< sal_Int8 > SAL_CALL
InteractionSupplyPassword::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static cppu::OImplementationId * pId = 0;
- if ( !pId )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static cppu::OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index a0ec619..c5f4aa3 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -207,7 +207,7 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId()
throw ( uno::RuntimeException, std::exception )
{
- return m_xWrappedTypeProv->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -670,7 +670,7 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId()
throw ( uno::RuntimeException, std::exception )
{
- return m_xWrappedTypeProv->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -865,7 +865,7 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId()
throw ( uno::RuntimeException, std::exception )
{
- return m_xWrappedTypeProv->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
commit 2b0cfed33fa3f00485a4cf1566c90ede0a5139f0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:30:46 2014 +0100
toolkit: simplify deprecated XTypeProvider.getImplementationId
Change-Id: Ibe481aebad026f8c182052f1327bed8a1054cf7a
diff --git a/include/toolkit/controls/geometrycontrolmodel_impl.hxx b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
index c035c2e..b8054dd 100644
--- a/include/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel_impl.hxx
@@ -58,17 +58,7 @@ void OGeometryControlModel<CONTROLMODEL>::fillProperties(::com::sun::star::uno::
template <class CONTROLMODEL>
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL OGeometryControlModel<CONTROLMODEL>::getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- static ::cppu::OImplementationId * pId = NULL;
- if ( !pId )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static ::cppu::OImplementationId s_aId;
- pId = &s_aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index f6622cb..22ae92f 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -78,17 +78,7 @@ ClassName* ClassName::GetImplementation( const ::com::sun::star::uno::Reference<
#define IMPL_IMPLEMENTATION_ID( ClassName ) \
::com::sun::star::uno::Sequence< sal_Int8 > ClassName::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception) \
{ \
- static ::cppu::OImplementationId* pId = NULL; \
- if( !pId ) \
- { \
- ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() ); \
- if( ! pId ) \
- { \
- static ::cppu::OImplementationId id( false ); \
- pId = &id; \
- } \
- } \
- return (*pId).getImplementationId(); \
+ return css::uno::Sequence<sal_Int8>(); \
}
#define IMPL_XTYPEPROVIDER_START( ClassName ) \
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 1a2bc62..64c780d 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -288,41 +288,7 @@ throw(css::uno::RuntimeException, std::exception)
css::uno::Sequence< sal_Int8 > VCLXMenu::getImplementationId()
throw(css::uno::RuntimeException, std::exception)
{
- ::osl::ResettableGuard < ::osl::Mutex > aGuard( GetMutex() );
- const bool bIsPopupMenu = IsPopupMenu();
- aGuard.clear();
-
- static ::cppu::OImplementationId* pIdMenuBar = NULL;
- static ::cppu::OImplementationId* pIdPopupMenu = NULL;
-
- if ( bIsPopupMenu )
- {
- if( !pIdPopupMenu )
- {
- ::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
- if( !pIdPopupMenu )
- {
- static ::cppu::OImplementationId idPopupMenu( false );
- pIdPopupMenu = &idPopupMenu;
- }
- }
-
- return (*pIdPopupMenu).getImplementationId();
- }
- else
- {
- if( !pIdMenuBar )
- {
- ::osl::Guard< ::osl::Mutex > aGlobalGuard( ::osl::Mutex::getGlobalMutex() );
- if( !pIdMenuBar )
- {
- static ::cppu::OImplementationId idMenuBar( false );
- pIdMenuBar = &idMenuBar;
- }
- }
-
- return (*pIdMenuBar).getImplementationId();
- }
+ return css::uno::Sequence<sal_Int8>();
}
void VCLXMenu::addMenuListener(
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 1c34438..8636454 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -277,36 +277,7 @@ Window* VCLXTopWindow::GetWindowImpl()
::com::sun::star::uno::Sequence< sal_Int8 > VCLXTopWindow::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pId = NULL;
- static ::cppu::OImplementationId* pIdWithHandle = NULL;
- if ( isSystemDependentWindowPeer() )
- {
- if( !pIdWithHandle )
- {
- ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
- if( !pIdWithHandle )
- {
- static ::cppu::OImplementationId idWithHandle( false );
- pIdWithHandle = &idWithHandle;
- }
- }
-
- return (*pIdWithHandle).getImplementationId();
- }
- else
- {
- if( !pId )
- {
- ::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
- if( !pId )
- {
- static ::cppu::OImplementationId id( false );
- pId = &id;
- }
- }
-
- return (*pId).getImplementationId();
- }
+ return css::uno::Sequence<sal_Int8>();
}
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > VCLXTopWindow::getTypes() throw(::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 0525980..650b631 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.cxx
@@ -580,16 +580,9 @@
return new OCommonGeometryControlModel( _rxAggregateInstance, m_sServiceSpecifier );
}
- namespace
- {
- class theOCommonGeometryControlModelImplementationId :
- public rtl::Static< ::cppu::OImplementationId, theOCommonGeometryControlModelImplementationId > {};
- }
-
-
Sequence< sal_Int8 > SAL_CALL OCommonGeometryControlModel::getImplementationId( ) throw (RuntimeException, std::exception)
{
- return theOCommonGeometryControlModelImplementationId::get().getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/toolkit/source/controls/grid/sortablegriddatamodel.cxx b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
index cd2e28c..8efdae7 100644
--- a/toolkit/source/controls/grid/sortablegriddatamodel.cxx
+++ b/toolkit/source/controls/grid/sortablegriddatamodel.cxx
@@ -342,8 +342,7 @@ private:
Sequence< ::sal_Int8 > SAL_CALL SortableGridDataModel::getImplementationId( ) throw (RuntimeException, std::exception)
{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
commit 2f67d67cf3264f8647433a298dec7270f4bfb689
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:26:07 2014 +0100
testtools: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I2ab505962c64711d72f2a6b4cdebaef2f1bf4439
diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java
index 211333c..bfc41cf 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponent.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponent.java
@@ -290,7 +290,7 @@ public class TestComponent {
}
public byte[] getImplementationId() throws com.sun.star.uno.RuntimeException {
- return toString().getBytes();
+ return new byte[0];
}
}
@@ -970,7 +970,7 @@ public class TestComponent {
}
public byte[] getImplementationId() throws com.sun.star.uno.RuntimeException {
- return toString().getBytes();
+ return new byte[0];
}
//XBridgeTest2
commit bc75f70b6ab5d8c6e8182305e6388a29cb82b67f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:24:57 2014 +0100
sw: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I2cdc80489a1325a9c956dea4689fac1e9184df1b
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 692d750..927374c 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -143,7 +143,6 @@ class SwXShape : public SwXShapeBaseClass,
const SfxItemPropertySet* m_pPropSet;
const SfxItemPropertyMapEntry* m_pPropertyMapEntries;
- com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId;
SwShapeDescriptor_Impl* pImpl;
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index e1751b4..1eea4f7 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -330,15 +330,10 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes()
return aTypes;
}
-namespace
-{
- class theSwAccessibleCellImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleCellImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwAccessibleCellImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XAccessibleValue
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 2efe469..ab3a1d2 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -505,15 +505,10 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
return aTypes;
}
-namespace
-{
- class theSwAccessibleDocumentImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleDocumentImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwAccessibleDocumentImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XAccessibleSelection
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 762482e..71f1c6c 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -96,15 +96,10 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServi
return aRet;
}
-namespace
-{
- class theSwAccessibleEmbeddedObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleEmbeddedObjectImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwAccessibleEmbeddedObjectImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XAccessibleExtendedAttributes
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 9c48690..af564b2 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -122,15 +122,10 @@ Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames()
return aRet;
}
-namespace
-{
- class theSwAccessibleFootnoteImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleFootnoteImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
throw(RuntimeException, std::exception)
{
- return theSwAccessibleFootnoteImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
sal_Bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm )
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 5b27c4f..9075294 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -64,15 +64,10 @@ Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames()
return aRet;
}
-namespace
-{
- class theSwAccessibleGraphicImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleGraphicImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId()
throw(RuntimeException, std::exception)
{
- return theSwAccessibleGraphicImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// Return this object's role.
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index aae9493..b5a8a89 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -106,15 +106,10 @@ Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames
return aRet;
}
-namespace
-{
- class theSwAccessibleHeaderFooterImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleHeaderFooterImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId()
throw(RuntimeException, std::exception)
{
- return theSwAccessibleHeaderFooterImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
sal_Int32 SAL_CALL SwAccessibleHeaderFooter::getBackground()
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index f0acbc2..552ffa1 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -158,15 +158,10 @@ Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( )
return aRet;
}
-namespace
-{
- class theSwAccessiblePageImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessiblePageImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId()
throw(RuntimeException, std::exception)
{
- return theSwAccessiblePageImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
OUString SwAccessiblePage::getAccessibleDescription( )
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 82e9ff3..8ff2410 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1334,15 +1334,10 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno:
return aTypes;
}
-namespace
-{
- class theSwAccessibleParagraphImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleParagraphImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwAccessibleParagraphImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XAccesibleText
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index e3fb173..f9c0626 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -63,15 +63,10 @@ Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( )
return aSeq;
}
-namespace
-{
- class theSwAccessiblePreviewImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessiblePreviewImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId()
throw(RuntimeException, std::exception)
{
- return theSwAccessiblePreviewImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
OUString SAL_CALL SwAccessiblePreview::getAccessibleDescription (void) throw (com::sun::star::uno::RuntimeException, std::exception)
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index cada4c7..4a973a0 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -890,15 +890,10 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes()
return aTypes;
}
-namespace
-{
- class theSwAccessibleTableImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleTableImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwAccessibleTableImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// #i77106#
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index f396d59..e4c9aed 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -294,15 +294,10 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNam
return aRet;
}
-namespace
-{
- class theSwAccessibleTextFrameImplementationId : public rtl::Static< UnoTunnelIdInit, theSwAccessibleTextFrameImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwAccessibleTextFrameImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XAccessibleRelationSet
diff --git a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
index 48f68db..877e805 100644
--- a/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
+++ b/sw/source/core/uibase/uno/SwXDocumentSettings.cxx
@@ -283,15 +283,10 @@ uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( )
return aBaseTypes;
}
-namespace
-{
- class theSwXDocumentSettingsImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXDocumentSettingsImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwXDocumentSettings::getImplementationId( )
throw (RuntimeException, std::exception)
{
- return theSwXDocumentSettingsImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
void SwXDocumentSettings::_preSetValues ()
diff --git a/sw/source/core/uibase/uno/unotxvw.cxx b/sw/source/core/uibase/uno/unotxvw.cxx
index c7e9c4e..2ec1dc8 100644
--- a/sw/source/core/uibase/uno/unotxvw.cxx
+++ b/sw/source/core/uibase/uno/unotxvw.cxx
@@ -150,14 +150,9 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeExcep
return aBaseTypes;
}
-namespace
-{
- class theSwXTextViewImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXTextViewImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSwXTextViewImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
void SAL_CALL SwXTextView::acquire( )throw()
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 8629883..d45243f 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -19,8 +19,6 @@
#include <sal/config.h>
-#include <map>
-
#include <cmdid.h>
#include <unodraw.hxx>
@@ -66,10 +64,6 @@
using namespace ::com::sun::star;
-typedef std::map<OUString, uno::Sequence< sal_Int8 > *> SwShapeImplementationIdMap;
-
-static SwShapeImplementationIdMap aImplementationIdMap;
-
class SwShapeDescriptor_Impl
{
SwFmtHoriOrient* pHOrient;
@@ -903,7 +897,6 @@ namespace
SwXShape::SwXShape(uno::Reference< uno::XInterface > & xShape) :
m_pPropSet(aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_SHAPE)),
m_pPropertyMapEntries(aSwMapProvider.GetPropertyMapEntries(PROPERTY_MAP_TEXT_SHAPE)),
- pImplementationId(0),
pImpl(new SwShapeDescriptor_Impl()),
m_bDescriptor(sal_True)
{
@@ -1034,44 +1027,7 @@ uno::Sequence< uno::Type > SwXShape::getTypes( ) throw(uno::RuntimeException, s
uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- SolarMutexGuard aGuard;
- // do we need to compute the implementation id for this instance?
- if( !pImplementationId && xShapeAgg.is())
- {
- uno::Reference< XShape > xAggShape;
- xShapeAgg->queryAggregation( ::getCppuType((uno::Reference< XShape >*)0) ) >>= xAggShape;
-
- if( xAggShape.is() )
- {
- const OUString aShapeType( xAggShape->getShapeType() );
- // did we already compute an implementation id for the aggregated shape type?
- SwShapeImplementationIdMap::iterator aIter( aImplementationIdMap.find(aShapeType ) );
- if( aIter == aImplementationIdMap.end() )
- {
- // we need to create a new implementation id for this
- // note: this memory is not free'd until application exists
- // but since we have a fixed set of shapetypes and the
- // memory will be reused this is ok.
- pImplementationId = new uno::Sequence< sal_Int8 >( 16 );
- rtl_createUuid( (sal_uInt8 *) pImplementationId->getArray(), 0, sal_True );
- aImplementationIdMap[ aShapeType ] = pImplementationId;
- }
- else
- {
- // use the already computed implementation id
- pImplementationId = (*aIter).second;
- }
- }
- }
- if( NULL == pImplementationId )
- {
- OSL_FAIL( "Could not create an implementation id for a SwXShape!" );
- return uno::Sequence< sal_Int8 > ();
- }
- else
- {
- return *pImplementationId;
- }
+ return css::uno::Sequence<sal_Int8>();
}
uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) throw( uno::RuntimeException, std::exception )
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index 1a3b103..ec70dad 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -81,14 +81,9 @@ uno::Sequence< uno::Type > SwXFlatParagraph::getTypes( ) throw(uno::RuntimeExce
return aTypes;
}
-namespace
-{
- class theSwXFlatParagraphImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXFlatParagraphImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SwXFlatParagraph::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSwXFlatParagraphImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
uno::Any SAL_CALL SwXFlatParagraph::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception)
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 1c532f2..4d8cd3e 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2583,14 +2583,9 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) throw(uno::Runtim
return aTextFrameTypes;
}
-namespace
-{
- class theSwXTextFrameImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXTextFrameImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSwXTextFrameImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
uno::Reference< text::XText > SwXTextFrame::getText(void) throw( uno::RuntimeException, std::exception )
@@ -2873,14 +2868,9 @@ uno::Sequence< uno::Type > SAL_CALL
return aGraphicTypes;
}
-namespace
-{
- class theSwXTextGraphicObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXTextGraphicObjectImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwXTextGraphicObject::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSwXTextGraphicObjectImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
void SwXTextGraphicObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
@@ -3003,14 +2993,9 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextEmbeddedObject::getTypes( ) throw(un
return aTextEmbeddedTypes;
}
-namespace
-{
- class theSwXTextEmbeddedObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXTextEmbeddedObjectImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwXTextEmbeddedObject::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSwXTextEmbeddedObjectImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
void SwXTextEmbeddedObject::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index eb62ac5..6bb544e 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -225,15 +225,10 @@ SwXFootnote::getTypes() throw (uno::RuntimeException, std::exception)
return ::comphelper::concatSequences(aTypes, aTextTypes);
}
-namespace
-{
- class theSwXFootnoteImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXFootnoteImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL
SwXFootnote::getImplementationId() throw (uno::RuntimeException, std::exception)
{
- return theSwXFootnoteImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
uno::Any SAL_CALL
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index b734e57..84f1a71 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -92,15 +92,10 @@ uno::Sequence<uno::Type> SwXRedlineText::getTypes()
return aTypes;
}
-namespace
-{
- class theSwXRedlineTextImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXRedlineTextImplementationId> {};
-}
-
uno::Sequence<sal_Int8> SwXRedlineText::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwXRedlineTextImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor(void)
@@ -289,14 +284,9 @@ void SwXRedlinePortion::Validate() throw( uno::RuntimeException )
throw uno::RuntimeException();
}
-namespace
-{
- class theSwXRedlinePortionImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXRedlinePortionImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSwXRedlinePortionImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
uno::Any SwXRedlinePortion::GetPropertyValue( const OUString& rPropertyName, const SwRangeRedline& rRedline ) throw()
@@ -656,15 +646,10 @@ uno::Sequence<uno::Type> SwXRedline::getTypes()
return aTypes;
}
-namespace
-{
- class theSwXRedlineImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXRedlineImplementationId > {};
-}
-
uno::Sequence<sal_Int8> SwXRedline::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theSwXRedlineImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 6e9e2e6..23c39cd 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -627,7 +627,7 @@ throw (uno::RuntimeException)
uno::Sequence<sal_Int8> SAL_CALL
SwXMetaText::getImplementationId() throw (uno::RuntimeException, std::exception)
{
- return m_rMeta.getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XText
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index cfc5701..3721920 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -847,14 +847,9 @@ uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes( ) throw(uno::RuntimeExce
return aRetTypes;
}
-namespace
-{
- class theSwXCellImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXCellImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSwXCellImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
void SAL_CALL SwXCell::acquire( ) throw()
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 5cf2552..2fc83fa 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -2429,15 +2429,10 @@ SwXBodyText::getTypes() throw (uno::RuntimeException, std::exception)
return ::comphelper::concatSequences(aTypes, aTextTypes);
}
-namespace
-{
- class theSwXBodyTextImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXBodyTextImplementationId> {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL
SwXBodyText::getImplementationId() throw (uno::RuntimeException, std::exception)
{
- return theSwXBodyTextImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
uno::Any SAL_CALL
@@ -2716,15 +2711,10 @@ SwXHeadFootText::getTypes() throw (uno::RuntimeException, std::exception)
return ::comphelper::concatSequences(aTypes, aTextTypes);
}
-namespace
-{
- class theSwXHeadFootTextImplementationId : public rtl::Static< UnoTunnelIdInit, theSwXHeadFootTextImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL
SwXHeadFootText::getImplementationId() throw (uno::RuntimeException, std::exception)
{
- return theSwXHeadFootTextImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
uno::Any SAL_CALL
commit 3b0b4ac5fc16a5f5568dd4da63818723b6d1d6fd
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:15:26 2014 +0100
svx: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I520563a98c1285fed97174d2aaedfdd042ca699f
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index c5951c5..ef06ecd 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -581,8 +581,7 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
//===== XTypeProvider =======================================================
Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception )
{
- ::SolarMutexGuard aGuard;
- return getUniqueId();
+ return css::uno::Sequence<sal_Int8>();
}
//===== XServiceName ========================================================
@@ -829,26 +828,6 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeEx
return aBounds;
}
-
-
-Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void )
-{
- // no guard because it's private -> has to guarded when using it!
- static OImplementationId* pId = 0;
- if( !pId )
- {
- ::SolarMutexGuard aGuard;
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
-}
-
-
-
void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index f783ac6..56ac207 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -543,7 +543,7 @@ Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNa
Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception )
{
- return getUniqueId();
+ return css::uno::Sequence<sal_Int8>();
}
//===== XAccessibleSelection =============================================
@@ -761,21 +761,6 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeExce
return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() );
}
-Sequence< sal_Int8 > SvxRectCtlAccessibleContext::getUniqueId( void )
-{
- static OImplementationId* pId = 0;
- if( !pId )
- {
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
-}
-
void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException )
{
if( IsNotAlive() )
@@ -1154,17 +1139,7 @@ Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServ
//===== XTypeProvider =======================================================
Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception )
{
- static OImplementationId* pId = 0;
- if( !pId )
- {
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
//===== internal ============================================================
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 90ab712..933844c 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -391,17 +391,7 @@ Sequence< Type> SAL_CALL FmXGridControl::getTypes( ) throw(RuntimeException, st
Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XServiceInfo
@@ -1062,17 +1052,7 @@ Sequence< Type> SAL_CALL FmXGridPeer::getTypes( ) throw(RuntimeException, std::
Sequence<sal_Int8> SAL_CALL FmXGridPeer::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index aa3fb08..2e5a341 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -40,17 +40,7 @@ SvxFmDrawPage::~SvxFmDrawPage() throw ()
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL SvxFmDrawPage::getImplementationId() throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw(RuntimeException, std::exception)
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 20cee16..a9f4eaf 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -766,17 +766,7 @@ Sequence< Type > SAL_CALL FmXFormShell::getTypes( ) throw(RuntimeException, std
Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// EventListener
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 21dc44d..6ae3b39 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -659,17 +659,7 @@ Any SAL_CALL FormController::queryInterface( const Type& _rType ) throw(RuntimeE
Sequence< sal_Int8 > SAL_CALL FormController::getImplementationId() throw( RuntimeException, std::exception )
{
- static ::cppu::OImplementationId* pId = NULL;
- if ( !pId )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !pId )
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException, std::exception)
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index 9391d01..f8c0142 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -106,17 +106,7 @@ namespace svxform
Sequence<sal_Int8> SAL_CALL OAddConditionDialog::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId * pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 9507cdee..17c5ff5 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -185,8 +185,6 @@ public:
*/
void setModelAndView (SdrModel* pModel, SdrView* pView);
-private:
- static ::com::sun::star::uno::Sequence< sal_Int8 > getUniqueId( void );
protected:
/** Return the object's current bounding box relative to the desktop,
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 7834b8d..dd2043e 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -255,8 +255,6 @@ public:
void selectChild( RECT_POINT ePoint, sal_Bool bFireFocus = sal_True );
void FireChildFocus( RECT_POINT eButton );
-private:
- static ::com::sun::star::uno::Sequence< sal_Int8 > getUniqueId( void );
protected:
/// @Return the object's current bounding box relative to the desktop.
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index af3da32..c58b181 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -855,17 +855,7 @@ Sequence< Type > SAL_CALL Cell::getTypes( ) throw (RuntimeException, std::excep
Sequence< sal_Int8 > SAL_CALL Cell::getImplementationId( ) throw (RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XServiceInfo
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 9f433a7..1f18880 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -310,14 +310,9 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawingModel::getTypes( ) throw(uno::
return maTypeSequence;
}
-namespace
-{
- class theSvxUnoDrawingModelImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoDrawingModelImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawingModel::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSvxUnoDrawingModelImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
void SAL_CALL SvxUnoDrawingModel::lockControllers( )
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 66cb8e4..4a14b58 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -382,15 +382,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoDrawPool::getTypes()
return aTypes;
}
-namespace
-{
- class theSvxUnoDrawPoolImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxUnoDrawPoolImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxUnoDrawPool::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- return theSvxUnoDrawPoolImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XServiceInfo
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index a59c509..14bf98a 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -131,15 +131,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeGroup::getTypes()
return SvxShape::getTypes();
}
-namespace
-{
- class theSvxShapeGroupImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxShapeGroupImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxShapeGroup::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- return theSvxShapeGroupImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// ::com::sun::star::drawing::XShape
@@ -426,15 +421,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeConnector::getTypes()
return SvxShape::getTypes();
}
-namespace
-{
- class theSvxShapeConnectorImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxShapeConnectorImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxShapeConnector::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- return theSvxShapeConnectorImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// ::com::sun::star::drawing::XShape
@@ -590,15 +580,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxShapeControl::getTypes()
return SvxShape::getTypes();
}
-namespace
-{
- class theSvxShapeControlImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxShapeControlImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxShapeControl::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- return theSvxShapeControlImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// ::com::sun::star::drawing::XShape
@@ -1790,15 +1775,10 @@ uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes()
return SvxShapeText::getTypes();
}
-namespace
-{
- class theSvxCustomShapeImplementationId : public rtl::Static< UnoTunnelIdInit, theSvxCustomShapeImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvxCustomShape::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- return theSvxCustomShapeImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// ::com::sun::star::drawing::XShape
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index e5e3768..765d19f 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -117,15 +117,10 @@ uno::Sequence< uno::Type > SAL_CALL Svx3DSceneObject::getTypes()
return SvxShape::getTypes();
}
-namespace
-{
- class theSvx3DSceneObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSvx3DSceneObjectImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL Svx3DSceneObject::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- return theSvx3DSceneObjectImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 71a82eb..962df11 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1024,24 +1024,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
uno::Sequence< sal_Int8 > SAL_CALL SvxShape::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pID = NULL ;
-
- if ( pID == NULL )
- {
- // Ready for multithreading; get global mutex for first call of this method only! see before
- MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-
- // Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pID == NULL )
- {
- // Create a new static ID ...
- static ::cppu::OImplementationId aID( false ) ;
- // ... and set his address to static pointer!
- pID = &aID ;
- }
- }
-
- return pID->getImplementationId() ;
+ return css::uno::Sequence<sal_Int8>();
}
@@ -4095,24 +4078,7 @@ sal_Int64 SAL_CALL SvxShapeText::getSomething( const ::com::sun::star::uno::Sequ
uno::Sequence< sal_Int8 > SAL_CALL SvxShapeText::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static ::cppu::OImplementationId* pID = NULL ;
-
- if ( pID == NULL )
- {
- // Ready for multithreading; get global mutex for first call of this method only! see before
- MutexGuard aGuard( osl::Mutex::getGlobalMutex() ) ;
-
- // Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pID == NULL )
- {
- // Create a new static ID ...
- static ::cppu::OImplementationId aID( false ) ;
- // ... and set his address to static pointer!
- pID = &aID ;
- }
- }
-
- return pID->getImplementationId() ;
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index e0c138f..1f116e9 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -178,15 +178,10 @@ uno::Sequence< uno::Type > SAL_CALL GalleryItem::getTypes()
return aTypes;
}
-namespace
-{
- class theGalleryItemImplementationId : public rtl::Static< UnoTunnelIdInit, theGalleryItemImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL GalleryItem::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theGalleryItemImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 56a0094..9e43d0d 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -123,15 +123,10 @@ uno::Sequence< uno::Type > SAL_CALL GalleryTheme::getTypes()
return aTypes;
}
-namespace
-{
- class theGalleryThemeImplementationId : public rtl::Static< UnoTunnelIdInit, theGalleryThemeImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL GalleryTheme::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theGalleryThemeImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index f405429..c825205 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -80,15 +80,10 @@ uno::Sequence< uno::Type > SAL_CALL GalleryThemeProvider::getTypes()
return aTypes;
}
-namespace
-{
- class theGalleryThemeProviderImplementationId : public rtl::Static< UnoTunnelIdInit, theGalleryThemeProviderImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL GalleryThemeProvider::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theGalleryThemeProviderImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
void SAL_CALL GalleryThemeProvider::initialize( const uno::Sequence< uno::Any >& rArguments )
commit 62fae8bda81508828cca4ed8d2911961ce1971a4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:06:53 2014 +0100
svtools: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I2534ad4a720dd5d13324ac6fb19b8676ae50ff4e
diff --git a/include/svtools/accessibleruler.hxx b/include/svtools/accessibleruler.hxx
index 35d8090..7188d3b 100644
--- a/include/svtools/accessibleruler.hxx
+++ b/include/svtools/accessibleruler.hxx
@@ -179,8 +179,6 @@ public:
virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId( void ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
-private:
- static ::com::sun::star::uno::Sequence< sal_Int8 > getUniqueId( void );
protected:
/// @Return the object's current bounding box relative to the desktop.
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index 99e1dd5..c9d55b9 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -379,7 +379,7 @@ Sequence< OUString > SAL_CALL SvtRulerAccessible::getSupportedServiceNames( void
//===== XTypeProvider =======================================================
Sequence< sal_Int8 > SAL_CALL SvtRulerAccessible::getImplementationId( void ) throw( RuntimeException, std::exception )
{
- return getUniqueId();
+ return css::uno::Sequence<sal_Int8>();
}
void SAL_CALL SvtRulerAccessible::disposing()
@@ -425,21 +425,6 @@ Rectangle SvtRulerAccessible::GetBoundingBox( void ) throw( RuntimeException )
return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() );
}
-Sequence< sal_Int8 > SvtRulerAccessible::getUniqueId( void )
-{
- static OImplementationId* pId = 0;
- if( !pId )
- {
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
-}
-
void SvtRulerAccessible::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException )
{
if( IsNotAlive() )
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index f235e21..e094783 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -278,15 +278,10 @@ uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes()
return aTypes;
}
-namespace
-{
- class theGraphicDescriptorUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicDescriptorUnoTunnelId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- return theGraphicDescriptorUnoTunnelId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 1248f6a..3b75db9 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -99,21 +99,6 @@ void SAL_CALL Graphic::release() throw()
::unographic::GraphicDescriptor::release();
}
-
-
-namespace
-{
- class theGraphicUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicUnoTunnelId > {};
-}
-
-uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId_Static()
- throw(uno::RuntimeException)
-{
- return theGraphicUnoTunnelId::get().getSeq();
-}
-
-
-
OUString Graphic::getImplementationName_Static()
throw()
{
@@ -177,7 +162,7 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return getImplementationId_Static();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svtools/source/graphic/graphic.hxx b/svtools/source/graphic/graphic.hxx
index b399a5f..acfbd45 100644
--- a/svtools/source/graphic/graphic.hxx
+++ b/svtools/source/graphic/graphic.hxx
@@ -45,7 +45,6 @@ public:
void init( const ::Graphic& rGraphic ) throw();
static const ::Graphic* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
- static ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId_Static( ) throw(::com::sun::star::uno::RuntimeException);
static OUString getImplementationName_Static() throw();
static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx
index 2adc8e8..0a4d36b 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -91,15 +91,10 @@ uno::Sequence< uno::Type > SAL_CALL GraphicProvider::getTypes()
return aTypes;
}
-namespace
-{
- class theGraphicProviderUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicProviderUnoTunnelId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId()
throw(uno::RuntimeException, std::exception)
{
- return theGraphicProviderUnoTunnelId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index d5f6163..e903fc9 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -146,15 +146,10 @@ uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes()
return aTypes;
}
-namespace
-{
- class theGraphicRendererVCLUnoTunnelId : public rtl::Static< UnoTunnelIdInit, theGraphicRendererVCLUnoTunnelId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- return theGraphicRendererVCLUnoTunnelId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index eaefd7a..402d8a5 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -161,20 +161,7 @@ uno::Sequence< uno::Type > SAL_CALL VCLXHatchWindow::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL VCLXHatchWindow::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static ::cppu::OImplementationId* pID = NULL ;
-
- if ( pID == NULL )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-
- if ( pID == NULL )
- {
- static ::cppu::OImplementationId aID( false ) ;
- pID = &aID ;
- }
- }
-
- return pID->getImplementationId() ;
+ return css::uno::Sequence<sal_Int8>();
}
::com::sun::star::awt::Size SAL_CALL VCLXHatchWindow::getHatchBorderSize() throw (::com::sun::star::uno::RuntimeException, std::exception)
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 1d45f6c..f947fa8 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -89,8 +89,7 @@ namespace {
Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 21fbb35..e870957 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -361,15 +361,10 @@ uno::Sequence< uno::Type > SAL_CALL SvUnoImageMapObject::getTypes()
return aTypes;
}
-namespace
-{
- class theSvUnoImageMapObjectImplementationId : public rtl::Static< UnoTunnelIdInit, theSvUnoImageMapObjectImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SvUnoImageMapObject::getImplementationId()
throw (uno::RuntimeException, std::exception)
{
- return theSvUnoImageMapObjectImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XServiceInfo
commit ecc65fb2dfedce086e979ade9b0a3504b233be27
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 16:00:59 2014 +0100
svl: simplify deprecated XTypeProvider.getImplementationId
Change-Id: Ib1e59f755e0472efe0448d1976cdfba13c64ff18
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 81713ce..12087e3 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -342,21 +342,7 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static ::cppu::OImplementationId* pID = NULL ;
-
- if ( pID == NULL )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-
- if ( pID == NULL )
- {
- static ::cppu::OImplementationId aID( false ) ;
- pID = &aID ;
- }
- }
-
- return pID->getImplementationId() ;
-
+ return css::uno::Sequence<sal_Int8>();
}
// XStorage
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index 07c1098..eed5e5a 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -185,20 +185,7 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId()
throw( uno::RuntimeException, std::exception )
{
- static ::cppu::OImplementationId* pID = NULL ;
-
- if ( pID == NULL )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-
- if ( pID == NULL )
- {
- static ::cppu::OImplementationId aID( false ) ;
- pID = &aID ;
- }
- }
-
- return pID->getImplementationId() ;
+ return css::uno::Sequence<sal_Int8>();
}
// XStream
commit 5bce6e34cd94ba3dd6e5fd2c96226ed62a3fea76
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 15:59:35 2014 +0100
stoc: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I57eca2dcf316232c26c528015c4ba18ba3c4760d
diff --git a/stoc/source/corereflection/crarray.cxx b/stoc/source/corereflection/crarray.cxx
index 527541f..2ff8d23 100644
--- a/stoc/source/corereflection/crarray.cxx
+++ b/stoc/source/corereflection/crarray.cxx
@@ -68,17 +68,7 @@ Sequence< Type > ArrayIdlClassImpl::getTypes()
Sequence< sal_Int8 > ArrayIdlClassImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- static OImplementationId * s_pId = 0;
- if (! s_pId)
- {
- MutexGuard aGuard( getMutexAccess() );
- if (! s_pId)
- {
- static OImplementationId s_aId;
- s_pId = &s_aId;
- }
- }
- return s_pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XIdlArray
diff --git a/stoc/source/corereflection/crcomp.cxx b/stoc/source/corereflection/crcomp.cxx
index 9e9a2dd..129ba91c 100644
--- a/stoc/source/corereflection/crcomp.cxx
+++ b/stoc/source/corereflection/crcomp.cxx
@@ -111,17 +111,7 @@ Sequence< Type > IdlCompFieldImpl::getTypes()
Sequence< sal_Int8 > IdlCompFieldImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- static OImplementationId * s_pId = 0;
- if (! s_pId)
- {
- MutexGuard aGuard( getMutexAccess() );
- if (! s_pId)
- {
- static OImplementationId s_aId;
- s_pId = &s_aId;
- }
- }
- return s_pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index ad5367e..00e5ac4 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -119,17 +119,7 @@ Sequence< Type > IdlReflectionServiceImpl::getTypes()
Sequence< sal_Int8 > IdlReflectionServiceImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- static OImplementationId * s_pId = 0;
- if (! s_pId)
- {
- MutexGuard aGuard( _aComponentMutex );
- if (! s_pId)
- {
- static OImplementationId s_aId;
- s_pId = &s_aId;
- }
- }
- return s_pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XComponent
diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx
index 2420ad1..5a3ce32 100644
--- a/stoc/source/corereflection/crenum.cxx
+++ b/stoc/source/corereflection/crenum.cxx
@@ -109,17 +109,7 @@ Sequence< Type > IdlEnumFieldImpl::getTypes()
Sequence< sal_Int8 > IdlEnumFieldImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- static OImplementationId * s_pId = 0;
- if (! s_pId)
- {
- MutexGuard aGuard( getMutexAccess() );
- if (! s_pId)
- {
- static OImplementationId s_aId;
- s_pId = &s_aId;
- }
- }
- return s_pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
diff --git a/stoc/source/corereflection/criface.cxx b/stoc/source/corereflection/criface.cxx
index 97ac7b9..11a9640 100644
--- a/stoc/source/corereflection/criface.cxx
+++ b/stoc/source/corereflection/criface.cxx
@@ -123,17 +123,7 @@ Sequence< Type > IdlAttributeFieldImpl::getTypes()
Sequence< sal_Int8 > IdlAttributeFieldImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- static OImplementationId * s_pId = 0;
- if (! s_pId)
- {
- MutexGuard aGuard( getMutexAccess() );
- if (! s_pId)
- {
- static OImplementationId s_aId;
- s_pId = &s_aId;
- }
- }
- return s_pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
@@ -427,17 +417,7 @@ Sequence< Type > IdlInterfaceMethodImpl::getTypes()
Sequence< sal_Int8 > IdlInterfaceMethodImpl::getImplementationId()
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
- static OImplementationId * s_pId = 0;
- if (! s_pId)
- {
- MutexGuard aGuard( getMutexAccess() );
- if (! s_pId)
- {
- static OImplementationId s_aId;
- s_pId = &s_aId;
- }
- }
- return s_pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
// XIdlMember
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index 6e67419..8db2783 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -1050,17 +1050,7 @@ Sequence< Type > SAL_CALL Invocation_Impl::getTypes(void) throw( RuntimeExceptio
Sequence< sal_Int8 > SAL_CALL Invocation_Impl::getImplementationId( ) throw( RuntimeException, std::exception)
{
- static OImplementationId *pId = 0;
- if( ! pId )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( ! pId )
- {
- static OImplementationId id( false );
- pId = &id;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/stoc/test/javavm/testcomponent/TestComponent.java b/stoc/test/javavm/testcomponent/TestComponent.java
index eb1e420..33cb4e2 100644
--- a/stoc/test/javavm/testcomponent/TestComponent.java
+++ b/stoc/test/javavm/testcomponent/TestComponent.java
@@ -56,7 +56,7 @@ public class TestComponent implements XServiceInfo, XTypeProvider
// XTypeProvider
public byte[] getImplementationId( )
{
- return TestComponent.class.getName().getBytes();
+ return new byte[0];
}
commit af277041412ee8dcfa6a02a147efd89ae843d61b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 15:55:26 2014 +0100
sfx2: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I7d98f0d3f101d7441e83d37f0ee36a74b991a996
diff --git a/sfx2/qa/complex/sfx2/UndoManager.java b/sfx2/qa/complex/sfx2/UndoManager.java
index 52f0626..faa280d 100644
--- a/sfx2/qa/complex/sfx2/UndoManager.java
+++ b/sfx2/qa/complex/sfx2/UndoManager.java
@@ -1435,7 +1435,7 @@ public class UndoManager
public byte[] getImplementationId()
{
- return getClass().toString().getBytes();
+ return new byte[0];
}
}
diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx
index 8fc7d65..4a97a13 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -299,20 +299,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL BackingComp::getTypes()
css::uno::Sequence< sal_Int8 > SAL_CALL BackingComp::getImplementationId()
throw(css::uno::RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* pID = NULL;
- if (!pID)
- {
- /* GLOBAL SAFE { */
- ::osl::MutexGuard aLock(::osl::Mutex::getGlobalMutex());
- // Control these pointer again ... it can be, that another instance will be faster then this one!
- if (!pID)
- {
- static ::cppu::OImplementationId aID(false);
- pID = &aID;
- }
- /* } GLOBAL SAFE */
- }
- return pID->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
OUString SAL_CALL BackingComp::getImplementationName()
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 78d26f5..26dc24d 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -615,30 +615,7 @@ Sequence< uno::Type > SAL_CALL SfxBaseModel::getTypes() throw( RuntimeException,
Sequence< sal_Int8 > SAL_CALL SfxBaseModel::getImplementationId() throw( RuntimeException, std::exception )
{
- // Create one Id for all instances of this class.
- // Use ethernet address to do this! (sal_True)
-
- // Optimize this method
- // We initialize a static variable only one time. And we don't must use a mutex at every call!
- // For the first call; pID is NULL - for the second call pID is different from NULL!
- static ::cppu::OImplementationId* pID = NULL ;
-
- if ( pID == NULL )
- {
- // Ready for multithreading; get global mutex for first call of this method only! see before
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
-
- // Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pID == NULL )
- {
- // Create a new static ID ...
- static ::cppu::OImplementationId aID( false ) ;
- // ... and set his address to static pointer!
- pID = &aID ;
- }
- }
-
- return pID->getImplementationId() ;
+ return css::uno::Sequence<sal_Int8>();
}
commit 8150f5064f080710d89cd21b731bccbd2f490917
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 15:52:27 2014 +0100
sd: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I95566d52c39b8cc3544e4b39620ec2be81964aae
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index fb155b0..5eba9be 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -379,14 +379,9 @@ uno::Sequence< uno::Type > SAL_CALL SdXImpressDocument::getTypes( ) throw(uno::
return maTypeSequence;
}
-namespace
-{
- class theSdXImpressDocumentImplementationId : public rtl::Static< UnoTunnelIdInit, theSdXImpressDocumentImplementationId > {};
-}
-
uno::Sequence< sal_Int8 > SAL_CALL SdXImpressDocument::getImplementationId( ) throw(uno::RuntimeException, std::exception)
{
- return theSdXImpressDocumentImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
/***********************************************************************
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 09cdc3f..4f19989 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -2115,14 +2115,9 @@ Sequence< uno::Type > SAL_CALL SdDrawPage::getTypes() throw(uno::RuntimeExceptio
return maTypeSequence;
}
-namespace
-{
- class theSdDrawPageImplementationId : public rtl::Static< UnoTunnelIdInit, theSdDrawPageImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SdDrawPage::getImplementationId() throw(uno::RuntimeException, std::exception)
{
- return theSdDrawPageImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
OUString SdDrawPage::getPageApiName( SdPage* pPage )
@@ -2765,14 +2760,9 @@ Sequence< uno::Type > SAL_CALL SdMasterPage::getTypes() throw(uno::RuntimeExcept
return maTypeSequence;
}
-namespace
-{
- class theSdMasterPageImplementationId : public rtl::Static< UnoTunnelIdInit, theSdMasterPageImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL SdMasterPage::getImplementationId() throw(uno::RuntimeException, std::exception)
{
- return theSdMasterPageImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
// XServiceInfo
commit 55461af2bd054819b4e47bf86abd08641a6452ca
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 15:50:03 2014 +0100
scripting: simplify deprecated XTypeProvider.getImplementationId
Change-Id: If0d9a6f1c56dc560df078eb59313aaba393ee372
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index e14e27a..a348dffd 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -300,7 +300,7 @@ public abstract class ScriptProvider
*/
public byte[] getImplementationId()
{
- return this.getClass().getName().getBytes();
+ return new byte[0];
}
/**
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index b9bd1fc..9237294 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -526,8 +526,7 @@ public:
virtual Sequence< sal_Int8 > SAL_CALL getImplementationId()
throw ( com::sun::star::uno::RuntimeException, std::exception )
{
- return m_xWrappedTypeProv->getImplementationId();
-
+ return css::uno::Sequence<sal_Int8>();
}
};
commit a96b9043ff1e94f68215ff1cf0daf30fb46fdcb8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Mar 10 15:48:18 2014 +0100
sc: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I4ecb4db1fdebf6f5f29262474d1e7cc490792a7f
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index d5e5564..5d81b4b 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -70,7 +70,6 @@ private:
::com::sun::star::beans::XPropertySet* pShapePropertySet;
::com::sun::star::beans::XPropertyState* pShapePropertyState;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo;
- com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId;
bool bIsTextShape;
bool bIsNoteCaption;
bool bInitializedNotifier;
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 9eb68d0..9d8cf37 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -299,16 +299,11 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleCellBase::getTypes()
return comphelper::concatSequences(ScAccessibleCellBaseImpl::getTypes(), ScAccessibleContextBase::getTypes());
}
-namespace
-{
- class theScAccessibleCellBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleCellBaseImplementationId > {};
-}
-
uno::Sequence<sal_Int8> SAL_CALL
ScAccessibleCellBase::getImplementationId(void)
throw (uno::RuntimeException, std::exception)
{
- return theScAccessibleCellBaseImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
bool ScAccessibleCellBase::IsEditable(
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index ea73791..490861e 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -498,16 +498,11 @@ uno::Sequence< uno::Type > SAL_CALL ScAccessibleContextBase::getTypes()
return comphelper::concatSequences(ScAccessibleContextBaseWeakImpl::getTypes(), ScAccessibleContextBaseImplEvent::getTypes());
}
-namespace
-{
- class theScAccessibleContextBaseImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleContextBaseImplementationId > {};
-}
-
uno::Sequence<sal_Int8> SAL_CALL
ScAccessibleContextBase::getImplementationId(void)
throw (uno::RuntimeException, std::exception)
{
- return theScAccessibleContextBaseImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
//===== internal ============================================================
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index f476434..1495809 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -758,14 +758,9 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes(
return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
}
-namespace
-{
- class theScAccessibleCsvRulerImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleCsvRulerImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( RuntimeException, std::exception )
{
- return theScAccessibleCsvRulerImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
@@ -1269,14 +1264,9 @@ Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes()
return ::comphelper::concatSequences( ScAccessibleCsvControl::getTypes(), aSeq );
}
-namespace
-{
- class theScAccessibleCsvGridImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleCsvGridImplementationId > {};
-}
-
Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( RuntimeException, std::exception )
{
- return theScAccessibleCsvGridImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index fba4906..aca4092 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -518,15 +518,10 @@ OUString SAL_CALL ScAccessibleDataPilotControl::getImplementationName(void)
///===== XTypeProvider ===================================================
-namespace
-{
- class theScAccessibleDataPilotControlImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleDataPilotControlImplementationId > {};
-}
-
uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotControl::getImplementationId(void)
throw (uno::RuntimeException, std::exception)
{
- return theScAccessibleDataPilotControlImplementationId::get().getSeq();
+ return css::uno::Sequence<sal_Int8>();
}
//===== internal ========================================================
@@ -748,15 +743,10 @@ OUString SAL_CALL ScAccessibleDataPilotButton::getImplementationName(void)
///===== XTypeProvider ===================================================
-namespace
-{
- class theScAccessibleDataPilotButtonImplementationId : public rtl::Static< UnoTunnelIdInit, theScAccessibleDataPilotButtonImplementationId > {};
-}
-
uno::Sequence<sal_Int8> SAL_CALL ScAccessibleDataPilotButton::getImplementationId(void)
throw (::com::sun::star::uno::RuntimeException, std::exception)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list