[Libreoffice-commits] core.git: 11 commits - include/ucbhelper ios/experimental offapi/com ucbhelper/source ucb/source xmlhelp/source
Tor Lillqvist
tml at collabora.com
Fri Mar 21 00:11:41 PDT 2014
include/ucbhelper/contenthelper.hxx | 7
include/ucbhelper/contentinfo.hxx | 14
include/ucbhelper/macros.hxx | 44 --
include/ucbhelper/propertyvalueset.hxx | 7
include/ucbhelper/providerhelper.hxx | 8
include/ucbhelper/resultset.hxx | 17 -
include/ucbhelper/resultsethelper.hxx | 17 -
include/ucbhelper/resultsetmetadata.hxx | 7
ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 164 ++++++++++
offapi/com/sun/star/drawing/framework/XConfigurationController.idl | 14
offapi/com/sun/star/i18n/Calendar2.idl | 10
offapi/com/sun/star/presentation/XSlideShowController.idl | 2
offapi/com/sun/star/report/XImageControl.idl | 2
offapi/com/sun/star/report/XReportComponent.idl | 2
offapi/com/sun/star/report/XReportDefinition.idl | 2
offapi/com/sun/star/task/XInteractionRequestStringResolver.idl | 2
offapi/com/sun/star/ucb/ODMAContentProvider.idl | 2
offapi/com/sun/star/ui/XUIElementSettings.idl | 2
offapi/com/sun/star/view/PrinterDescriptor.idl | 4
offapi/com/sun/star/view/RenderOptions.idl | 8
ucb/source/cacher/cachedcontentresultset.cxx | 5
ucb/source/cacher/cachedcontentresultset.hxx | 34 +-
ucb/source/cacher/cachedcontentresultsetstub.hxx | 33 +-
ucb/source/cacher/cacheddynamicresultset.hxx | 32 +
ucb/source/cacher/cacheddynamicresultsetstub.hxx | 34 +-
ucb/source/core/provprox.hxx | 29 +
ucb/source/core/ucb.hxx | 19 +
ucb/source/core/ucbprops.hxx | 14
ucb/source/core/ucbstore.hxx | 34 +-
ucb/source/ucp/cmis/cmis_content.hxx | 5
ucb/source/ucp/cmis/cmis_provider.hxx | 19 +
ucb/source/ucp/cmis/cmis_repo_content.hxx | 5
ucb/source/ucp/file/bc.hxx | 5
ucb/source/ucp/file/filinpstr.hxx | 5
ucb/source/ucp/file/prov.cxx | 56 ---
ucb/source/ucp/file/prov.hxx | 37 --
ucb/source/ucp/gio/gio_content.hxx | 5
ucb/source/ucp/gio/gio_provider.hxx | 19 +
ucb/source/ucp/gvfs/gvfs_content.hxx | 5
ucb/source/ucp/gvfs/gvfs_provider.hxx | 19 +
ucb/source/ucp/hierarchy/hierarchycontent.hxx | 5
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 19 +
ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 19 +
ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 19 +
ucb/source/ucp/package/pkgcontent.hxx | 5
ucb/source/ucp/package/pkgprovider.hxx | 19 +
ucb/source/ucp/tdoc/tdoc_content.hxx | 5
ucb/source/ucp/tdoc/tdoc_provider.hxx | 19 +
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 5
ucb/source/ucp/webdav-neon/webdavprovider.hxx | 19 +
ucb/source/ucp/webdav/webdavcontent.hxx | 5
ucb/source/ucp/webdav/webdavprovider.hxx | 19 +
ucbhelper/source/provider/resultset.cxx | 5
xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 32 -
xmlhelp/source/cxxhelp/inc/tvread.hxx | 33 --
xmlhelp/source/cxxhelp/provider/content.hxx | 5
xmlhelp/source/cxxhelp/provider/provider.cxx | 58 ++-
xmlhelp/source/cxxhelp/provider/provider.hxx | 40 +-
xmlhelp/source/treeview/tvfactory.cxx | 38 --
xmlhelp/source/treeview/tvread.cxx | 42 --
60 files changed, 771 insertions(+), 389 deletions(-)
New commits:
commit 51fc55cfcceafe61cbd9f11346c6456c08d21203
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 20 21:17:53 2014 +0200
Add customshapes source files for debugging convenience
Change-Id: Ifa88f10a547c9aafd888065ae94210ec1cc7f273
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index e7f3f1c..61974d9 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -378,6 +378,15 @@
BE55B14518DB67A900950228 /* themeelementscontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = themeelementscontext.cxx; path = ../../../oox/source/drawingml/themeelementscontext.cxx; sourceTree = "<group>"; };
BE55B14618DB67A900950228 /* themefragmenthandler.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = themefragmenthandler.cxx; path = ../../../oox/source/drawingml/themefragmenthandler.cxx; sourceTree = "<group>"; };
BE55B14718DB67A900950228 /* transform2dcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = transform2dcontext.cxx; path = ../../../oox/source/drawingml/transform2dcontext.cxx; sourceTree = "<group>"; };
+ BE55B14918DB6DE700950228 /* EnhancedCustomShape2d.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShape2d.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShape2d.cxx; sourceTree = "<group>"; };
+ BE55B14A18DB6DE700950228 /* EnhancedCustomShape3d.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShape3d.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShape3d.cxx; sourceTree = "<group>"; };
+ BE55B14B18DB6DE700950228 /* EnhancedCustomShapeEngine.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShapeEngine.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShapeEngine.cxx; sourceTree = "<group>"; };
+ BE55B14C18DB6DE700950228 /* EnhancedCustomShapeFontWork.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShapeFontWork.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShapeFontWork.cxx; sourceTree = "<group>"; };
+ BE55B14D18DB6DE700950228 /* EnhancedCustomShapeFunctionParser.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShapeFunctionParser.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx; sourceTree = "<group>"; };
+ BE55B14E18DB6DE700950228 /* EnhancedCustomShapeGeometry.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShapeGeometry.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShapeGeometry.cxx; sourceTree = "<group>"; };
+ BE55B14F18DB6DE700950228 /* EnhancedCustomShapeHandle.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShapeHandle.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShapeHandle.cxx; sourceTree = "<group>"; };
+ BE55B15018DB6DE700950228 /* EnhancedCustomShapeTypeNames.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = EnhancedCustomShapeTypeNames.cxx; path = ../../../svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx; sourceTree = "<group>"; };
+ BE55B15118DB6DE700950228 /* tbxcustomshapes.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = tbxcustomshapes.cxx; path = ../../../svx/source/customshapes/tbxcustomshapes.cxx; sourceTree = "<group>"; };
BE7C277218D1DDF600C4908C /* acmplwrd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = acmplwrd.cxx; path = ../../../sw/source/core/doc/acmplwrd.cxx; sourceTree = "<group>"; };
BE7C277318D1DDF600C4908C /* dbgoutsw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbgoutsw.cxx; path = ../../../sw/source/core/doc/dbgoutsw.cxx; sourceTree = "<group>"; };
BE7C277418D1DDF600C4908C /* doc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = doc.cxx; path = ../../../sw/source/core/doc/doc.cxx; sourceTree = "<group>"; };
@@ -1187,6 +1196,22 @@
name = drawingml;
sourceTree = "<group>";
};
+ BE55B14818DB6DC200950228 /* customshapes */ = {
+ isa = PBXGroup;
+ children = (
+ BE55B14918DB6DE700950228 /* EnhancedCustomShape2d.cxx */,
+ BE55B14A18DB6DE700950228 /* EnhancedCustomShape3d.cxx */,
+ BE55B14B18DB6DE700950228 /* EnhancedCustomShapeEngine.cxx */,
+ BE55B14C18DB6DE700950228 /* EnhancedCustomShapeFontWork.cxx */,
+ BE55B14D18DB6DE700950228 /* EnhancedCustomShapeFunctionParser.cxx */,
+ BE55B14E18DB6DE700950228 /* EnhancedCustomShapeGeometry.cxx */,
+ BE55B14F18DB6DE700950228 /* EnhancedCustomShapeHandle.cxx */,
+ BE55B15018DB6DE700950228 /* EnhancedCustomShapeTypeNames.cxx */,
+ BE55B15118DB6DE700950228 /* tbxcustomshapes.cxx */,
+ );
+ name = customshapes;
+ sourceTree = "<group>";
+ };
BE7C277118D1DDC500C4908C /* doc */ = {
isa = PBXGroup;
children = (
@@ -1344,6 +1369,7 @@
BE82C42718CA17A60050EB79 /* svx */ = {
isa = PBXGroup;
children = (
+ BE55B14818DB6DC200950228 /* customshapes */,
BE55B06E18D96F5B00950228 /* sdr */,
BE82C42818CA184E0050EB79 /* svdraw */,
);
commit 621e86a46284c7689b16273aba38619198088a5d
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Mar 20 20:18:31 2014 +0200
Add oox/source/drawingml source for debugging convenience
Change-Id: I20108b8b044cbf129426688b9bee90a0a6c016a3
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 286bcec..e7f3f1c 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -317,6 +317,67 @@
BE55B10418D9AB5400950228 /* xpackcreator.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = xpackcreator.cxx; path = ../../../sfx2/source/appl/xpackcreator.cxx; sourceTree = "<group>"; };
BE55B10618DAD89800950228 /* compat.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = compat.cxx; path = ../../../cppu/source/cppu/compat.cxx; sourceTree = "<group>"; };
BE55B10718DAD89800950228 /* cppu_opt.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cppu_opt.cxx; path = ../../../cppu/source/cppu/cppu_opt.cxx; sourceTree = "<group>"; };
+ BE55B10A18DB67A900950228 /* chart */ = {isa = PBXFileReference; lastKnownFileType = folder; name = chart; path = ../../../oox/source/drawingml/chart; sourceTree = "<group>"; };
+ BE55B10B18DB67A900950228 /* clrscheme.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrscheme.cxx; path = ../../../oox/source/drawingml/clrscheme.cxx; sourceTree = "<group>"; };
+ BE55B10C18DB67A900950228 /* clrschemecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = clrschemecontext.cxx; path = ../../../oox/source/drawingml/clrschemecontext.cxx; sourceTree = "<group>"; };
+ BE55B10D18DB67A900950228 /* color.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = color.cxx; path = ../../../oox/source/drawingml/color.cxx; sourceTree = "<group>"; };
+ BE55B10E18DB67A900950228 /* colorchoicecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = colorchoicecontext.cxx; path = ../../../oox/source/drawingml/colorchoicecontext.cxx; sourceTree = "<group>"; };
+ BE55B10F18DB67A900950228 /* connectorshapecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = connectorshapecontext.cxx; path = ../../../oox/source/drawingml/connectorshapecontext.cxx; sourceTree = "<group>"; };
+ BE55B11018DB67A900950228 /* customshapegeometry.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapegeometry.cxx; path = ../../../oox/source/drawingml/customshapegeometry.cxx; sourceTree = "<group>"; };
+ BE55B11118DB67A900950228 /* customshapepresets1.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapepresets1.cxx; path = ../../../oox/source/drawingml/customshapepresets1.cxx; sourceTree = "<group>"; };
+ BE55B11218DB67A900950228 /* customshapepresets2.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapepresets2.cxx; path = ../../../oox/source/drawingml/customshapepresets2.cxx; sourceTree = "<group>"; };
+ BE55B11318DB67A900950228 /* customshapepresets3.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapepresets3.cxx; path = ../../../oox/source/drawingml/customshapepresets3.cxx; sourceTree = "<group>"; };
+ BE55B11418DB67A900950228 /* customshapepresets4.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapepresets4.cxx; path = ../../../oox/source/drawingml/customshapepresets4.cxx; sourceTree = "<group>"; };
+ BE55B11518DB67A900950228 /* customshapepresets5.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapepresets5.cxx; path = ../../../oox/source/drawingml/customshapepresets5.cxx; sourceTree = "<group>"; };
+ BE55B11618DB67A900950228 /* customshapepresets6.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapepresets6.cxx; path = ../../../oox/source/drawingml/customshapepresets6.cxx; sourceTree = "<group>"; };
+ BE55B11718DB67A900950228 /* customshapeproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = customshapeproperties.cxx; path = ../../../oox/source/drawingml/customshapeproperties.cxx; sourceTree = "<group>"; };
+ BE55B11918DB67A900950228 /* diagram */ = {isa = PBXFileReference; lastKnownFileType = folder; name = diagram; path = ../../../oox/source/drawingml/diagram; sourceTree = "<group>"; };
+ BE55B11A18DB67A900950228 /* drawingmltypes.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = drawingmltypes.cxx; path = ../../../oox/source/drawingml/drawingmltypes.cxx; sourceTree = "<group>"; };
+ BE55B11B18DB67A900950228 /* effectproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effectproperties.cxx; path = ../../../oox/source/drawingml/effectproperties.cxx; sourceTree = "<group>"; };
+ BE55B11C18DB67A900950228 /* effectpropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = effectpropertiescontext.cxx; path = ../../../oox/source/drawingml/effectpropertiescontext.cxx; sourceTree = "<group>"; };
+ BE55B11D18DB67A900950228 /* embeddedwavaudiofile.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = embeddedwavaudiofile.cxx; path = ../../../oox/source/drawingml/embeddedwavaudiofile.cxx; sourceTree = "<group>"; };
+ BE55B11E18DB67A900950228 /* fillproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fillproperties.cxx; path = ../../../oox/source/drawingml/fillproperties.cxx; sourceTree = "<group>"; };
+ BE55B11F18DB67A900950228 /* fillpropertiesgroupcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = fillpropertiesgroupcontext.cxx; path = ../../../oox/source/drawingml/fillpropertiesgroupcontext.cxx; sourceTree = "<group>"; };
+ BE55B12018DB67A900950228 /* graphicshapecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = graphicshapecontext.cxx; path = ../../../oox/source/drawingml/graphicshapecontext.cxx; sourceTree = "<group>"; };
+ BE55B12118DB67A900950228 /* guidcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = guidcontext.cxx; path = ../../../oox/source/drawingml/guidcontext.cxx; sourceTree = "<group>"; };
+ BE55B12218DB67A900950228 /* hyperlinkcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = hyperlinkcontext.cxx; path = ../../../oox/source/drawingml/hyperlinkcontext.cxx; sourceTree = "<group>"; };
+ BE55B12318DB67A900950228 /* lineproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lineproperties.cxx; path = ../../../oox/source/drawingml/lineproperties.cxx; sourceTree = "<group>"; };
+ BE55B12418DB67A900950228 /* linepropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = linepropertiescontext.cxx; path = ../../../oox/source/drawingml/linepropertiescontext.cxx; sourceTree = "<group>"; };
+ BE55B12518DB67A900950228 /* objectdefaultcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = objectdefaultcontext.cxx; path = ../../../oox/source/drawingml/objectdefaultcontext.cxx; sourceTree = "<group>"; };
+ BE55B12618DB67A900950228 /* scene3dcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = scene3dcontext.cxx; path = ../../../oox/source/drawingml/scene3dcontext.cxx; sourceTree = "<group>"; };
+ BE55B12718DB67A900950228 /* shape.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shape.cxx; path = ../../../oox/source/drawingml/shape.cxx; sourceTree = "<group>"; };
+ BE55B12818DB67A900950228 /* shape3dproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shape3dproperties.cxx; path = ../../../oox/source/drawingml/shape3dproperties.cxx; sourceTree = "<group>"; };
+ BE55B12918DB67A900950228 /* shapecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shapecontext.cxx; path = ../../../oox/source/drawingml/shapecontext.cxx; sourceTree = "<group>"; };
+ BE55B12A18DB67A900950228 /* shapegroupcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shapegroupcontext.cxx; path = ../../../oox/source/drawingml/shapegroupcontext.cxx; sourceTree = "<group>"; };
+ BE55B12B18DB67A900950228 /* shapepropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shapepropertiescontext.cxx; path = ../../../oox/source/drawingml/shapepropertiescontext.cxx; sourceTree = "<group>"; };
+ BE55B12C18DB67A900950228 /* shapepropertymap.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shapepropertymap.cxx; path = ../../../oox/source/drawingml/shapepropertymap.cxx; sourceTree = "<group>"; };
+ BE55B12D18DB67A900950228 /* shapestylecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = shapestylecontext.cxx; path = ../../../oox/source/drawingml/shapestylecontext.cxx; sourceTree = "<group>"; };
+ BE55B12E18DB67A900950228 /* spdefcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = spdefcontext.cxx; path = ../../../oox/source/drawingml/spdefcontext.cxx; sourceTree = "<group>"; };
+ BE55B12F18DB67A900950228 /* table */ = {isa = PBXFileReference; lastKnownFileType = folder; name = table; path = ../../../oox/source/drawingml/table; sourceTree = "<group>"; };
+ BE55B13018DB67A900950228 /* textbody.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbody.cxx; path = ../../../oox/source/drawingml/textbody.cxx; sourceTree = "<group>"; };
+ BE55B13118DB67A900950228 /* textbodycontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbodycontext.cxx; path = ../../../oox/source/drawingml/textbodycontext.cxx; sourceTree = "<group>"; };
+ BE55B13218DB67A900950228 /* textbodyproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbodyproperties.cxx; path = ../../../oox/source/drawingml/textbodyproperties.cxx; sourceTree = "<group>"; };
+ BE55B13318DB67A900950228 /* textbodypropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textbodypropertiescontext.cxx; path = ../../../oox/source/drawingml/textbodypropertiescontext.cxx; sourceTree = "<group>"; };
+ BE55B13418DB67A900950228 /* textcharacterproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcharacterproperties.cxx; path = ../../../oox/source/drawingml/textcharacterproperties.cxx; sourceTree = "<group>"; };
+ BE55B13518DB67A900950228 /* textcharacterpropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textcharacterpropertiescontext.cxx; path = ../../../oox/source/drawingml/textcharacterpropertiescontext.cxx; sourceTree = "<group>"; };
+ BE55B13618DB67A900950228 /* texteffectscontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = texteffectscontext.cxx; path = ../../../oox/source/drawingml/texteffectscontext.cxx; sourceTree = "<group>"; };
+ BE55B13718DB67A900950228 /* textfield.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textfield.cxx; path = ../../../oox/source/drawingml/textfield.cxx; sourceTree = "<group>"; };
+ BE55B13818DB67A900950228 /* textfieldcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textfieldcontext.cxx; path = ../../../oox/source/drawingml/textfieldcontext.cxx; sourceTree = "<group>"; };
+ BE55B13918DB67A900950228 /* textfont.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textfont.cxx; path = ../../../oox/source/drawingml/textfont.cxx; sourceTree = "<group>"; };
+ BE55B13A18DB67A900950228 /* textliststyle.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textliststyle.cxx; path = ../../../oox/source/drawingml/textliststyle.cxx; sourceTree = "<group>"; };
+ BE55B13B18DB67A900950228 /* textliststylecontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textliststylecontext.cxx; path = ../../../oox/source/drawingml/textliststylecontext.cxx; sourceTree = "<group>"; };
+ BE55B13C18DB67A900950228 /* textparagraph.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textparagraph.cxx; path = ../../../oox/source/drawingml/textparagraph.cxx; sourceTree = "<group>"; };
+ BE55B13D18DB67A900950228 /* textparagraphproperties.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textparagraphproperties.cxx; path = ../../../oox/source/drawingml/textparagraphproperties.cxx; sourceTree = "<group>"; };
+ BE55B13E18DB67A900950228 /* textparagraphpropertiescontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textparagraphpropertiescontext.cxx; path = ../../../oox/source/drawingml/textparagraphpropertiescontext.cxx; sourceTree = "<group>"; };
+ BE55B13F18DB67A900950228 /* textrun.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textrun.cxx; path = ../../../oox/source/drawingml/textrun.cxx; sourceTree = "<group>"; };
+ BE55B14018DB67A900950228 /* textspacingcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = textspacingcontext.cxx; path = ../../../oox/source/drawingml/textspacingcontext.cxx; sourceTree = "<group>"; };
+ BE55B14118DB67A900950228 /* textspacingcontext.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = textspacingcontext.hxx; path = ../../../oox/source/drawingml/textspacingcontext.hxx; sourceTree = "<group>"; };
+ BE55B14218DB67A900950228 /* texttabstoplistcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = texttabstoplistcontext.cxx; path = ../../../oox/source/drawingml/texttabstoplistcontext.cxx; sourceTree = "<group>"; };
+ BE55B14318DB67A900950228 /* texttabstoplistcontext.hxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = texttabstoplistcontext.hxx; path = ../../../oox/source/drawingml/texttabstoplistcontext.hxx; sourceTree = "<group>"; };
+ BE55B14418DB67A900950228 /* theme.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = theme.cxx; path = ../../../oox/source/drawingml/theme.cxx; sourceTree = "<group>"; };
+ BE55B14518DB67A900950228 /* themeelementscontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = themeelementscontext.cxx; path = ../../../oox/source/drawingml/themeelementscontext.cxx; sourceTree = "<group>"; };
+ BE55B14618DB67A900950228 /* themefragmenthandler.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = themefragmenthandler.cxx; path = ../../../oox/source/drawingml/themefragmenthandler.cxx; sourceTree = "<group>"; };
+ BE55B14718DB67A900950228 /* transform2dcontext.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = transform2dcontext.cxx; path = ../../../oox/source/drawingml/transform2dcontext.cxx; sourceTree = "<group>"; };
BE7C277218D1DDF600C4908C /* acmplwrd.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = acmplwrd.cxx; path = ../../../sw/source/core/doc/acmplwrd.cxx; sourceTree = "<group>"; };
BE7C277318D1DDF600C4908C /* dbgoutsw.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = dbgoutsw.cxx; path = ../../../sw/source/core/doc/dbgoutsw.cxx; sourceTree = "<group>"; };
BE7C277418D1DDF600C4908C /* doc.cxx */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = doc.cxx; path = ../../../sw/source/core/doc/doc.cxx; sourceTree = "<group>"; };
@@ -661,6 +722,7 @@
BE9F45F81868393D00B8BE69 /* bridges */,
BE55B10518DAD85E00950228 /* cppu */,
BE35B58A188FFA43001B7439 /* cppuhelper */,
+ BE55B10818DB673300950228 /* oox */,
BE82C38818C752760050EB79 /* sal */,
BE35B5A6189051F7001B7439 /* sfx2 */,
BE82C42718CA17A60050EB79 /* svx */,
@@ -1049,6 +1111,82 @@
name = cppu;
sourceTree = "<group>";
};
+ BE55B10818DB673300950228 /* oox */ = {
+ isa = PBXGroup;
+ children = (
+ BE55B10918DB674E00950228 /* drawingml */,
+ );
+ name = oox;
+ sourceTree = "<group>";
+ };
+ BE55B10918DB674E00950228 /* drawingml */ = {
+ isa = PBXGroup;
+ children = (
+ BE55B10A18DB67A900950228 /* chart */,
+ BE55B10B18DB67A900950228 /* clrscheme.cxx */,
+ BE55B10C18DB67A900950228 /* clrschemecontext.cxx */,
+ BE55B10D18DB67A900950228 /* color.cxx */,
+ BE55B10E18DB67A900950228 /* colorchoicecontext.cxx */,
+ BE55B10F18DB67A900950228 /* connectorshapecontext.cxx */,
+ BE55B11018DB67A900950228 /* customshapegeometry.cxx */,
+ BE55B11118DB67A900950228 /* customshapepresets1.cxx */,
+ BE55B11218DB67A900950228 /* customshapepresets2.cxx */,
+ BE55B11318DB67A900950228 /* customshapepresets3.cxx */,
+ BE55B11418DB67A900950228 /* customshapepresets4.cxx */,
+ BE55B11518DB67A900950228 /* customshapepresets5.cxx */,
+ BE55B11618DB67A900950228 /* customshapepresets6.cxx */,
+ BE55B11718DB67A900950228 /* customshapeproperties.cxx */,
+ BE55B11918DB67A900950228 /* diagram */,
+ BE55B11A18DB67A900950228 /* drawingmltypes.cxx */,
+ BE55B11B18DB67A900950228 /* effectproperties.cxx */,
+ BE55B11C18DB67A900950228 /* effectpropertiescontext.cxx */,
+ BE55B11D18DB67A900950228 /* embeddedwavaudiofile.cxx */,
+ BE55B11E18DB67A900950228 /* fillproperties.cxx */,
+ BE55B11F18DB67A900950228 /* fillpropertiesgroupcontext.cxx */,
+ BE55B12018DB67A900950228 /* graphicshapecontext.cxx */,
+ BE55B12118DB67A900950228 /* guidcontext.cxx */,
+ BE55B12218DB67A900950228 /* hyperlinkcontext.cxx */,
+ BE55B12318DB67A900950228 /* lineproperties.cxx */,
+ BE55B12418DB67A900950228 /* linepropertiescontext.cxx */,
+ BE55B12518DB67A900950228 /* objectdefaultcontext.cxx */,
+ BE55B12618DB67A900950228 /* scene3dcontext.cxx */,
+ BE55B12718DB67A900950228 /* shape.cxx */,
+ BE55B12818DB67A900950228 /* shape3dproperties.cxx */,
+ BE55B12918DB67A900950228 /* shapecontext.cxx */,
+ BE55B12A18DB67A900950228 /* shapegroupcontext.cxx */,
+ BE55B12B18DB67A900950228 /* shapepropertiescontext.cxx */,
+ BE55B12C18DB67A900950228 /* shapepropertymap.cxx */,
+ BE55B12D18DB67A900950228 /* shapestylecontext.cxx */,
+ BE55B12E18DB67A900950228 /* spdefcontext.cxx */,
+ BE55B12F18DB67A900950228 /* table */,
+ BE55B13018DB67A900950228 /* textbody.cxx */,
+ BE55B13118DB67A900950228 /* textbodycontext.cxx */,
+ BE55B13218DB67A900950228 /* textbodyproperties.cxx */,
+ BE55B13318DB67A900950228 /* textbodypropertiescontext.cxx */,
+ BE55B13418DB67A900950228 /* textcharacterproperties.cxx */,
+ BE55B13518DB67A900950228 /* textcharacterpropertiescontext.cxx */,
+ BE55B13618DB67A900950228 /* texteffectscontext.cxx */,
+ BE55B13718DB67A900950228 /* textfield.cxx */,
+ BE55B13818DB67A900950228 /* textfieldcontext.cxx */,
+ BE55B13918DB67A900950228 /* textfont.cxx */,
+ BE55B13A18DB67A900950228 /* textliststyle.cxx */,
+ BE55B13B18DB67A900950228 /* textliststylecontext.cxx */,
+ BE55B13C18DB67A900950228 /* textparagraph.cxx */,
+ BE55B13D18DB67A900950228 /* textparagraphproperties.cxx */,
+ BE55B13E18DB67A900950228 /* textparagraphpropertiescontext.cxx */,
+ BE55B13F18DB67A900950228 /* textrun.cxx */,
+ BE55B14018DB67A900950228 /* textspacingcontext.cxx */,
+ BE55B14118DB67A900950228 /* textspacingcontext.hxx */,
+ BE55B14218DB67A900950228 /* texttabstoplistcontext.cxx */,
+ BE55B14318DB67A900950228 /* texttabstoplistcontext.hxx */,
+ BE55B14418DB67A900950228 /* theme.cxx */,
+ BE55B14518DB67A900950228 /* themeelementscontext.cxx */,
+ BE55B14618DB67A900950228 /* themefragmenthandler.cxx */,
+ BE55B14718DB67A900950228 /* transform2dcontext.cxx */,
+ );
+ name = drawingml;
+ sourceTree = "<group>";
+ };
BE7C277118D1DDC500C4908C /* doc */ = {
isa = PBXGroup;
children = (
commit 359c573d635335779e37fc6a25ddbf3fa7b2331e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Mar 21 01:28:55 2014 -0500
kill ucbhelper XSERVICEINFO_NOFACTORY_DECL
Change-Id: I02bb3e7a06451347d8ce72af17461bec91803954
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 88e51e4..f97d2e3 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -199,26 +199,6 @@ GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I11 ) \
GETTYPES_IMPL_END
-// XServiceInfo decl.
-
-
-
-#define XSERVICEINFO_NOFACTORY_DECL() \
- virtual OUString SAL_CALL \
- getImplementationName() \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- virtual sal_Bool SAL_CALL \
- supportsService( const OUString& ServiceName ) \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL \
- getSupportedServiceNames() \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- \
- static OUString \
- getImplementationName_Static(); \
- static com::sun::star::uno::Sequence< OUString > \
- getSupportedServiceNames_Static();
-
// XServiceInfo impl. internals
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 2e28309..46e504d 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -124,7 +124,15 @@ public:
throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XComponent
virtual void SAL_CALL
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index ce87e82..e47c612 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -151,7 +151,15 @@ public:
throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XComponent ( base class of XDynamicResultSet )
virtual void SAL_CALL
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index efbfab0..881cadb 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -215,9 +215,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
- XSERVICEINFO_NOFACTORY_DECL()
-
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XPropertySet inherited
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 256052a..4cc1004 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -123,9 +123,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
- XSERVICEINFO_NOFACTORY_DECL()
-
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XFetchProvider
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 3936190..398efbe 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -72,8 +72,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
- XSERVICEINFO_NOFACTORY_DECL()
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// own methods ( inherited )
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index f9956f6..acad5e3 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -66,8 +66,16 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- XSERVICEINFO_NOFACTORY_DECL()
};
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index e296943..c8dd2a4 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -130,7 +130,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XContentProviderSupplier
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 7f7cafc..f6121f1 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -130,7 +130,15 @@ public:
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XPropertySetRegistry
virtual com::sun::star::uno::Reference<
@@ -200,7 +208,15 @@ public:
virtual ~PersistentPropertySet();
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XComponent
virtual void SAL_CALL
commit eabc5d4920513ea41d57b7753d75702fd2d1da60
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri Mar 21 00:59:35 2014 -0500
kill ucbhelper XSERVICEINFO_DECL
Change-Id: Ide6ecff036de4ea30a58ef2d63d5590e9e9786dc
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 72494f8..88e51e4 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -219,16 +219,6 @@ GETTYPES_IMPL_END
static com::sun::star::uno::Sequence< OUString > \
getSupportedServiceNames_Static();
-#define XSERVICEINFO_DECL() \
- XSERVICEINFO_NOFACTORY_DECL() \
- \
- static com::sun::star::uno::Reference< \
- com::sun::star::lang::XSingleServiceFactory > \
- createServiceFactory( const com::sun::star::uno::Reference< \
- com::sun::star::lang::XMultiServiceFactory >& rxServiceMgr );
-
-
-
// XServiceInfo impl. internals
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index a1d314e..efbfab0 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -510,8 +510,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XCachedContentResultSetFactory
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index f625100..256052a 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -191,8 +191,19 @@ public:
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XCachedContentResultSetStubFactory
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 37aa81c..3936190 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -120,8 +120,19 @@ public:
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XCachedDynamicResultSetFactory
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index 5524e56..f9956f6 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -105,8 +105,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XCachedDynamicResultSetStubFactory
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 62b6fd6..e296943 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -59,7 +59,19 @@ public:
virtual ~UcbContentProviderProxyFactory();
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProviderFactory
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index 36ab8f8..4e1d680 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -80,7 +80,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XComponent
virtual void SAL_CALL
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 1201d29..d17af2d 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -57,7 +57,19 @@ public:
virtual ~UcbPropertiesManager();
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XPropertySetInfo
virtual com::sun::star::uno::Sequence<
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index b08d004..7f7cafc 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -63,7 +63,19 @@ public:
virtual ~UcbStore();
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XPropertySetRegistryFactory
virtual com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index 44b8d30..9a80013 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -42,7 +42,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index a55d554..2b175f1 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -50,7 +50,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index d2415bc..9ddf616 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
@@ -47,7 +47,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index b70d5e3..d6c6e70 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -108,7 +108,19 @@ public:
throw();
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 94e6255..6e60490 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -63,7 +63,19 @@ public:
throw();
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 7cbd9b8..2d35253 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -119,7 +119,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 008f20f..3b0ed9e 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -75,7 +75,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index b4eb222..62f01aa 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -82,7 +82,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index a19aae7..a164a14 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -103,7 +103,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx
index 972db44..6947650 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -91,7 +91,19 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory >
+ createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr );
// XContentProvider
virtual ::com::sun::star::uno::Reference<
commit 4cf5556f12812c1fea256252e1d01fa40983c666
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Mar 20 23:11:29 2014 -0500
use WeakImplHelper for ucb FileProvider
Change-Id: I7de8301fc1a071f91d25f559ace44e9f27040d63
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 1510a77..d4903f7 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -102,45 +102,6 @@ FileProvider::~FileProvider()
-// XInterface
-
-
-void SAL_CALL
-FileProvider::acquire(
- void )
- throw()
-{
- OWeakObject::acquire();
-}
-
-
-void SAL_CALL
-FileProvider::release(
- void )
- throw()
-{
- OWeakObject::release();
-}
-
-
-Any SAL_CALL
-FileProvider::queryInterface(
- const Type& rType )
- throw( RuntimeException, std::exception )
-{
- Any aRet = cppu::queryInterface(
- rType,
- (static_cast< XContentProvider* >(this)),
- (static_cast< XInitialization* >(this)),
- (static_cast< XContentIdentifierFactory* >(this)),
- (static_cast< XServiceInfo* >(this)),
- (static_cast< XTypeProvider* >(this)),
- (static_cast< XFileIdentifierConverter* >(this)),
- (static_cast< XPropertySet* >(this)) );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
// XInitialization
void SAL_CALL FileProvider::init()
@@ -166,23 +127,6 @@ FileProvider::initialize(
}
}
-
-
-
-// XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_7( FileProvider,
- XTypeProvider,
- XServiceInfo,
- XInitialization,
- XContentIdentifierFactory,
- XPropertySet,
- XFileIdentifierConverter,
- XContentProvider )
-
-
-
// XServiceInfo methods.
OUString SAL_CALL
FileProvider::getImplementationName()
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 6904083..c95a0db 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -35,6 +35,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/ucb/XFileIdentifierConverter.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
+#include <cppuhelper/implbase6.hxx>
// FileProvider
@@ -47,15 +48,13 @@ namespace fileaccess {
class BaseContent;
class shell;
- class FileProvider:
- public cppu::OWeakObject,
- public com::sun::star::lang::XServiceInfo,
- public com::sun::star::lang::XInitialization,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::ucb::XContentProvider,
- public com::sun::star::ucb::XContentIdentifierFactory,
- public com::sun::star::beans::XPropertySet,
- public com::sun::star::ucb::XFileIdentifierConverter
+ class FileProvider: public cppu::WeakImplHelper6 <
+ css::lang::XServiceInfo,
+ css::lang::XInitialization,
+ css::ucb::XContentProvider,
+ css::ucb::XContentIdentifierFactory,
+ css::beans::XPropertySet,
+ css::ucb::XFileIdentifierConverter >
{
friend class BaseContent;
public:
@@ -63,22 +62,6 @@ namespace fileaccess {
FileProvider( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
~FileProvider();
- // XInterface
- virtual com::sun::star::uno::Any SAL_CALL
- queryInterface(
- const com::sun::star::uno::Type& aType )
- throw( com::sun::star::uno::RuntimeException, std::exception);
-
- virtual void SAL_CALL
- acquire(
- void )
- throw();
-
- virtual void SAL_CALL
- release(
- void )
- throw();
-
// XServiceInfo
virtual OUString SAL_CALL
getImplementationName(
@@ -104,13 +87,6 @@ namespace fileaccess {
CreateInstance(
const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xMultiServiceFactory );
- // XTypeProvider
-
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException, std::exception );
- virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception );
-
// XInitialization
virtual void SAL_CALL
initialize(
commit 37aeda6be1c636270a7c270facf478b5b97f9997
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Mar 20 22:12:58 2014 -0500
Eliminate some doxygen warnings in offapi doc
Change-Id: I9fc1053db98dd0aa90f6c9fb863dc3fdfa3cffe6
diff --git a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
index f08f42d..fc2c5f9 100644
--- a/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
+++ b/offapi/com/sun/star/drawing/framework/XConfigurationController.idl
@@ -103,37 +103,37 @@ interface XResource;
configuration change request is executed, not when the
requestResourceActivation() call is made.</p>
<p>The ConfigurationChangeEvent::ResourceId member is set to the requested
- resource. The #ResourceObject member is not
+ resource. The ResourceObject member is not
set.</p></li>
<li>ResourceDeactivationRequested is sent when the
deactivation of a resource has been requested and the resource is active
in the requested configuration. The event is sent when the
configuration change request is executed that is created when for
example requestResourceDeactivation() is called.</p>
- <p>The #ResourceId member is set to the requested
- resource. The #ResourceObject member is not
+ <p>The ResourceId member is set to the requested
+ resource. The ResourceObject member is not
set.</p></li>
<li>ConfigurationUpdateStart is sent before the update of
the current configuration starts.</p>
<p>The requested configuration is available in the
ConfigurationChangeEvent::Configuration member. The
- #ResourceId and #ResourceObject members
+ ResourceId and ResourceObject members
are not set.</p></li>
<li>ConfigurationUpdateEnd is sent after the update of
the current configuration ends.</p>
<p>The requested configuration is
available in the ConfigurationChangeEvent::Configuration member.
- The #ResourceId and #ResourceObject members are not set.</p></li>
+ The ResourceId and ResourceObject members are not set.</p></li>
<li>ResourceActivation is sent when a resource is
activated, i.e. when a new object of a resource is created (or taken
from a cash).</p>
- <p>The #ResourceId and #ResourceObject
+ <p>The ResourceId and ResourceObject
members are set to the XResourceId and object reference of
the activated resource.</p></li>
<li>ResourceDeactivation is sent when a resource is
deactivated, i.e. when an object that previously was part of the
configuration is removed from the configuration.</p>
- <p>The #ResourceId and #ResourceObject
+ <p>The ResourceId and ResourceObject
members are set to XResourceId and object reference of the
deactivated resource.</p></li>
</ul></p>
diff --git a/offapi/com/sun/star/i18n/Calendar2.idl b/offapi/com/sun/star/i18n/Calendar2.idl
index 6df975e..25a3cfd 100644
--- a/offapi/com/sun/star/i18n/Calendar2.idl
+++ b/offapi/com/sun/star/i18n/Calendar2.idl
@@ -22,19 +22,19 @@ module com { module sun { module star { module i18n {
<p> Similar to
::com::sun::star::i18n::Calendar this provides
- additional members with a sequence of possessive (genitive case) and
- partitive case month names for locales that use them, for example
- Slavic locales. If a locale does not provide the possessive form in
+ additional members with a sequence of possessive (genitive case) and
+ partitive case month names for locales that use them, for example
+ Slavic locales. If a locale does not provide the possessive form in
#GenitiveMonths, the names are identical to the
nominative case nouns in Calendar::Months. If a
- locale does not provide the partitive case in
+ locale does not provide the partitive case in
#PartitiveMonths, the names are identical to
#GenitiveMonths. </p>
<p> The sequences are of type
com::sun::star::i18n::CalendarItem2 instead of
com::sun::star::i18n::CalendarItem, with the
- additional #NarrowName member.
+ additional NarrowName member.
@see XLocaleData
for links to DTD of XML locale data files.
commit 41eabf7b5023d06f620c1fe67b4e8da5925157f9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Mar 20 21:54:43 2014 -0500
Eliminate some doxygen warnings in offapi doc
Change-Id: Ibe9be186f49554deb3774e0c70de0e55c19b2f34
diff --git a/offapi/com/sun/star/presentation/XSlideShowController.idl b/offapi/com/sun/star/presentation/XSlideShowController.idl
index 2a09cfb..e4b3534 100644
--- a/offapi/com/sun/star/presentation/XSlideShowController.idl
+++ b/offapi/com/sun/star/presentation/XSlideShowController.idl
@@ -162,7 +162,7 @@ interface XSlideShowController
/** pauses the slide show and blanks the screen in the given color.
- <p>Change attribute #Pause to false to unpause
+ <p>Change attribute Pause to false to unpause
the slide show.
*/
void blankScreen( [in] long Color );
diff --git a/offapi/com/sun/star/report/XImageControl.idl b/offapi/com/sun/star/report/XImageControl.idl
index f8486b8..799a4fe 100644
--- a/offapi/com/sun/star/report/XImageControl.idl
+++ b/offapi/com/sun/star/report/XImageControl.idl
@@ -50,7 +50,7 @@ interface XImageControl
/** defines how to scale the image
- <p>If this property is present, it supersedes the #ScaleImage property.</p>
+ <p>If this property is present, it supersedes the ScaleImage property.</p>
<p>The value of this property is one of the com::sun::star::awt::ImageScaleMode constants.</p>
diff --git a/offapi/com/sun/star/report/XReportComponent.idl b/offapi/com/sun/star/report/XReportComponent.idl
index 058c6f1..1f43bd3 100644
--- a/offapi/com/sun/star/report/XReportComponent.idl
+++ b/offapi/com/sun/star/report/XReportComponent.idl
@@ -100,7 +100,7 @@ interface XReportComponent
/** specifies the color of the border, if present
- <p>Not every border style (see #Border) may support coloring.
+ <p>Not every border style (see Border) may support coloring.
For instance, usually a border with 3D effect will ignore the BorderColor setting.</p>
*/
[attribute,bound] long ControlBorderColor
diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl
index da38c86..fc78ad9 100644
--- a/offapi/com/sun/star/report/XReportDefinition.idl
+++ b/offapi/com/sun/star/report/XReportDefinition.idl
@@ -199,7 +199,7 @@ interface XReportDefinition
are specified, a RowSet can be created with this information. If the results provided by the
row set are to be additionally filtered, the Filter property can be used.</p>
- <p>Note that the Filter property does not make sense if a #ResultSet has been specified
+ <p>Note that the Filter property does not make sense if a ResultSet has been specified
in the DataAccessDescriptor.</p>
@see com::sun::star::sdb::RowSet
diff --git a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
index 888131b..389bc55 100644
--- a/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
+++ b/offapi/com/sun/star/task/XInteractionRequestStringResolver.idl
@@ -47,7 +47,7 @@ interface XInteractionRequestStringResolver : com::sun::star::uno::XInterface
be obtained.
@returns the message string or an empty
- ::com::sun::star::beans::Optional.
+ com::sun::star::beans::Optional.
*/
com::sun::star::beans::Optional< string >
getStringFromInformationalRequest(
diff --git a/offapi/com/sun/star/ucb/ODMAContentProvider.idl b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
index 810c4a2..29e2335 100644
--- a/offapi/com/sun/star/ucb/ODMAContentProvider.idl
+++ b/offapi/com/sun/star/ucb/ODMAContentProvider.idl
@@ -63,7 +63,7 @@ published service ODMAContentProvider
URL of the OCP Root Folder )</span></p>
<p STYLE="font-weight: medium"><b>vnd.sun.star.odma:/</b> a document
id given by the DMS</p>
- <p><b>vnd.sun.star.odma:/</b>`::ODMA\DMS_ID\DM_SPECIFIC_INFO`</p>
+ <p><b>vnd.sun.star.odma:/</b>`ODMA\DMS_ID\DM_SPECIFIC_INFO`</p>
</p>
*/
diff --git a/offapi/com/sun/star/ui/XUIElementSettings.idl b/offapi/com/sun/star/ui/XUIElementSettings.idl
index 9731a73..3d0a7b1 100644
--- a/offapi/com/sun/star/ui/XUIElementSettings.idl
+++ b/offapi/com/sun/star/ui/XUIElementSettings.idl
@@ -71,7 +71,7 @@ interface XUIElementSettings : com::sun::star::uno::XInterface
User interface elements cannot be changed directly. The changed structure
data has to be set again. This speeds up the configuration process if many
changes have to be made on the structure. The persistence of changes are
- controlled by the boolean property #Persistent.
+ controlled by the boolean property Persistent.
</p>
diff --git a/offapi/com/sun/star/view/PrinterDescriptor.idl b/offapi/com/sun/star/view/PrinterDescriptor.idl
index f9fa733..29f2b13 100644
--- a/offapi/com/sun/star/view/PrinterDescriptor.idl
+++ b/offapi/com/sun/star/view/PrinterDescriptor.idl
@@ -54,14 +54,14 @@ published service PrinterDescriptor
is a user-defined size.
<p>Setting this property may change the value of
- #PrinterDescriptor::PaperSize.</p>
+ PrinterDescriptor::PaperSize.</p>
*/
[property] com::sun::star::view::PaperFormat PaperFormat;
/** specifies the size of the paper in 100th mm.
<p>Setting this property may change the value of
- #PrinterDescriptor::PaperFormat.</p>
+ PrinterDescriptor::PaperFormat.</p>
*/
[property] com::sun::star::awt::Size PaperSize;
diff --git a/offapi/com/sun/star/view/RenderOptions.idl b/offapi/com/sun/star/view/RenderOptions.idl
index aff0523..7473155 100644
--- a/offapi/com/sun/star/view/RenderOptions.idl
+++ b/offapi/com/sun/star/view/RenderOptions.idl
@@ -42,7 +42,7 @@ published service RenderOptions
<p>Hyperlinks, notes, and outlines cannot be exported on a per
page base. They have to be exported once *before* the first page
is exported. Therefore the IsFirstPage property has been introduced.
- It is evaluated in the ::render function and indicates that the
+ It is evaluated in the render function and indicates that the
current page is the first page to be exported.
</p>
@@ -54,7 +54,7 @@ published service RenderOptions
<p>Hyperlinks from the EditEngine have to be exported once *after*
the last page has been processed. Therefore the IsLastPage property
- has been introduced. It is evaluated in the ::render function and
+ has been introduced. It is evaluated in the render function and
indicates that the current page is the last page to be exported.
</p>
@@ -65,7 +65,7 @@ published service RenderOptions
/** specifies if empty pages should be skipped.
<p>Tells the PDF export to skip empty pages. This flag also has
- to be passed to the ::render function, in order to calculate to
+ to be passed to the render function, in order to calculate to
correct page numbers during the export of hyperlinks, notes, and
outlines.
</p>
@@ -77,7 +77,7 @@ published service RenderOptions
/** specifies the page ranges to be rendered.
<p>Tells the PDF export to skip empty pages. This flag also has
- to be passed to the ::render function, in order to calculate to
+ to be passed to the render function, in order to calculate to
correct page numbers during the export of hyperlinks, notes,
and outlines.
</p>
commit 03a6135292f3612c291ab156896f18dd49cf70d5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Mar 20 20:17:54 2014 -0500
de-macroize xmlhelp ContentProvider
Change-Id: I806cd7a263dbe37581c8845b4089a76a7d591628
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 40142c4..bec99ce 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -46,12 +46,11 @@ using namespace chelp;
// ContentProvider Implementation.
-ContentProvider::ContentProvider(
- const uno::Reference< uno::XComponentContext >& rxContext )
- : ::ucbhelper::ContentProviderImplHelper( rxContext ),
- isInitialized( false ),
- m_aScheme(MYUCP_URL_SCHEME),
- m_pDatabases( 0 )
+ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext )
+ : ::ucbhelper::ContentProviderImplHelper( rxContext )
+ , isInitialized( false )
+ , m_aScheme(MYUCP_URL_SCHEME)
+ , m_pDatabases( 0 )
{
}
@@ -90,12 +89,34 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r
// XTypeProvider methods.
-XTYPEPROVIDER_IMPL_5( ContentProvider,
- lang::XTypeProvider,
- lang::XServiceInfo,
- ucb::XContentProvider,
- lang::XComponent,
- container::XContainerListener);
+css::uno::Sequence< sal_Int8 > SAL_CALL ContentProvider::getImplementationId()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ return css::uno::Sequence<sal_Int8>();
+}
+
+css::uno::Sequence< css::uno::Type > SAL_CALL ContentProvider::getTypes()
+ throw( css::uno::RuntimeException, std::exception )
+{
+ static cppu::OTypeCollection* pCollection = NULL;
+ if ( !pCollection )
+ {
+ osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
+ if ( !pCollection )
+ {
+ static cppu::OTypeCollection collection(
+ getCppuType( static_cast< css::uno::Reference< lang::XTypeProvider > *>(0)),
+ getCppuType( static_cast< css::uno::Reference< lang::XServiceInfo > *>(0)),
+ getCppuType( static_cast< css::uno::Reference< ucb::XContentProvider > *>(0)),
+ getCppuType( static_cast< css::uno::Reference< lang::XComponent > *>(0)),
+ getCppuType( static_cast< css::uno::Reference< container::XContainerListener > *>(0))
+ );
+ pCollection = &collection;
+ }
+ }
+ return (*pCollection).getTypes();
+}
+
// XServiceInfo methods.
@@ -150,7 +171,18 @@ ContentProvider::getSupportedServiceNames_Static()
// Service factory implementation.
-ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
+css::uno::Reference< css::lang::XSingleServiceFactory >
+ContentProvider::createServiceFactory( const css::uno::Reference<
+ css::lang::XMultiServiceFactory >& rxServiceMgr )
+{
+ return css::uno::Reference<
+ css::lang::XSingleServiceFactory >(
+ cppu::createOneInstanceFactory(
+ rxServiceMgr,
+ ContentProvider::getImplementationName_Static(),
+ ContentProvider_CreateInstance,
+ ContentProvider::getSupportedServiceNames_Static() ) );
+}
// XContentProvider methods.
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 4d7b85d..a3db5a4 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -74,16 +74,27 @@ namespace chelp {
virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
throw( css::uno::RuntimeException, std::exception );
- // XServiceInfo
- XSERVICEINFO_DECL()
-
- // XContentProvider
- virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XContent > SAL_CALL
- queryContent( const ::com::sun::star::uno::Reference<
- ::com::sun::star::ucb::XContentIdentifier >& Identifier )
- throw( ::com::sun::star::ucb::IllegalIdentifierException,
- ::com::sun::star::uno::RuntimeException, std::exception );
+ // XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException,
+ std::exception );
+
+ static OUString getImplementationName_Static();
+
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
+
+ static css::uno::Reference< css::lang::XSingleServiceFactory > createServiceFactory(
+ const css::uno::Reference< css::lang::XMultiServiceFactory >& rxServiceMgr );
+
+ // XContentProvider
+ virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent(
+ const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
+ throw( css::ucb::IllegalIdentifierException,
+ css::uno::RuntimeException, std::exception );
// Additional interfaces
commit 514a6de4822523164ef66916198e36944a826db3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Mar 20 19:33:47 2014 -0500
kill ucbhelper XTYPEPROVIDER_DECL macro
Change-Id: I1daf6661dd7b5be396bec980da84feaab6e6b80f
diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx
index 674a49a..ed832a7 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -332,7 +332,12 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
virtual OUString SAL_CALL
diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx
index 212c22e..2b4864a 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -76,7 +76,12 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XPropertySetInfo
virtual com::sun::star::uno::Sequence<
@@ -139,7 +144,12 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XCommandInfo
virtual com::sun::star::uno::Sequence<
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 9f69cda..72494f8 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -35,20 +35,6 @@
#define CPPU_TYPE( T ) getCppuType( static_cast< T * >( 0 ) )
#define CPPU_TYPE_REF( T ) CPPU_TYPE( com::sun::star::uno::Reference< T > )
-// XTypeProvider decl.
-
-
-
-#define XTYPEPROVIDER_DECL() \
- virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL \
- getImplementationId() \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL \
- getTypes() \
- throw( com::sun::star::uno::RuntimeException, std::exception );
-
-
-
// XTypeProvider impl. internals
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index e2c6ed5..506e5b3 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -87,7 +87,12 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XRow
virtual sal_Bool SAL_CALL
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 908e91c..b49d8ec 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -152,8 +152,12 @@ public:
// XTypeProvider
- XTYPEPROVIDER_DECL()
-
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 4d3a43d..2e28309 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -116,7 +116,12 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_NOFACTORY_DECL()
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index ed8ae97..ce87e82 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -143,7 +143,12 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_NOFACTORY_DECL()
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 72d4af4..1e6ce2b 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -202,7 +202,12 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+ getImplementationId()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
+ virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL
+ getTypes()
+ throw( com::sun::star::uno::RuntimeException, std::exception );
// XResultSetMetaData
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx
index a59cdf4..9bf55e3 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -419,7 +419,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XPropertySetInfo
virtual Sequence< com::sun::star::beans::Property > SAL_CALL
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 32b9665..a1d314e 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -209,7 +209,10 @@ public:
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
@@ -501,8 +504,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
-
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 22b32bf..f625100 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -117,7 +117,10 @@ public:
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
@@ -181,7 +184,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 39d5bdd..37aa81c 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -66,7 +66,10 @@ public:
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
@@ -110,7 +113,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index bcf92ac..5524e56 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -60,7 +60,10 @@ public:
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
@@ -96,8 +99,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
-
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 8cc8835..62b6fd6 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -112,7 +112,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_NOFACTORY_DECL()
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index e2f7de8..36ab8f8 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -74,7 +74,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 26a4975a..7385ac6 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -165,7 +165,10 @@ public:
virtual void SAL_CALL release()
throw();
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL
getImplementationName()
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index 83c4d44..44b8d30 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -36,7 +36,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 1fee7de..1fba684 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -100,7 +100,10 @@ public:
virtual void SAL_CALL release()
throw();
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL
getImplementationName()
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 5d3ed01..43acb8e 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -121,7 +121,10 @@ namespace fileaccess {
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 1af95bb..922927b 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -59,7 +59,10 @@ namespace fileaccess {
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
virtual com::sun::star::uno::Any SAL_CALL
queryInterface(
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 2017966..6904083 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -106,7 +106,10 @@ namespace fileaccess {
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XInitialization
virtual void SAL_CALL
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index ea4b3e5..7b879a5 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -154,7 +154,10 @@ public:
virtual void SAL_CALL release()
throw();
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
virtual OUString SAL_CALL
getImplementationName()
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index 86e39a0..a55d554 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -44,7 +44,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 6284009..80abafd 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -208,7 +208,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index f2b2c2b..d2415bc 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
@@ -41,7 +41,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 11760b6..ded8591 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -243,7 +243,10 @@ public:
throw();
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
+ throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
virtual OUString SAL_CALL
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index 5d4d9c9..b70d5e3 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -111,7 +111,10 @@ public:
XSERVICEINFO_DECL()
// XTypeProvider
- XTYPEPROVIDER_DECL()
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list