[Libreoffice-commits] .: 4 commits - comphelper/inc comphelper/source extensions/source offapi/com offapi/type_reference package/source sd/source sfx2/source solenv/bin udkapi/com
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Aug 23 00:59:36 PDT 2012
comphelper/inc/comphelper/storagehelper.hxx | 21 ++-
comphelper/source/misc/storagehelper.cxx | 19 ---
extensions/source/nsplugin/source/so_instance.cxx | 13 --
offapi/com/sun/star/datatransfer/DataFormatTranslator.idl | 5
offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl | 5
offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl | 5
offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl | 5
offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl | 5
offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl | 5
offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl | 5
offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl | 5
offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl | 5
offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl | 8 -
offapi/com/sun/star/drawing/GenericDrawPage.idl | 9 -
offapi/com/sun/star/i18n/BreakIterator.idl | 7 -
offapi/com/sun/star/i18n/ChapterCollator.idl | 7 -
offapi/com/sun/star/i18n/CharacterClassification.idl | 7 -
offapi/com/sun/star/i18n/Collator.idl | 7 -
offapi/com/sun/star/i18n/IndexEntrySupplier.idl | 2
offapi/com/sun/star/i18n/InputSequenceChecker.idl | 2
offapi/com/sun/star/i18n/LocaleCalendar.idl | 2
offapi/com/sun/star/i18n/LocaleData.idl | 2
offapi/com/sun/star/i18n/NativeNumberSupplier.idl | 7 -
offapi/com/sun/star/i18n/NumberFormatMapper.idl | 7 -
offapi/com/sun/star/i18n/OrdinalSuffix.idl | 7 -
offapi/com/sun/star/i18n/Transliteration.idl | 2
offapi/com/sun/star/linguistic2/DictionaryList.idl | 2
offapi/com/sun/star/linguistic2/Hyphenator.idl | 2
offapi/com/sun/star/linguistic2/LinguProperties.idl | 2
offapi/com/sun/star/linguistic2/LinguServiceManager.idl | 2
offapi/com/sun/star/linguistic2/SpellChecker.idl | 2
offapi/com/sun/star/linguistic2/Thesaurus.idl | 4
offapi/com/sun/star/presentation/OutlineView.idl | 7 -
offapi/com/sun/star/presentation/PresentationView.idl | 9 -
offapi/com/sun/star/presentation/PreviewView.idl | 8 -
offapi/com/sun/star/presentation/SlidesView.idl | 7 -
offapi/com/sun/star/setup/Setup.idl | 10 -
offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl | 5
offapi/com/sun/star/system/ProxySettings.idl | 4
offapi/com/sun/star/system/SimpleCommandMail.idl | 4
offapi/com/sun/star/system/SimpleSystemMail.idl | 4
offapi/com/sun/star/system/SystemShellExecute.idl | 4
offapi/com/sun/star/ui/dialogs/FilePicker.idl | 5
offapi/com/sun/star/ui/dialogs/FolderPicker.idl | 4
offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl | 2
offapi/com/sun/star/xml/crypto/XMLEncryption.idl | 2
offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl | 2
offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl | 2
offapi/com/sun/star/xml/crypto/XMLSignature.idl | 2
offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl | 2
offapi/com/sun/star/xml/crypto/sax/Decryptor.idl | 2
offapi/com/sun/star/xml/crypto/sax/Encryptor.idl | 2
offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl | 2
offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl | 2
offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl | 2
offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl | 2
offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl | 2
offapi/type_reference/types.rdb |binary
package/source/zipapi/XUnbufferedStream.cxx | 22 ---
sd/source/filter/html/buttonset.cxx | 3
sfx2/source/doc/objstor.cxx | 11 +
solenv/bin/modules/installer.pm | 2
solenv/bin/modules/installer/scpzipfiles.pm | 50 ++++++-
solenv/bin/modules/t/installer-scpzipfiles.t | 63 ----------
udkapi/com/sun/star/lang/MultiServiceFactory.idl | 4
udkapi/com/sun/star/loader/Dynamic.idl | 41 ++----
udkapi/com/sun/star/loader/Java.idl | 27 +---
udkapi/com/sun/star/loader/SharedLibrary.idl | 18 --
68 files changed, 117 insertions(+), 409 deletions(-)
New commits:
commit 52755d6d2cf1c6addaf3c91b93bb86d66b730409
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 23 09:47:13 2012 +0200
Revert "installer: Use hashref for replace_all_ziplistvariables_in_rtffile"
This reverts commit 46a977081c6f1886f8fff8457c85e6d426dcc20f. It started to
replace occurrences of "${...}" unknown to the installer with empty strings,
instead of keeping them as-is. This caused the "${ORIGIN}" at the start of the
value for URE_BOOTSTRAP to disappear from the soffice ini-file (cf.
gid_Brand_Profileitem_Soffice_UreBootstrap in scp2/source/ooo/common_brand.scp),
making soffice fail to start completely.
Change-Id: Ia7a34179b78677a703fc487401e011073d14a176
diff --git a/solenv/bin/modules/installer.pm b/solenv/bin/modules/installer.pm
index 3820c70..ebfae1a 100644
--- a/solenv/bin/modules/installer.pm
+++ b/solenv/bin/modules/installer.pm
@@ -1639,7 +1639,7 @@ sub main {
{
my $licensefilesource = installer::windows::idtglobal::get_rtflicensefilesource($onelanguage, $includepatharrayref_lang);
my $licensefile = installer::files::read_file($licensefilesource);
- installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariableshashref);
+ installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile($licensefile, $allvariablesarrayref, $onelanguage, $loggingdir);
my $controltablename = $languageidtdir . $installer::globals::separator . "Control.idt";
my $controltable = installer::files::read_file($controltablename);
installer::windows::idtglobal::add_licensefile_to_database($licensefile, $controltable);
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
index 70283f2..cb0e640 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -39,26 +39,60 @@ use installer::systemactions;
sub replace_all_ziplistvariables_in_file
{
- my ( $fileref, $variablesref ) = @_;
+ my ( $fileref, $variableshashref ) = @_;
- for my $line ( @{$fileref} )
+ for ( my $i = 0; $i <= $#{$fileref}; $i++ )
{
- $line =~ s/\$\{(\w+)\}/$variablesref->{$1}/eg;
+ my $line = ${$fileref}[$i];
+
+ if ( $line =~ /^.*\$\{\w+\}.*$/ ) # only occurrence of ${abc}
+ {
+ my $key;
+
+ foreach $key (keys %{$variableshashref})
+ {
+ my $value = $variableshashref->{$key};
+ $key = '${' . $key . '}';
+ $line =~ s/\Q$key\E/$value/g;
+ ${$fileref}[$i] = $line;
+ }
+ }
}
}
########################################################################################
-# Replacing all zip list variables in rtf files.
+# Replacing all zip list variables in rtf files. In rtf files
+# the brackets are masked.
########################################################################################
sub replace_all_ziplistvariables_in_rtffile
{
- my ( $fileref, $variablesref ) = @_;
+ my ( $fileref, $variablesref, $onelanguage, $loggingdir ) = @_;
- for my $line ( @{$fileref} )
+ for ( my $i = 0; $i <= $#{$fileref}; $i++ )
{
- # In rtf files the braces are backslash-escaped.
- $line =~ s/\$\\\{(\w+)\\\}/$variablesref->{$1}/eg;
+ my $line = ${$fileref}[$i];
+
+ if ( $line =~ /^.*\$\\\{\w+\\\}.*$/ ) # only occurrence of $\{abc\}
+ {
+ for ( my $j = 0; $j <= $#{$variablesref}; $j++ )
+ {
+ my $variableline = ${$variablesref}[$j];
+
+ my ($key, $value);
+
+ if ( $variableline =~ /^\s*([\w-]+?)\s+(.*?)\s*$/ )
+ {
+ $key = $1;
+ $value = $2;
+ $key = '$\{' . $key . '\}';
+ }
+
+ $line =~ s/\Q$key\E/$value/g;
+
+ ${$fileref}[$i] = $line;
+ }
+ }
}
}
diff --git a/solenv/bin/modules/t/installer-scpzipfiles.t b/solenv/bin/modules/t/installer-scpzipfiles.t
deleted file mode 100644
index e98bfd0..0000000
--- a/solenv/bin/modules/t/installer-scpzipfiles.t
+++ /dev/null
@@ -1,63 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# [ Copyright (C) 2012 Tim Retout <tim at retout.co.uk> (initial developer) ]
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-use strict;
-use warnings;
-
-use lib '.';
-
-use Test::More;
-
-use installer::scpzipfiles;
-
-my $vars = { foo => "bar" };
-
-my %lines;
-my $i = 0;
-while (<DATA>) {
- push @{ $lines{$i++ % 3} }, $_;
-}
-
-my @file1 = @{ $lines{0} };
-my @file2 = @{ $lines{0} };
-
-installer::scpzipfiles::replace_all_ziplistvariables_in_file(\@file1, $vars);
-installer::scpzipfiles::replace_all_ziplistvariables_in_rtffile(\@file2, $vars);
-
-is_deeply(\@file1, $lines{1}, 'replace_all_ziplistvariables_in_file works');
-is_deeply(\@file2, $lines{2}, 'replace_all_ziplistvariables_in_rtffile works');
-
-done_testing();
-
-__DATA__
-This is a test
-This is a test
-This is a test
-A test of ${foo} replacement ${foo}.
-A test of bar replacement bar.
-A test of ${foo} replacement ${foo}.
-A test of RTF $\{foo\} replacement $\{foo\}.
-A test of RTF $\{foo\} replacement $\{foo\}.
-A test of RTF bar replacement bar.
commit fcd990f208be4430157dca2d6093337f21cb079b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Aug 23 08:33:10 2012 +0200
Some clean up after previous commit
Change-Id: Ie419c769c5d661d51c1b43b9808791dcf9e1725c
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index f255dc8..f26f997 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -24,13 +24,7 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XStream.hpp>
#include "comphelper/comphelperdllapi.h"
@@ -42,6 +36,18 @@
#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1UTF8EncryptionKey" ) )
#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1MS1252EncryptionKey" ) )
+namespace com { namespace sun { namespace star {
+ namespace beans { struct NamedValue; }
+ namespace embed { class XStorage; }
+ namespace io {
+ class XInputStream;
+ class XOutputStream;
+ class XStream;
+ }
+ namespace lang { class XSingleServiceFactory; }
+ namespace uno { class XComponentContext; }
+} } }
+
namespace comphelper {
// Unfortunately - the impl.s of XStorage like to invalidate all
@@ -123,8 +129,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
GetInputStreamFromURL(
const ::rtl::OUString& aURL,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory
- = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >() )
+ const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& context )
throw ( ::com::sun::star::uno::Exception );
static void SetCommonStorageEncryptionData(
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index ebe8c41..785d4b2 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -19,8 +19,9 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XEncryptionProtectedSource2.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -35,7 +36,6 @@
#include <ucbhelper/content.hxx>
-#include <comphelper/componentcontext.hxx>
#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/documentconstants.hxx>
@@ -224,20 +224,10 @@ void OStorageHelper::CopyInputToOutput(
// ----------------------------------------------------------------------
uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
const ::rtl::OUString& aURL,
- const uno::Reference< lang::XMultiServiceFactory >& xSF )
+ const uno::Reference< uno::XComponentContext >& context )
throw ( uno::Exception )
{
- uno::Reference< lang::XMultiServiceFactory > xFactory = xSF.is() ? xSF : ::comphelper::getProcessServiceFactory();
- if ( !xFactory.is() )
- throw uno::RuntimeException();
-
- uno::Reference < ucb::XSimpleFileAccess2 > xTempAccess(
- ucb::SimpleFileAccess::create(comphelper::ComponentContext(xFactory).getUNOContext()) );
-
- if ( !xTempAccess.is() )
- throw uno::RuntimeException();
-
- uno::Reference< io::XInputStream > xInputStream = xTempAccess->openFileRead( aURL );
+ uno::Reference< io::XInputStream > xInputStream = ucb::SimpleFileAccess::create(context)->openFileRead( aURL );
if ( !xInputStream.is() )
throw uno::RuntimeException();
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 80bc51d..cc545c8 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -241,11 +241,6 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
Reference< beans::XPropertySet > xFactoryProperties( mxRemoteMSF, uno::UNO_QUERY );
Reference< uno::XComponentContext > xContext( xFactoryProperties->getPropertyValue( "DefaultContext" ), UNO_QUERY );
Reference< ucb::XSimpleFileAccess2 > xSimpleFileAccess( ucb::SimpleFileAccess::create(xContext) );
- if(!xSimpleFileAccess.is())
- {
- debug_fprintf(NSP_LOG_APPEND, "can not create SimpleFileAccess to load URL\n");
- return sal_False;
- }
Reference<io::XInputStream> xInputStream = xSimpleFileAccess->openFileRead( m_sURL );
if(!xInputStream.is())
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 0688b5c..9f289ba 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -32,13 +32,6 @@
#include <osl/mutex.hxx>
-#if 0
-// for debugging purposes here
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <comphelper/componentcontext.hxx>
-using namespace ::com::sun::star;
-#endif
-
using namespace ::com::sun::star;
using namespace com::sun::star::packages::zip::ZipConstants;
using namespace com::sun::star::io;
@@ -299,21 +292,6 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
if ( !m_xCipherContext.is() && !mbWrappedRaw )
maCRC.update( aData );
-#if 0
- // for debugging purposes here
- if ( mbWrappedRaw )
- {
- if ( 0 )
- {
- uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
- uno::Reference< ucb::XSimpleFileAccess2 > xAccess( SimpleFileAccess::create(xContext) );
- uno::Reference< io::XOutputStream > xOut = xAccess->openFileWrite(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///d:/777/Encrypted/picture") ) );
- xOut->writeBytes( aData );
- xOut->closeOutput();
- }
- }
-#endif
-
if ( mnZipSize + maHeader.getLength() == mnMyCurrent && maCRC.getValue() != maEntry.nCrc )
throw ZipIOException( OUString( RTL_CONSTASCII_USTRINGPARAM( "The stream seems to be broken!" ) ),
Reference< XInterface >() );
diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx
index a22748c..460b238 100644
--- a/sd/source/filter/html/buttonset.cxx
+++ b/sd/source/filter/html/buttonset.cxx
@@ -26,10 +26,13 @@
*
************************************************************************/
+#include "sal/config.h"
#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
+#include <com/sun/star/io/XStream.hpp>
#include <osl/file.hxx>
#include <comphelper/storagehelper.hxx>
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index ed80ba2..64eadd5 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include "sal/config.h"
+
+#include <cassert>
+
#include <vcl/msgbox.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
@@ -241,10 +245,9 @@ sal_Bool SfxObjectShell::PutURLContentsToVersionStream_Impl(
throw RuntimeException();
uno::Reference< io::XInputStream > xTmpInStream =
- ::comphelper::OStorageHelper::GetInputStreamFromURL( aURL );
- DBG_ASSERT( xTmpInStream.is(), "The method must create the stream or throw an exception!\n" );
- if ( !xTmpInStream.is() )
- throw uno::RuntimeException();
+ ::comphelper::OStorageHelper::GetInputStreamFromURL(
+ aURL, comphelper::getProcessComponentContext() );
+ assert( xTmpInStream.is() );
xTrunc->truncate();
::comphelper::OStorageHelper::CopyInputToOutput( xTmpInStream, xOutStream );
commit 3e7990faa4dda6022c63aebb2ac8f12b2bbc0731
Author: Noel Grandin <noel at peralex.com>
Date: Fri Aug 17 14:55:54 2012 +0200
fdo#46808, Shiny UNO, Use factory to create XSimpleFileAccess instances
Change-Id: I86e2a8873e5646abd340015f500bf9e872e8e6c5
Signed-off-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index d43e689..ebe8c41 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/embed/XEncryptionProtectedSource2.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
@@ -34,6 +35,7 @@
#include <ucbhelper/content.hxx>
+#include <comphelper/componentcontext.hxx>
#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <comphelper/documentconstants.hxx>
@@ -229,9 +231,8 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
if ( !xFactory.is() )
throw uno::RuntimeException();
- uno::Reference < ::com::sun::star::ucb::XSimpleFileAccess > xTempAccess(
- xFactory->createInstance ( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ucb.SimpleFileAccess" )) ),
- uno::UNO_QUERY );
+ uno::Reference < ucb::XSimpleFileAccess2 > xTempAccess(
+ ucb::SimpleFileAccess::create(comphelper::ComponentContext(xFactory).getUNOContext()) );
if ( !xTempAccess.is() )
throw uno::RuntimeException();
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 8b243ae..80bc51d 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/presentation/XPresentation.hpp>
#include <com/sun/star/presentation/XPresentationSupplier.hpp>
#include <vcl/window.hxx>
@@ -238,9 +238,9 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
}
//create stream for the document
- Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
- mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
- uno::UNO_QUERY );
+ Reference< beans::XPropertySet > xFactoryProperties( mxRemoteMSF, uno::UNO_QUERY );
+ Reference< uno::XComponentContext > xContext( xFactoryProperties->getPropertyValue( "DefaultContext" ), UNO_QUERY );
+ Reference< ucb::XSimpleFileAccess2 > xSimpleFileAccess( ucb::SimpleFileAccess::create(xContext) );
if(!xSimpleFileAccess.is())
{
debug_fprintf(NSP_LOG_APPEND, "can not create SimpleFileAccess to load URL\n");
diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx
index 7ef9b09..0688b5c 100644
--- a/package/source/zipapi/XUnbufferedStream.cxx
+++ b/package/source/zipapi/XUnbufferedStream.cxx
@@ -34,8 +34,8 @@
#if 0
// for debugging purposes here
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include <comphelper/processfactory.hxx>
+#include <com/sun/star/ucb/SimpleFileAccess.hpp>
+#include <comphelper/componentcontext.hxx>
using namespace ::com::sun::star;
#endif
@@ -305,8 +305,8 @@ sal_Int32 SAL_CALL XUnbufferedStream::readBytes( Sequence< sal_Int8 >& aData, sa
{
if ( 0 )
{
- uno::Reference< lang::XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
- uno::Reference< ucb::XSimpleFileAccess > xAccess( xFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess") ) ), uno::UNO_QUERY );
+ uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
+ uno::Reference< ucb::XSimpleFileAccess2 > xAccess( SimpleFileAccess::create(xContext) );
uno::Reference< io::XOutputStream > xOut = xAccess->openFileWrite(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "file:///d:/777/Encrypted/picture") ) );
xOut->writeBytes( aData );
xOut->closeOutput();
commit 8b34ad6204ee35b7dca10d2b1c9761dfa72684a7
Author: Noel Grandin <noel at peralex.com>
Date: Tue Aug 21 07:39:30 2012 +0200
fdo#46808, Remove unnecessary XServiceInfo lines in UNO IDL
XServiceInfo does not need to be declared as a supported sub-interface
for services, it is always implicitly there.
Also, for those services that now only contain one interface, convert
them to new-style service IDL declarations.
Change-Id: I325c27f287a02de6bdfc8bb6e5bf6c2a4ae0a753
Signed-off-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
index 2864453..f8c1747 100644
--- a/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
+++ b/offapi/com/sun/star/datatransfer/DataFormatTranslator.idl
@@ -20,7 +20,6 @@
#ifndef __com_sun_star_datatransfer_DataFormatTranslator_idl__
#define __com_sun_star_datatransfer_DataFormatTranslator_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -45,10 +44,6 @@ published service DataFormatTranslator
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
index 9d8b416..0e79340 100644
--- a/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
+++ b/offapi/com/sun/star/datatransfer/MimeContentTypeFactory.idl
@@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_MimeContentType_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -50,10 +49,6 @@ published service MimeContentTypeFactory
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
index 4b55625..7e9a528 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/ClipboardManager.idl
@@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_clipboard_ClipboardManager_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -47,10 +46,6 @@ published service ClipboardManager
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
index da5bc7d..6f46b34 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/GenericClipboard.idl
@@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_clipboard_GenericClipboard_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -54,10 +53,6 @@ published service GenericClipboard
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
index d5d2f08..c34181c 100644
--- a/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
+++ b/offapi/com/sun/star/datatransfer/clipboard/SystemClipboard.idl
@@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_clipboard_SystemClipboard_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
#include <com/sun/star/lang/XInitialization.idl>
@@ -71,10 +70,6 @@ published service SystemClipboard
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
index c9fc1d9..a51f810 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDragSource.idl
@@ -30,7 +30,6 @@
#define __com_sun_star_datatransfer_dnd_OleDragSource_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -70,10 +69,6 @@ published service OleDragSource
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
index c21f55d..e1e1a27 100644
--- a/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/OleDropTarget.idl
@@ -30,7 +30,6 @@
#define __com_sun_star_datatransfer_dnd_OleDropTarget_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -62,10 +61,6 @@ published service OleDropTarget
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
index 4d576b8..c987b47 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DragSource.idl
@@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_dnd_X11DragSource_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -56,10 +55,6 @@ published service X11DragSource
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
index 0a79343..624afdc 100644
--- a/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
+++ b/offapi/com/sun/star/datatransfer/dnd/X11DropTarget.idl
@@ -21,7 +21,6 @@
#define __com_sun_star_datatransfer_dnd_X11DropTarget_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
@@ -59,10 +58,6 @@ published service X11DropTarget
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
index 84f0a75..198c813 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
@@ -27,7 +27,6 @@
#include <com/sun/star/view/XSelectionSupplier.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/drawing/XDrawPage.idl>
#include <com/sun/star/awt/XWindow.idl>
#include <com/sun/star/awt/Point.idl>
@@ -82,13 +81,6 @@ published service DrawingDocumentDrawView
interface com::sun::star::view::XSelectionSupplier;
-
- /** provides the names of the services implemented by
- this instance.
- */
- interface com::sun::star::lang::XServiceInfo;
-
-
/** If the view is in master page mode, the view shows the master pages
of this model.
*/
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index 593319b..05c84ce 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -38,8 +38,6 @@
#include <com/sun/star/container/XNamed.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
-
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/view/PaperOrientation.idl>
@@ -115,13 +113,6 @@ published service GenericDrawPage
[optional] interface com::sun::star::container::XNamed;
- // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::lang::XServiceInfo
- /** returns the services implemented by this
- instance.
- */
- interface com::sun::star::lang::XServiceInfo;
-
-
// DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::beans::XPropertySet
/** gives you access to the properties of this
<type>DrawPage</type>.
diff --git a/offapi/com/sun/star/i18n/BreakIterator.idl b/offapi/com/sun/star/i18n/BreakIterator.idl
index b65cc4b..765bd6b 100644
--- a/offapi/com/sun/star/i18n/BreakIterator.idl
+++ b/offapi/com/sun/star/i18n/BreakIterator.idl
@@ -19,7 +19,6 @@
#ifndef __com_sun_star_i18n_BreakIterator_idl__
#define __com_sun_star_i18n_BreakIterator_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XBreakIterator.idl>
@@ -32,11 +31,7 @@
<p> It also contains a BreakIterator service for Asian languages.
</p>
*/
-published service BreakIterator
-{
- interface com::sun::star::i18n::XBreakIterator;
- interface com::sun::star::lang::XServiceInfo;
-};
+published service BreakIterator : com::sun::star::i18n::XBreakIterator;
}; }; }; };
diff --git a/offapi/com/sun/star/i18n/ChapterCollator.idl b/offapi/com/sun/star/i18n/ChapterCollator.idl
index 14b13f5..6fced5b 100644
--- a/offapi/com/sun/star/i18n/ChapterCollator.idl
+++ b/offapi/com/sun/star/i18n/ChapterCollator.idl
@@ -19,7 +19,6 @@
#ifndef __com_sun_star_i18n_ChapterCollator_idl__
#define __com_sun_star_i18n_ChapterCollator_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XCollator.idl>
@@ -27,11 +26,7 @@
/// Specific collator to sort chapter numbering.
-published service ChapterCollator
-{
- interface com::sun::star::i18n::XCollator;
- interface com::sun::star::lang::XServiceInfo;
-};
+published service ChapterCollator : com::sun::star::i18n::XCollator;
}; }; }; };
diff --git a/offapi/com/sun/star/i18n/CharacterClassification.idl b/offapi/com/sun/star/i18n/CharacterClassification.idl
index 33ebce2..927ea37 100644
--- a/offapi/com/sun/star/i18n/CharacterClassification.idl
+++ b/offapi/com/sun/star/i18n/CharacterClassification.idl
@@ -20,7 +20,6 @@
#ifndef __com_sun_star_i18n_CharacterClassification_idl__
#define __com_sun_star_i18n_CharacterClassification_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XCharacterClassification.idl>
@@ -32,11 +31,7 @@ module com { module sun { module star { module i18n {
<p>Provides also a generic parser functionality.</p>
*/
-published service CharacterClassification
-{
- interface com::sun::star::i18n::XCharacterClassification;
- interface com::sun::star::lang::XServiceInfo;
-};
+published service CharacterClassification : com::sun::star::i18n::XCharacterClassification;
}; }; }; };
diff --git a/offapi/com/sun/star/i18n/Collator.idl b/offapi/com/sun/star/i18n/Collator.idl
index 779bf2a..9917cd2 100644
--- a/offapi/com/sun/star/i18n/Collator.idl
+++ b/offapi/com/sun/star/i18n/Collator.idl
@@ -19,7 +19,6 @@
#ifndef __com_sun_star_i18n_Collator_idl__
#define __com_sun_star_i18n_Collator_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XCollator.idl>
@@ -30,11 +29,7 @@
Access collation algorithms of different locales.
*/
-published service Collator
-{
- interface com::sun::star::i18n::XCollator;
- interface com::sun::star::lang::XServiceInfo;
-};
+published service Collator : com::sun::star::i18n::XCollator;
}; }; }; };
diff --git a/offapi/com/sun/star/i18n/IndexEntrySupplier.idl b/offapi/com/sun/star/i18n/IndexEntrySupplier.idl
index 2b6d3ad..7b4b1c5 100644
--- a/offapi/com/sun/star/i18n/IndexEntrySupplier.idl
+++ b/offapi/com/sun/star/i18n/IndexEntrySupplier.idl
@@ -20,7 +20,6 @@
#ifndef __com_sun_star_i18n_IndexEntrySupplier_idl__
#define __com_sun_star_i18n_IndexEntrySupplier_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XIndexEntrySupplier.idl>
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.idl>
@@ -32,7 +31,6 @@ module com { module sun { module star { module i18n {
published service IndexEntrySupplier
{
interface com::sun::star::i18n::XIndexEntrySupplier;
- interface com::sun::star::lang::XServiceInfo;
[optional] interface com::sun::star::i18n::XExtendedIndexEntrySupplier;
};
diff --git a/offapi/com/sun/star/i18n/InputSequenceChecker.idl b/offapi/com/sun/star/i18n/InputSequenceChecker.idl
index 41e2e6c..acb859d 100644
--- a/offapi/com/sun/star/i18n/InputSequenceChecker.idl
+++ b/offapi/com/sun/star/i18n/InputSequenceChecker.idl
@@ -20,7 +20,6 @@
#ifndef __com_sun_star_i18n_InputSequenceChecker_idl__
#define __com_sun_star_i18n_InputSequenceChecker_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XExtendedInputSequenceChecker.idl>
@@ -34,7 +33,6 @@ module com { module sun { module star { module i18n {
published service InputSequenceChecker
{
interface com::sun::star::i18n::XInputSequenceChecker;
- interface com::sun::star::lang::XServiceInfo;
[optional] interface com::sun::star::i18n::XExtendedInputSequenceChecker;
};
diff --git a/offapi/com/sun/star/i18n/LocaleCalendar.idl b/offapi/com/sun/star/i18n/LocaleCalendar.idl
index b67bfce..e08d4f7 100644
--- a/offapi/com/sun/star/i18n/LocaleCalendar.idl
+++ b/offapi/com/sun/star/i18n/LocaleCalendar.idl
@@ -29,7 +29,6 @@
#ifndef __com_sun_star_i18n_LocaleCalendar_idl__
#define __com_sun_star_i18n_LocaleCalendar_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XCalendar.idl>
#include <com/sun/star/i18n/XExtendedCalendar.idl>
#include <com/sun/star/i18n/XCalendar3.idl>
@@ -42,7 +41,6 @@ module com { module sun { module star { module i18n {
published service LocaleCalendar
{
interface com::sun::star::i18n::XCalendar;
- interface com::sun::star::lang::XServiceInfo;
[optional] interface com::sun::star::i18n::XExtendedCalendar;
[optional] interface com::sun::star::i18n::XCalendar3;
diff --git a/offapi/com/sun/star/i18n/LocaleData.idl b/offapi/com/sun/star/i18n/LocaleData.idl
index 617b1c7..fd95168 100644
--- a/offapi/com/sun/star/i18n/LocaleData.idl
+++ b/offapi/com/sun/star/i18n/LocaleData.idl
@@ -29,7 +29,6 @@
#ifndef __com_sun_star_i18n_LocaleData_idl__
#define __com_sun_star_i18n_LocaleData_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XLocaleData4.idl>
@@ -40,7 +39,6 @@ module com { module sun { module star { module i18n {
published service LocaleData
{
interface com::sun::star::i18n::XLocaleData;
- interface com::sun::star::lang::XServiceInfo;
[optional] interface com::sun::star::i18n::XLocaleData2;
[optional] interface com::sun::star::i18n::XLocaleData3;
diff --git a/offapi/com/sun/star/i18n/NativeNumberSupplier.idl b/offapi/com/sun/star/i18n/NativeNumberSupplier.idl
index 7c56294..47cdcbc 100644
--- a/offapi/com/sun/star/i18n/NativeNumberSupplier.idl
+++ b/offapi/com/sun/star/i18n/NativeNumberSupplier.idl
@@ -20,7 +20,6 @@
#ifndef __com_sun_star_i18n_NativeNumberSupplier_idl__
#define __com_sun_star_i18n_NativeNumberSupplier_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XNativeNumberSupplier.idl>
@@ -31,11 +30,7 @@ module com { module sun { module star { module i18n {
@since OOo 1.1.2
*/
-published service NativeNumberSupplier
-{
- interface com::sun::star::i18n::XNativeNumberSupplier;
- interface com::sun::star::lang::XServiceInfo;
-};
+published service NativeNumberSupplier : com::sun::star::i18n::XNativeNumberSupplier;
}; }; }; };
diff --git a/offapi/com/sun/star/i18n/NumberFormatMapper.idl b/offapi/com/sun/star/i18n/NumberFormatMapper.idl
index c3ba5fa..4e7325a 100644
--- a/offapi/com/sun/star/i18n/NumberFormatMapper.idl
+++ b/offapi/com/sun/star/i18n/NumberFormatMapper.idl
@@ -21,7 +21,6 @@
#define __com_sun_star_i18n_NumberFormatMapper_idl__
#include <com/sun/star/i18n/XNumberFormatCode.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module i18n {
@@ -31,11 +30,7 @@ module com { module sun { module star { module i18n {
number formatter
*/
-published service NumberFormatMapper
-{
- interface com::sun::star::i18n::XNumberFormatCode;
- interface com::sun::star::lang::XServiceInfo;
-};
+published service NumberFormatMapper : com::sun::star::i18n::XNumberFormatCode;
}; }; }; };
#endif
diff --git a/offapi/com/sun/star/i18n/OrdinalSuffix.idl b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
index 6bc99e2..fadac75 100644
--- a/offapi/com/sun/star/i18n/OrdinalSuffix.idl
+++ b/offapi/com/sun/star/i18n/OrdinalSuffix.idl
@@ -20,7 +20,6 @@
#ifndef INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl
#define INCLUDED_com_sun_star_i18n_OrdinalSuffix_idl
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XOrdinalSuffix.idl>
@@ -37,11 +36,7 @@ module com { module sun { module star { module i18n {
change without notice and should not be used outside the OOo core.
*/
-service OrdinalSuffix
-{
- interface com::sun::star::i18n::XOrdinalSuffix;
- interface com::sun::star::lang::XServiceInfo;
-};
+service OrdinalSuffix : com::sun::star::i18n::XOrdinalSuffix;
}; }; }; };
diff --git a/offapi/com/sun/star/i18n/Transliteration.idl b/offapi/com/sun/star/i18n/Transliteration.idl
index 075ff7a..2cc2bed 100644
--- a/offapi/com/sun/star/i18n/Transliteration.idl
+++ b/offapi/com/sun/star/i18n/Transliteration.idl
@@ -20,7 +20,6 @@
#ifndef __com_sun_star_i18n_Transliteration_idl__
#define __com_sun_star_i18n_Transliteration_idl__
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/i18n/XTransliteration.idl>
#include <com/sun/star/i18n/XExtendedTransliteration.idl>
@@ -32,7 +31,6 @@ module com { module sun { module star { module i18n {
published service Transliteration
{
interface com::sun::star::i18n::XTransliteration;
- interface com::sun::star::lang::XServiceInfo;
[optional] interface com::sun::star::i18n::XExtendedTransliteration;
};
diff --git a/offapi/com/sun/star/linguistic2/DictionaryList.idl b/offapi/com/sun/star/linguistic2/DictionaryList.idl
index e5fda9c..fc8e06a 100644
--- a/offapi/com/sun/star/linguistic2/DictionaryList.idl
+++ b/offapi/com/sun/star/linguistic2/DictionaryList.idl
@@ -20,7 +20,6 @@
#define __com_sun_star_linguistic2_DictionaryList_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module linguistic2 {
@@ -40,7 +39,6 @@ published service DictionaryList
{
interface com::sun::star::linguistic2::XSearchableDictionaryList;
interface com::sun::star::lang::XComponent;
- interface com::sun::star::lang::XServiceInfo;
};
diff --git a/offapi/com/sun/star/linguistic2/Hyphenator.idl b/offapi/com/sun/star/linguistic2/Hyphenator.idl
index d89c6ca..75796dd 100644
--- a/offapi/com/sun/star/linguistic2/Hyphenator.idl
+++ b/offapi/com/sun/star/linguistic2/Hyphenator.idl
@@ -21,7 +21,6 @@
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XServiceDisplayName.idl>
@@ -38,7 +37,6 @@ published service Hyphenator
interface com::sun::star::linguistic2::XLinguServiceEventBroadcaster;
interface com::sun::star::lang::XInitialization;
interface com::sun::star::lang::XComponent;
- interface com::sun::star::lang::XServiceInfo;
interface com::sun::star::lang::XServiceDisplayName;
};
diff --git a/offapi/com/sun/star/linguistic2/LinguProperties.idl b/offapi/com/sun/star/linguistic2/LinguProperties.idl
index 70d3ef6..36664e6 100644
--- a/offapi/com/sun/star/linguistic2/LinguProperties.idl
+++ b/offapi/com/sun/star/linguistic2/LinguProperties.idl
@@ -32,7 +32,6 @@
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/beans/XFastPropertySet.idl>
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/Locale.idl>
@@ -45,7 +44,6 @@ published service LinguProperties
interface com::sun::star::beans::XPropertySet;
interface com::sun::star::beans::XFastPropertySet;
interface com::sun::star::lang::XComponent;
- interface com::sun::star::lang::XServiceInfo;
/** defines whether new German spelling rules should be used for German
text or not when doing spell checking or hyphenation, or using the
diff --git a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
index 43f83bb..efdeb0d 100644
--- a/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
+++ b/offapi/com/sun/star/linguistic2/LinguServiceManager.idl
@@ -20,7 +20,6 @@
#define __com_sun_star_linguistic2_LinguServiceManager_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module linguistic2 {
@@ -36,7 +35,6 @@ published service LinguServiceManager
interface com::sun::star::linguistic2::XLinguServiceManager;
interface com::sun::star::linguistic2::XAvailableLocales;
interface com::sun::star::lang::XComponent;
- interface com::sun::star::lang::XServiceInfo;
};
diff --git a/offapi/com/sun/star/linguistic2/SpellChecker.idl b/offapi/com/sun/star/linguistic2/SpellChecker.idl
index 3885c92..371ed3d 100644
--- a/offapi/com/sun/star/linguistic2/SpellChecker.idl
+++ b/offapi/com/sun/star/linguistic2/SpellChecker.idl
@@ -21,7 +21,6 @@
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XServiceDisplayName.idl>
@@ -38,7 +37,6 @@ published service SpellChecker
interface com::sun::star::linguistic2::XLinguServiceEventBroadcaster;
interface com::sun::star::lang::XInitialization;
interface com::sun::star::lang::XComponent;
- interface com::sun::star::lang::XServiceInfo;
interface com::sun::star::lang::XServiceDisplayName;
};
diff --git a/offapi/com/sun/star/linguistic2/Thesaurus.idl b/offapi/com/sun/star/linguistic2/Thesaurus.idl
index 7bed7b2..b00d2af 100644
--- a/offapi/com/sun/star/linguistic2/Thesaurus.idl
+++ b/offapi/com/sun/star/linguistic2/Thesaurus.idl
@@ -21,13 +21,12 @@
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XServiceDisplayName.idl>
module com { module sun { module star { module linguistic2 {
- published interface XThesaurus;
+published interface XThesaurus;
/** offers thesaurus functionality.
*/
@@ -36,7 +35,6 @@ published service Thesaurus
interface com::sun::star::linguistic2::XThesaurus;
interface com::sun::star::lang::XInitialization;
interface com::sun::star::lang::XComponent;
- interface com::sun::star::lang::XServiceInfo;
interface com::sun::star::lang::XServiceDisplayName;
};
diff --git a/offapi/com/sun/star/presentation/OutlineView.idl b/offapi/com/sun/star/presentation/OutlineView.idl
index 9c73263..fcfc8b5 100644
--- a/offapi/com/sun/star/presentation/OutlineView.idl
+++ b/offapi/com/sun/star/presentation/OutlineView.idl
@@ -34,7 +34,6 @@
#include <com/sun/star/frame/Controller.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/drawing/XDrawPage.idl>
#include <com/sun/star/awt/XWindow.idl>
@@ -71,12 +70,6 @@ published service OutlineView
interface com::sun::star::beans::XPropertySet;
- /** provides the names of the services implemented by
- this instance.
- */
- interface com::sun::star::lang::XServiceInfo;
-
-
/** This is the area that is currently visible.
*/
[readonly, property] com::sun::star::awt::Rectangle VisibleArea;
diff --git a/offapi/com/sun/star/presentation/PresentationView.idl b/offapi/com/sun/star/presentation/PresentationView.idl
index bbbc9b0..9300dcb 100644
--- a/offapi/com/sun/star/presentation/PresentationView.idl
+++ b/offapi/com/sun/star/presentation/PresentationView.idl
@@ -25,13 +25,12 @@
#include <com/sun/star/frame/Controller.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/drawing/XDrawPage.idl>
#include <com/sun/star/awt/XWindow.idl>
- module com { module sun { module star { module presentation {
+module com { module sun { module star { module presentation {
/** This component integrates a view to a slide show of a presentation
@@ -62,12 +61,6 @@ published service PresentationView
interface com::sun::star::beans::XPropertySet;
- /** provides the names of the services implemented by
- this instance.
- */
- interface com::sun::star::lang::XServiceInfo;
-
-
/** This is the drawing page that is currently visible.
*/
[property] com::sun::star::drawing::XDrawPage CurrentPage;
diff --git a/offapi/com/sun/star/presentation/PreviewView.idl b/offapi/com/sun/star/presentation/PreviewView.idl
index 9ccd9cc..5f28582 100644
--- a/offapi/com/sun/star/presentation/PreviewView.idl
+++ b/offapi/com/sun/star/presentation/PreviewView.idl
@@ -31,7 +31,7 @@
#include <com/sun/star/awt/XWindow.idl>
- module com { module sun { module star { module presentation {
+module com { module sun { module star { module presentation {
/** This component integrates a preview view to a slide show of a presentation
@@ -65,12 +65,6 @@ published service PreviewView
interface com::sun::star::beans::XPropertySet;
- /** provides the names of the services implemented by
- this instance.
- */
- interface com::sun::star::lang::XServiceInfo;
-
-
/** This is the drawing page that is currently visible.
*/
[property] com::sun::star::drawing::XDrawPage CurrentPage;
diff --git a/offapi/com/sun/star/presentation/SlidesView.idl b/offapi/com/sun/star/presentation/SlidesView.idl
index 5ca8324..0e8d0a5 100644
--- a/offapi/com/sun/star/presentation/SlidesView.idl
+++ b/offapi/com/sun/star/presentation/SlidesView.idl
@@ -25,7 +25,6 @@
#include <com/sun/star/frame/Controller.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/drawing/XDrawPage.idl>
#include <com/sun/star/awt/XWindow.idl>
@@ -63,12 +62,6 @@ published service SlidesView
interface com::sun::star::beans::XPropertySet;
- /** provides the names of the services implemented by
- this instance.
- */
- interface com::sun::star::lang::XServiceInfo;
-
-
/** This is the area that is currently visible.
*/
[readonly, property] com::sun::star::awt::Rectangle VisibleArea;
diff --git a/offapi/com/sun/star/setup/Setup.idl b/offapi/com/sun/star/setup/Setup.idl
index 1fc95cd..feba867 100644
--- a/offapi/com/sun/star/setup/Setup.idl
+++ b/offapi/com/sun/star/setup/Setup.idl
@@ -20,19 +20,11 @@
#define __com_sun_star_setup_Setup_idl__
#include <com/sun/star/setup/XSetup.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module setup {
/// @deprecated
-published service Setup
-{
- // DocMerge: empty anyway
- interface com::sun::star::setup::XSetup;
-
- // DocMerge: empty anyway
- interface com::sun::star::lang::XServiceInfo;
- };
+published service Setup : com::sun::star::setup::XSetup;
}; }; }; };
#endif
diff --git a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
index 90fd6ab..cb806ac 100644
--- a/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
+++ b/offapi/com/sun/star/sheet/SpreadsheetDrawPage.idl
@@ -21,7 +21,6 @@
#include <com/sun/star/drawing/XDrawPage.idl>
#include <com/sun/star/drawing/XShapeGrouper.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module sheet {
@@ -66,10 +65,6 @@ published service SpreadsheetDrawPage
*/
interface com::sun::star::drawing::XShapeGrouper;
-
- /** returns the services implemented by this instance.
- */
- interface com::sun::star::lang::XServiceInfo;
};
diff --git a/offapi/com/sun/star/system/ProxySettings.idl b/offapi/com/sun/star/system/ProxySettings.idl
index bdea6a7..76e9292 100644
--- a/offapi/com/sun/star/system/ProxySettings.idl
+++ b/offapi/com/sun/star/system/ProxySettings.idl
@@ -45,10 +45,6 @@ published service ProxySettings
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/system/SimpleCommandMail.idl b/offapi/com/sun/star/system/SimpleCommandMail.idl
index 93bfbef..542f930 100644
--- a/offapi/com/sun/star/system/SimpleCommandMail.idl
+++ b/offapi/com/sun/star/system/SimpleCommandMail.idl
@@ -45,10 +45,6 @@ published service SimpleCommandMail
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/system/SimpleSystemMail.idl b/offapi/com/sun/star/system/SimpleSystemMail.idl
index 5336fd7..7feebf6 100644
--- a/offapi/com/sun/star/system/SimpleSystemMail.idl
+++ b/offapi/com/sun/star/system/SimpleSystemMail.idl
@@ -44,10 +44,6 @@ published service SimpleSystemMail
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/system/SystemShellExecute.idl b/offapi/com/sun/star/system/SystemShellExecute.idl
index 4ba5087..e5b7143 100644
--- a/offapi/com/sun/star/system/SystemShellExecute.idl
+++ b/offapi/com/sun/star/system/SystemShellExecute.idl
@@ -43,10 +43,6 @@ published service SystemShellExecute
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/ui/dialogs/FilePicker.idl b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
index fdd4685..a009820 100644
--- a/offapi/com/sun/star/ui/dialogs/FilePicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FilePicker.idl
@@ -30,7 +30,6 @@
#define __com_sun_star_ui_dialogs_FilePicker_idl__
#include <com/sun/star/lang/XComponent.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/lang/XTypeProvider.idl>
#include <com/sun/star/lang/XInitialization.idl>
#include <com/sun/star/util/XCancellable.idl>
@@ -123,10 +122,6 @@ published service FilePicker
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
};
diff --git a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
index 7681aff..c0490c9 100644
--- a/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
+++ b/offapi/com/sun/star/ui/dialogs/FolderPicker.idl
@@ -52,10 +52,6 @@ published service FolderPicker
/** Service should always support this interface.
*/
- interface com::sun::star::lang::XServiceInfo;
-
- /** Service should always support this interface.
- */
interface com::sun::star::lang::XTypeProvider;
/** For canceling a running dialog instance.
diff --git a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
index 1a92602..18d12a9 100644
--- a/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
+++ b/offapi/com/sun/star/xml/crypto/SecurityEnvironment.idl
@@ -29,7 +29,6 @@
#include <com/sun/star/xml/crypto/XSecurityEnvironment.idl>
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
@@ -40,7 +39,6 @@ service SecurityEnvironment {
interface com::sun::star::xml::crypto::XSecurityEnvironment ;
interface com::sun::star::lang::XInitialization ;
interface com::sun::star::lang::XUnoTunnel;
- interface com::sun::star::lang::XServiceInfo ;
} ;
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
index 4fe9aca..2fae78e 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryption.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XXMLEncryption.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
@@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto {
service XMLEncryption {
interface com::sun::star::xml::crypto::XXMLEncryption ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
} ;
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
index 5eaef5b..efbe9b0 100644
--- a/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLEncryptionTemplate.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XXMLEncryptionTemplate.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
@@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto {
service XMLEncryptionTemplate {
interface com::sun::star::xml::crypto::XXMLEncryptionTemplate ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
} ;
diff --git a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
index 4b05429..90c3211 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSecurityContext.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XXMLSecurityContext.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
@@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto {
service XMLSecurityContext {
interface com::sun::star::xml::crypto::XXMLSecurityContext ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
} ;
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignature.idl b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
index a6055a9..f19d961 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignature.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignature.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XXMLSignature.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
@@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto {
service XMLSignature {
interface com::sun::star::xml::crypto::XXMLSignature ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
} ;
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
index ef9cdf7..08752ce 100644
--- a/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
+++ b/offapi/com/sun/star/xml/crypto/XMLSignatureTemplate.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/XXMLSignatureTemplate.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module crypto {
@@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module crypto {
service XMLSignatureTemplate {
interface com::sun::star::xml::crypto::XXMLSignatureTemplate ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
} ;
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
index e0d6ce8..81be04f 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Decryptor.idl
@@ -27,7 +27,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <XReferenceResolvedListener.idl>
#include <XBlockerMonitor.idl>
#include <XDecryptionResultBroadcaster.idl>
@@ -46,7 +45,6 @@ service Decryptor {
interface XKeyCollector ;
interface XMissionTaker ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
};
} ; } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
index 37bdbdd..8bb64d4 100644
--- a/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/Encryptor.idl
@@ -27,7 +27,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <XReferenceResolvedListener.idl>
#include <XReferenceCollector.idl>
#include <XBlockerMonitor.idl>
@@ -48,7 +47,6 @@ service Encryptor {
interface XKeyCollector ;
interface XMissionTaker ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
};
} ; } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
index 42f0cbd..1cbacf1 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SAXEventKeeper.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/sax/XDocumentHandler.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <XSecuritySAXEventKeeper.idl>
#include <XReferenceResolvedBroadcaster.idl>
#include <XSAXEventKeeperStatusChangeBroadcaster.idl>
@@ -44,7 +43,6 @@ service SAXEventKeeper {
interface XSAXEventKeeperStatusChangeBroadcaster ;
interface com::sun::star::xml::sax::XDocumentHandler ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
};
} ; } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
index 8c663d7..6a80df3 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureCreator.idl
@@ -26,7 +26,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <XReferenceResolvedListener.idl>
#include <XReferenceCollector.idl>
@@ -51,7 +50,6 @@ service SignatureCreator
interface XMissionTaker ;
interface com::sun::star::xml::crypto::XUriBinding;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
} ; } ; } ; } ; } ; } ; } ;
#endif
diff --git a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
index 321b60d..3bbe6e7 100644
--- a/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/SignatureVerifier.idl
@@ -27,7 +27,6 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
#include <com/sun/star/xml/crypto/XUriBinding.idl>
#include <XReferenceResolvedListener.idl>
#include <XReferenceCollector.idl>
@@ -48,7 +47,6 @@ service SignatureVerifier {
interface XMissionTaker ;
interface com::sun::star::xml::crypto::XUriBinding;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
};
} ; } ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
index 0b87540..70a229d 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLDocumentWrapper.idl
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/wrapper/XXMLDocumentWrapper.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module wrapper {
@@ -38,7 +37,6 @@ module com { module sun { module star { module xml { module wrapper {
service XMLDocumentWrapper {
interface com::sun::star::xml::wrapper::XXMLDocumentWrapper ;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
};
} ; } ; } ; } ; } ;
diff --git a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
index f099e3f..20970a0 100644
--- a/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
+++ b/offapi/com/sun/star/xml/wrapper/XMLElementWrapper.idl
@@ -29,7 +29,6 @@
#include <com/sun/star/xml/wrapper/XXMLElementWrapper.idl>
#include <com/sun/star/lang/XUnoTunnel.idl>
#include <com/sun/star/lang/XInitialization.idl>
-#include <com/sun/star/lang/XServiceInfo.idl>
module com { module sun { module star { module xml { module wrapper {
@@ -40,7 +39,6 @@ service XMLElementWrapper {
interface com::sun::star::xml::wrapper::XXMLElementWrapper ;
interface com::sun::star::lang::XUnoTunnel;
interface com::sun::star::lang::XInitialization ;
- interface com::sun::star::lang::XServiceInfo ;
};
} ; } ; } ; } ; } ;
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index ed7e61a..29e48ad 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/udkapi/com/sun/star/lang/MultiServiceFactory.idl b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
index d7438b1..d9aceec 100644
--- a/udkapi/com/sun/star/lang/MultiServiceFactory.idl
+++ b/udkapi/com/sun/star/lang/MultiServiceFactory.idl
@@ -54,10 +54,6 @@ published service MultiServiceFactory
*/
interface com::sun::star::lang::XMultiComponentFactory;
- /** Factories, as well as all other services, should always support
- this interface.
- */
- interface com::sun::star::lang::XServiceInfo;
};
diff --git a/udkapi/com/sun/star/loader/Dynamic.idl b/udkapi/com/sun/star/loader/Dynamic.idl
index 0b0caa1..fbf9176 100644
--- a/udkapi/com/sun/star/loader/Dynamic.idl
+++ b/udkapi/com/sun/star/loader/Dynamic.idl
@@ -26,30 +26,23 @@ module com { module sun { module star { module loader {
published interface XImplementationLoader;
-/** makes it possible to access services accessible via a <code>UnoUrlResolver</code>
- E.g., instantiation of services in another process. This service is still in an
- experimental state and should not be used in a production environment.
- */
-published service Dynamic
-{
- /** is used to write persistent information into the given registry
- for accessing a <code>SingleServiceFactory</code> and for activating this
- implementation.
- */
- /** allows registration and activation of described service.
- The url parameter has to be a comma-separated list of attributes.
- The following attribute types are understood:
- servicename = the service name to register this component under
- link = a parameter given to a resolver to get a <code>SingleServiceFactory</code>
- resolver = a <code>UnoUrlResolver</code> service, which is used to resolve the link
- */
- interface XImplementationLoader;
-
-
- /** gives information about other supported services
- */
- interface com::sun::star::lang::XServiceInfo;
-};
+/**
+ Makes it possible to access services accessible via a <code>UnoUrlResolver</code>
+ E.g., instantiation of services in another process. This service is still in an
+ experimental state and should not be used in a production environment.
+
+ Is used to write persistent information into the given registry
+ for accessing a <code>SingleServiceFactory</code> and for activating this
+ implementation.
+
+ Allows registration and activation of described service.
+ The url parameter has to be a comma-separated list of attributes.
+ The following attribute types are understood:
+ servicename = the service name to register this component under
+ link = a parameter given to a resolver to get a <code>SingleServiceFactory</code>
+ resolver = a <code>UnoUrlResolver</code> service, which is used to resolve the link
+*/
+published service Dynamic : XImplementationLoader;
}; }; }; };
diff --git a/udkapi/com/sun/star/loader/Java.idl b/udkapi/com/sun/star/loader/Java.idl
index 764e937..bf8731d 100644
--- a/udkapi/com/sun/star/loader/Java.idl
+++ b/udkapi/com/sun/star/loader/Java.idl
@@ -21,28 +21,19 @@
#include <com/sun/star/lang/XServiceInfo.idl>
- module com { module sun { module star { module loader {
+module com { module sun { module star { module loader {
- published interface XImplementationLoader;
+published interface XImplementationLoader;
-// DocMerge from xml: service com::sun::star::loader::Java
-/** allows to access a java component stored with a .jar file
- */
-published service Java
-{
-
- /** is used for writing persistent information in the registry for
- external implementation and for activating this implementation. The
- locationUrls must be absolute file urls.
- */
- interface XImplementationLoader;
-
+/**
+ Allows to access a java component stored with a .jar file.
- /** gives information about other supported services
- */
- interface com::sun::star::lang::XServiceInfo;
-};
+ Is used for writing persistent information in the registry for
+ external implementation and for activating this implementation. The
+ locationUrls must be absolute file urls.
+*/
+published service Java : XImplementationLoader;
}; }; }; };
diff --git a/udkapi/com/sun/star/loader/SharedLibrary.idl b/udkapi/com/sun/star/loader/SharedLibrary.idl
index 9cb3c7c..6f6f779 100644
--- a/udkapi/com/sun/star/loader/SharedLibrary.idl
+++ b/udkapi/com/sun/star/loader/SharedLibrary.idl
@@ -26,22 +26,14 @@
published interface XImplementationLoader;
-/** allows to access a native component stored in a shared library.
- */
-published service SharedLibrary
-{
+/**
+ Allows to access a native component stored in a shared library.
- /** is used for writing persistent information in the registry for
+ Is used for writing persistent information in the registry for
an external implementation and for activating this
implementation.
- */
- interface XImplementationLoader;
-
-
- /** gives information about other supported services
- */
- interface com::sun::star::lang::XServiceInfo;
-};
+*/
+published service SharedLibrary : XImplementationLoader;
}; }; }; }; //module com.sun.star.loader
More information about the Libreoffice-commits
mailing list