Kaydet (Commit) 3893b00e authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Stephan Bergmann

fdo#46808, Adapt UNO services to new style

Update selected IDL files to use new syntax.
Update the makefiles to generate the necessary new include files.
Signed-off-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 15f9ca7d
......@@ -47,6 +47,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt,
ContainerWindowProvider \
DialogProvider \
DialogProvider2 \
MenuBar \
PopupMenu \
TabController \
UnoControlDialogModelProvider \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/awt/grid,\
......@@ -88,6 +91,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/depl
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/document,\
DocumentProperties \
DocumentRevisionListPersistence \
OleEmbeddedServerRegistration \
OOXMLDocumentPropertiesImporter \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/drawing,\
......@@ -105,8 +109,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/draw
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/embed,\
DocumentCloser \
FileSystemStorageFactory \
InstanceLocker \
OLESimpleStorage \
StorageFactory \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/inspection,\
DefaultFormComponentInspectorModel \
......@@ -114,8 +120,15 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/form/runtime,\
FormOperations \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
DispatchHelper \
DispatchRecorderSupplier \
DocumentTemplates \
MediaTypeDetectionHelper \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
GraphicObject \
GraphicProvider \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
DefaultHelpProvider \
......@@ -145,6 +158,12 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mail
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/media,\
Manager \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/mozilla,\
MozillaBootstrap \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/plugin,\
PluginManager \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/presentation,\
SlideShow \
TransitionFactory \
......@@ -184,6 +203,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/reso
StringResourceWithLocation \
StringResourceWithStorage \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/scanner,\
ScannerManager \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/script,\
DocumentDialogLibraryContainer \
DocumentScriptLibraryContainer \
......@@ -216,6 +238,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/shee
ExternalSheetCache \
FilterFormulaParser \
FormulaOpCodeMapper \
RecentFunctions \
Solver \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smarttags,\
......@@ -224,11 +247,25 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/smar
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/task,\
InteractionRequestStringResolver \
JobExecutor \
OfficeRestartManager \
PasswordContainerInteractionHandler \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/text,\
DefaultNumberingProvider \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ucb,\
AnyCompareFactory \
CachedContentResultSetFactory \
CachedContentResultSetStubFactory \
CachedDynamicResultSetFactory \
CachedDynamicResultSetStubFactory \
CommandEnvironment \
ContentProviderProxyFactory \
PropertiesManager \
SimpleFileAccess \
SortedDynamicResultSetFactory \
Store \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui,\
GlobalAcceleratorConfiguration \
......@@ -239,7 +276,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/ui/d
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/util,\
JobManager \
PathSubstitution \
TextSearch \
UriAbbreviation \
URLTransformer \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_nohdl,offapi,offapi/com/sun/star/xml/sax,\
FastShapeContextHandler \
......@@ -296,11 +336,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/a
AccessibleWindow \
AnimatedImagesControl \
AnimatedImagesControlModel \
MenuBar \
PopupMenu \
RoadmapItem \
SpinningProgressControlModel \
TabController \
TabControllerModel \
Toolkit \
UnoControl \
......@@ -545,7 +582,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/d
LinkTargets \
MediaDescriptor \
OfficeDocument \
OleEmbeddedServerRegistration \
PDFDialog \
Settings \
StandaloneDocumentInfo \
......@@ -630,9 +666,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/e
BaseStorage \
EmbeddedObjectDescriptor \
FileSystemStorage \
FileSystemStorageFactory \
Storage \
StorageFactory \
StorageStream \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/form,\
......@@ -753,11 +787,8 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
Desktop \
DesktopTask \
DesktopTasks \
DispatchHelper \
DispatchProvider \
DispatchRecorder \
DispatchRecorderSupplier \
DocumentTemplates \
Frame \
FrameControl \
FrameLoader \
......@@ -765,7 +796,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/f
FramesContainer \
GlobalEventBroadcaster \
LayoutManager \
MediaTypeDetectionHelper \
ModuleManager \
PopupMenuController \
PopupMenuControllerFactory \
......@@ -788,7 +818,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/g
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic,\
Graphic \
GraphicDescriptor \
GraphicProvider \
GraphicRasterizer \
GraphicRendererVCL \
MediaProperties \
......@@ -837,7 +866,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/l
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/mozilla,\
MenuProxy \
MenuProxyListener \
MozillaBootstrap \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages,\
Package \
......@@ -848,9 +876,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/p
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/packages/zip,\
ZipFileAccess \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/plugin,\
PluginManager \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/presentation,\
ChartShape \
CustomPresentation \
......@@ -899,9 +924,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
analysisadd \
dateadd \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/scanner,\
ScannerManager \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/script/browse,\
BrowseNode \
BrowseNodeFactory \
......@@ -1090,7 +1112,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/s
NamedRanges \
NamedRangesEnumeration \
RangeSelectionArguments \
RecentFunctions \
Scenario \
Scenarios \
ScenariosEnumeration \
......@@ -1192,7 +1213,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
AsyncJob \
InteractionHandler \
Job \
JobExecutor \
PasswordContainer \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/text,\
......@@ -1224,7 +1244,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
ChapterNumberingRule \
ContentIndex \
ContentIndexMark \
DefaultNumberingProvider \
Defaults \
DependentTextField \
DocumentIndex \
......@@ -1377,20 +1396,14 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/t
Title \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/ucb,\
AnyCompareFactory \
CachedContentResultSet \
CachedContentResultSetFactory \
CachedContentResultSetStub \
CachedContentResultSetStubFactory \
CachedDynamicResultSet \
CachedDynamicResultSetFactory \
CachedDynamicResultSetStub \
CachedDynamicResultSetStubFactory \
CmisContentProvider \
Content \
ContentProvider \
ContentProviderProxy \
ContentProviderProxyFactory \
ContentResultSet \
ContentTransmitter \
DefaultHierarchyDataSource \
......@@ -1419,14 +1432,10 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u
PackageFolderContent \
PackageStreamContent \
PersistentPropertySet \
PropertiesManager \
PropertySetRegistry \
RemoteAccessContentProvider \
RemoteContentProviderAcceptor \
RemoteProxyContentProvider \
SimpleFileAccess \
SortedDynamicResultSetFactory \
Store \
TransientDocumentsContentProvider \
TransientDocumentsDocumentContent \
TransientDocumentsFolderContent \
......@@ -1470,14 +1479,11 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/u
NumberFormatter \
OfficeInstallationDirectories \
PathSettings \
PathSubstitution \
ReplaceDescriptor \
SearchDescriptor \
SortDescriptor \
SortDescriptor2 \
Sortable \
TextSearch \
URLTransformer \
))
$(eval $(call gb_UnoApiTarget_add_idlfiles_noheader,offapi,offapi/com/sun/star/view,\
OfficeDocumentView \
......
......@@ -43,10 +43,7 @@ module com { module sun { module star { module awt {
to set an menu bar object.
</p>
*/
published service MenuBar
{
interface XMenuBar;
};
published service MenuBar : XMenuBar;
//=============================================================================
......
......@@ -42,10 +42,7 @@ module com { module sun { module star { module awt {
menu. It's also possible to use a pop-up menu to integrate it into
another menu.</p>
*/
published service PopupMenu
{
interface XPopupMenu;
};
published service PopupMenu : XPopupMenu;
//=============================================================================
......
......@@ -39,11 +39,7 @@
/** specifies a standard tab controller.
*/
published service TabController
{
interface com::sun::star::awt::XTabController;
};
published service TabController : XTabController;
//=============================================================================
......
......@@ -46,11 +46,7 @@ module com { module sun { module star { module document {
@since OOo 1.1.2
*/
published service OleEmbeddedServerRegistration
{
interface com::sun::star::uno::XInterface;
};
: com::sun::star::uno::XInterface;
//=============================================================================
......
......@@ -40,65 +40,60 @@
/** The <type>FileSystemStorageFactory</type> is a service that allows to
create a <type>FileSystemStorage</type> based on URL. The URL must point
to a folder.
*/
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
call is used the result storage will be open in read-write mode based
on an arbitrary file system folder.
</p>
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
call is used a sequence of the following parameters can be used:
</p>
<dl>
<dt>parameter 1</dt>
<dd>
specifies source of the object, it must be a string
containing URL.
</dd>
<dt>parameter 2</dt>
<dd>
specifies mode the storage should be open in, can take
values from <type>ElementModes</type> constant set.
</dd>
<dt>parameter 3</dt>
<dd>
allows to provide
<type scope="com::sun::star::document">MediaDescryptor</type>
to the storage so some parts can be used for
initialization, it can be for example
<type scope="com::sun::star::task">XInteractionHandler</type>
implementation.
</dd>
</dl>
<p>
The parameters are optional, that means that sequence can be empty or
contain only first parameter, or first and second one. In case
no parameters are provided the call works the same way as
<member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
In case only first parameter is provided, the storage is opened in
readonly mode.
</p>
<p>
The opened storages can support read access in addition to
specified one.
</p>
*/
published service FileSystemStorageFactory
{
// ----------------------------------------------------------------------
/** A storage can be created through this interface.
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
call is used the result storage will be open in read-write mode based
on an arbitrary file system folder.
</p>
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
call is used a sequence of the following parameters can be used:
</p>
<dl>
<dt>parameter 1</dt>
<dd>
specifies source of the object, it must be a string
containing URL.
</dd>
<dt>parameter 2</dt>
<dd>
specifies mode the storage should be open in, can take
values from <type>ElementModes</type> constant set.
</dd>
<dt>parameter 3</dt>
<dd>
allows to provide
<type scope="com::sun::star::document">MediaDescryptor</type>
to the storage so some parts can be used for
initialization, it can be for example
<type scope="com::sun::star::task">XInteractionHandler</type>
implementation.
</dd>
</dl>
<p>
The parameters are optional, that means that sequence can be empty or
contain only first parameter, or first and second one. In case
no parameters are provided the call works the same way as
<member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
In case only first parameter is provided, the storage is opened in
readonly mode.
</p>
<p>
The opened storages can support read access in addition to
specified one.
</p>
*/
interface ::com::sun::star::lang::XSingleServiceFactory;
};
: ::com::sun::star::lang::XSingleServiceFactory;
//============================================================================
......
......@@ -39,83 +39,78 @@
//============================================================================
/** The <type>StorageFactory</type> is a service that allows to create
a storage based on either stream or URL.
*/
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
call is used the result storage will be open in read-write mode based
on an arbitrary medium.
</p>
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
call is used a sequence of the following parameters can be used:
</p>
<dl>
<dt>parameter 1</dt>
<dd>
specifies source of the object, it can be a string
containing URL, an
<type scope="com::sun::star::io">XStream</type>
implementation or
<type scope="com::sun::star::io">XInputStream</type>;
in case of
<type scope="com::sun::star::io">XStream</type>
implementation
the <type scope="com::sun::star::io">XSeekable</type>
interface must be supported.
</dd>
<dt>parameter 2</dt>
<dd>
specifies mode the storage should be open in, can take
values from <type>ElementModes</type> constant set.
</dd>
<dt>parameter 3</dt>
<dd>
this parameter represents
<type scope="com::sun::star::uno">Any</type>
containing a sequence of
<type scope="com::sun::star::beans">PropertyValue</type>.<br>
The parameter can contain entries from
<type scope="com::sun::star::document">MediaDescryptor</type>
to transport some document info during the storage
initialization, it can be for example
<type scope="com::sun::star::task">XInteractionHandler</type>
implementation, password for the storage and repair
package flag.<br>
Additionally the parameter might contain property with the name
"StorageFormat" that can take values from
<type scope="com::sun::star::embed">StorageFormats</type>.
If the property is not provided a storage of package format
is created.
</dd>
</dl>
<p>
The parameters are optional, that means that sequence can be empty or
contain only first parameter, or first and second one. In case
no parameters are provided the call works the same way as
<member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
In case only first parameter is provided, the storage is opened in
readonly mode.
</p>
<p>
The opened root storage can support read access in addition to
specified one.
</p>
*/
published service StorageFactory
{
// ----------------------------------------------------------------------
/** A storage can be created through this interface.
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstance</method>
call is used the result storage will be open in read-write mode based
on an arbitrary medium.
</p>
<p>
In case
<method scope="com::sun::star::lang">XSingleServiceFactory::createInstanceWithArguments</method>
call is used a sequence of the following parameters can be used:
</p>
<dl>
<dt>parameter 1</dt>
<dd>
specifies source of the object, it can be a string
containing URL, an
<type scope="com::sun::star::io">XStream</type>
implementation or
<type scope="com::sun::star::io">XInputStream</type>;
in case of
<type scope="com::sun::star::io">XStream</type>
implementation
the <type scope="com::sun::star::io">XSeekable</type>
interface must be supported.
</dd>
<dt>parameter 2</dt>
<dd>
specifies mode the storage should be open in, can take
values from <type>ElementModes</type> constant set.
</dd>
<dt>parameter 3</dt>
<dd>
this parameter represents
<type scope="com::sun::star::uno">Any</type>
containing a sequence of
<type scope="com::sun::star::beans">PropertyValue</type>.<br>
The parameter can contain entries from
<type scope="com::sun::star::document">MediaDescryptor</type>
to transport some document info during the storage
initialization, it can be for example
<type scope="com::sun::star::task">XInteractionHandler</type>
implementation, password for the storage and repair
package flag.<br>
Additionally the parameter might contain property with the name
"StorageFormat" that can take values from
<type scope="com::sun::star::embed">StorageFormats</type>.
If the property is not provided a storage of package format
is created.
</dd>
</dl>
<p>
The parameters are optional, that means that sequence can be empty or
contain only first parameter, or first and second one. In case
no parameters are provided the call works the same way as
<member scope="com::sun::star::lang">XSingleServiceFactory::createInstance</member>.
In case only first parameter is provided, the storage is opened in
readonly mode.
</p>
<p>
The opened root storage can support read access in addition to
specified one.
</p>
*/
interface ::com::sun::star::lang::XSingleServiceFactory;
};
: ::com::sun::star::lang::XSingleServiceFactory;
//============================================================================
......
......@@ -45,19 +45,12 @@ module com { module sun { module star { module frame {
</p>
@see DispatchProvider
@see XDispatchProvider
@see XDispatch
@since OOo 1.1.2
*/
published service DispatchHelper
{
//-------------------------------------------------------------------------
/** provides the easy way for dispatch requests.
@see XDispatchProvider
@see XDispatch
*/
interface XDispatchHelper;
};
published service DispatchHelper : XDispatchHelper;
//=============================================================================
......
......@@ -52,13 +52,7 @@
@see Frame
@since OOo 1.1.2
*/
published service DispatchRecorderSupplier
{
//-------------------------------------------------------------------------
/** provides access to a <type>DispatchRecorder</type> and helps on recording
*/
interface com::sun::star::frame::XDispatchRecorderSupplier;
};
published service DispatchRecorderSupplier : XDispatchRecorderSupplier;
//=============================================================================
......
......@@ -38,14 +38,7 @@ module com { module sun { module star { module frame {
/** is an abstract service for accessing the document templates of the office
and manipulate them ( add or rename or remove templates )
*/
published service DocumentTemplates
{
//-------------------------------------------------------------------------
/** implements a high level interface on top of an ucb content provider
which is used for template configuration
*/
interface XDocumentTemplates;
};
published service DocumentTemplates : XDocumentTemplates;
//=============================================================================
......
......@@ -37,20 +37,15 @@
//=============================================================================
/** provides for mapping a given sequence of content identifier strings
to a sequence of respective media (mime) types
<p>
Order of given and their returned corresponding strings is important.
Don't pack or optimize it. Every item of [in] list must match
to an item of [out] list.
</p>
*/
published service MediaTypeDetectionHelper
{
//-------------------------------------------------------------------------
/** provides a mapping from <atom>string<atom> to <atom>string<atom>
<p>
Order of given and their returned corresponding strings is important.
Don't pack or optimize it. Every item of [in] list must match
to an item of [out] list.
</p>
*/
interface com::sun::star::util::XStringMapping;
};
: com::sun::star::util::XStringMapping;
//=============================================================================
......
......@@ -44,10 +44,7 @@ module com { module sun { module star { module graphic
@see XGraphicProvider
*/
published service GraphicProvider
{
interface ::com::sun::star::graphic::XGraphicProvider;
};
published service GraphicProvider : XGraphicProvider;
} ; } ; } ; } ;
......
......@@ -41,16 +41,10 @@
/** Allow to discover Mozilla/Thunderbird profiles
Allow init Mozilla XPCOM using selected profile and switch profiles.
*/
published service MozillaBootstrap
{
//-------------------------------------------------------------------------