[Libreoffice-commits] .: 2 commits - odk/pack odk/util offapi/com offapi/type_reference offapi/UnoApi_offapi.mk uui/util

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Nov 29 05:08:41 PST 2012


 odk/pack/gendocu/uno/package-list                     |    2 
 odk/util/check.pl                                     |    2 
 offapi/UnoApi_offapi.mk                               |   20 -----
 offapi/com/sun/star/modules.idl                       |   12 ---
 offapi/com/sun/star/sync/FilterData.idl               |   33 --------
 offapi/com/sun/star/sync/SyncAction.idl               |   53 -------------
 offapi/com/sun/star/sync/SyncCollector.idl            |   39 ----------
 offapi/com/sun/star/sync/SyncElement.idl              |   58 --------------
 offapi/com/sun/star/sync/SyncEvent.idl                |   47 ------------
 offapi/com/sun/star/sync/SyncInfo.idl                 |   49 ------------
 offapi/com/sun/star/sync/SyncMode.idl                 |   45 -----------
 offapi/com/sun/star/sync/SyncOptions.idl              |   51 -------------
 offapi/com/sun/star/sync/SyncScheme.idl               |   47 ------------
 offapi/com/sun/star/sync/SyncType.idl                 |   50 ------------
 offapi/com/sun/star/sync/Synchronizer.idl             |   39 ----------
 offapi/com/sun/star/sync/XSyncCollector.idl           |   70 ------------------
 offapi/com/sun/star/sync/XSynchronizer.idl            |   49 ------------
 offapi/com/sun/star/sync2/BadPartnershipException.idl |   44 -----------
 offapi/com/sun/star/task/InteractionHandler.idl       |    1 
 offapi/type_reference/types.rdb                       |binary
 uui/util/uui.xml                                      |    1 
 21 files changed, 712 deletions(-)

New commits:
commit ee929741fe528399e9c1abb075d109f2aacc66c7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 29 13:53:12 2012 +0100

    API CHANGE: remove com.sun.star.sync/sync2 modules
    
    The modules were entirely deprecated 10 years ago, and there is no
    implementation for any of it.
    
    WARNING: could not open key "/UCR/com/sun/star/sync/FilterData" in
    registry "/master/offapi/type_reference/types.rdb"
    EXISTENCE: module "/UCR/com/sun/star/sync" with published children
    exists only in registry 1
    WARNING: could not open key
    "/UCR/com/sun/star/sync2/BadPartnershipException" in registry
    "/master/offapi/type_reference/types.rdb"
    EXISTENCE: module "/UCR/com/sun/star/sync2" with published children
    exists only in registry 1
    
    Change-Id: I58bf7737ac00a6ecb905f59fb389b31376dff2cf

diff --git a/odk/pack/gendocu/uno/package-list b/odk/pack/gendocu/uno/package-list
index dacdca9..c3f32ac 100644
--- a/odk/pack/gendocu/uno/package-list
+++ b/odk/pack/gendocu/uno/package-list
@@ -35,8 +35,6 @@ com.sun.star.sheet
 com.sun.star.stoc
 com.sun.star.style
 com.sun.star.svg
-com.sun.star.sync
-com.sun.star.sync2
 com.sun.star.system
 com.sun.star.table
 com.sun.star.task
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 5a1e124..aced8f0 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -308,8 +308,6 @@ if (-d "$StartDir") {
                 "smarttags",
                 "style",
                 "svg",
-                "sync",
-                "sync2",
                 "system",
                 "table",
                 "task",
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 0f2d7e2..e671800 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1180,10 +1180,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/style,\
 	StyleFamilies \
 	StyleFamily \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/sync,\
-	SyncCollector \
-	Synchronizer \
-))
 $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/system,\
 	SOffice52ProxySettings \
 	SystemProxySettings \
@@ -3479,22 +3475,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/svg,\
 	XSVGPrinter \
 	XSVGWriter \
 ))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync,\
-	FilterData \
-	SyncAction \
-	SyncElement \
-	SyncEvent \
-	SyncInfo \
-	SyncMode \
-	SyncOptions \
-	SyncScheme \
-	SyncType \
-	XSyncCollector \
-	XSynchronizer \
-))
-$(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/sync2,\
-	BadPartnershipException \
-))
 $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/system,\
 	SimpleMailClientFlags \
 	SystemShellExecuteException \
diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index e8eec3f..d03318e 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -151,12 +151,6 @@ module style {};
 /// Interfaces for import/export of Scaleable Vector Format.
 module svg {};
 
-/// Data synchronization interfaces (deprecated).
-module sync {};
-
-/// Data synchronization interfaces (deprecated).
-module sync2 {};
-
 /// Table specific interfaces (for text and spreadsheet).
 module table {};
 
diff --git a/offapi/com/sun/star/sync/FilterData.idl b/offapi/com/sun/star/sync/FilterData.idl
deleted file mode 100644
index 1d5b62a..0000000
--- a/offapi/com/sun/star/sync/FilterData.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_FilterData_idl__
-#define __com_sun_star_sync_FilterData_idl__
-
-
-module com {  module sun {  module star {  module sync {
-
-published typedef sequence< string > FilterData;
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncAction.idl b/offapi/com/sun/star/sync/SyncAction.idl
deleted file mode 100644
index c634c4e..0000000
--- a/offapi/com/sun/star/sync/SyncAction.idl
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncAction_idl__
-#define __com_sun_star_sync_SyncAction_idl__
-
-
-module com {  module sun {  module star {  module sync {
-
-
-/** contains a synchronization element
-
-    @deprecated
- */
-published constants SyncAction
-{
-    const unsigned long NONE                    = 0x00000000;
-
-    const unsigned long COPY_TO_SERVER          = 0x00000001;
-
-    const unsigned long COPY_TO_CLIENT          = 0x00000002;
-
-    const unsigned long REMOVE_FROM_CLIENT      = 0x00000100;
-
-    const unsigned long REMOVE_FROM_SERVER      = 0x00000200;
-
-    const unsigned long CONFLICT_UID            = 0x01000000;
-
-    const unsigned long CONFLICT_AMBIGUITY      = 0x02000000;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncCollector.idl b/offapi/com/sun/star/sync/SyncCollector.idl
deleted file mode 100644
index a0bb940..0000000
--- a/offapi/com/sun/star/sync/SyncCollector.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncCollector_idl__
-#define __com_sun_star_sync_SyncCollector_idl__
-
-#include <com/sun/star/sync/XSyncCollector.idl>
-
-
-module com {  module sun {  module star {  module sync {
-
-/// @deprecated
-published service SyncCollector
-{
-    interface com::sun::star::sync::XSyncCollector;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncElement.idl b/offapi/com/sun/star/sync/SyncElement.idl
deleted file mode 100644
index 4b063f0..0000000
--- a/offapi/com/sun/star/sync/SyncElement.idl
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncElement_idl__
-#define __com_sun_star_sync_SyncElement_idl__
-
-
-module com {  module sun {  module star {  module sync {
-
-
-/** contains a synchronization element
-
-    @deprecated
- */
-published struct SyncElement
-{
-    /** contains the ContentIdentifier of this synchronization element
-     */
-    string ContentIdentifier;
-
-
-    unsigned long Type;
-
-
-    unsigned long UID;
-
-
-    unsigned long Generation;
-
-
-    unsigned long Event;
-
-
-    unsigned long Action;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncEvent.idl b/offapi/com/sun/star/sync/SyncEvent.idl
deleted file mode 100644
index 87f1a60..0000000
--- a/offapi/com/sun/star/sync/SyncEvent.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncEvent_idl__
-#define __com_sun_star_sync_SyncEvent_idl__
-
-
-module com {  module sun {  module star {  module sync {
-
-
-/** contains a synchronization element
-
-    @deprecated
- */
-published constants SyncEvent
-{
-    const unsigned long NONE = 0;
-
-    const unsigned long CREATED = 1;
-
-    const unsigned long DELETED = 2;
-
-    const unsigned long CHANGED = 3;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncInfo.idl b/offapi/com/sun/star/sync/SyncInfo.idl
deleted file mode 100644
index fc4c975..0000000
--- a/offapi/com/sun/star/sync/SyncInfo.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncInfo_idl__
-#define __com_sun_star_sync_SyncInfo_idl__
-
-#include <com/sun/star/sync/SyncScheme.idl>
-#include <com/sun/star/sync/FilterData.idl>
-
-
-module com {  module sun {  module star {  module sync {
-
-
-/// @deprecated
-published struct SyncInfo
-{
-    SyncScheme      ServerScheme;
-
-    SyncScheme      ClientScheme;
-
-    FilterData      SyncFilter;
-
-    unsigned long   SyncMode;
-
-    unsigned long   SyncOptions;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncMode.idl b/offapi/com/sun/star/sync/SyncMode.idl
deleted file mode 100644
index 947c29e..0000000
--- a/offapi/com/sun/star/sync/SyncMode.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncMode_idl__
-#define __com_sun_star_sync_SyncMode_idl__
-
-
- module com {  module sun {  module star {  module sync {
-
-
-/** contains a synchronization element
-
-    @deprecated
- */
-published constants SyncMode
-{
-    const unsigned long NONE                = 0x00000000;
-
-    const unsigned long CLIENT_TO_SERVER    = 0x00000001;
-
-    const unsigned long SERVER_TO_CLIENT    = 0x00000002;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncOptions.idl b/offapi/com/sun/star/sync/SyncOptions.idl
deleted file mode 100644
index 1031813..0000000
--- a/offapi/com/sun/star/sync/SyncOptions.idl
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncOptions_idl__
-#define __com_sun_star_sync_SyncOptions_idl__
-
-
-module com {  module sun {  module star {  module sync {
-
-
-/** contains a synchronization element
-
-    @deprecated
- */
-published constants SyncOptions
-{
-    const unsigned long NONE            = 0x00000000;
-
-    const unsigned long DONT_COPY       = 0x00000001;
-
-    const unsigned long DONT_REMOVE     = 0x00000002;
-
-    const unsigned long SERVER_WINS     = 0x00000100;
-
-    const unsigned long CLIENT_WINS     = 0x00000200;
-
-    const unsigned long CREATE_BACKUP   = 0x00010000;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncScheme.idl b/offapi/com/sun/star/sync/SyncScheme.idl
deleted file mode 100644
index 16811d3..0000000
--- a/offapi/com/sun/star/sync/SyncScheme.idl
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncScheme_idl__
-#define __com_sun_star_sync_SyncScheme_idl__
-
-
- module com {  module sun {  module star {  module sync {
-
-/** contains the scheme name of this SyncScheme
-
-    @deprecated
- */
-published struct SyncScheme
-{
-    /** contains the scheme name of this SyncScheme
-     */
-    string Scheme;
-
-
-    /** contains the root for this SyncScheme
-     */
-    string Root;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/SyncType.idl b/offapi/com/sun/star/sync/SyncType.idl
deleted file mode 100644
index 3190c72..0000000
--- a/offapi/com/sun/star/sync/SyncType.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_SyncType_idl__
-#define __com_sun_star_sync_SyncType_idl__
-
-
-module com {  module sun {  module star {  module sync {
-
-
-/// @deprecated
-published constants SyncType
-{
-    const unsigned long NONE = 0;
-
-    const unsigned long FILE = 1;
-
-    const unsigned long FOLDER = 2;
-
-    const unsigned long VFS_FILE = 3;
-
-    const unsigned long VFS_FOLDER = 4;
-
-    const unsigned long POP3 = 5;
-
-    const unsigned long IMAP = 6;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/Synchronizer.idl b/offapi/com/sun/star/sync/Synchronizer.idl
deleted file mode 100644
index 3ee2a4d..0000000
--- a/offapi/com/sun/star/sync/Synchronizer.idl
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_Synchronizer_idl__
-#define __com_sun_star_sync_Synchronizer_idl__
-
-#include <com/sun/star/sync/XSynchronizer.idl>
-
-
-module com {  module sun {  module star {  module sync {
-
-/// @deprecated
-published service Synchronizer
-{
-    interface com::sun::star::sync::XSynchronizer;
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/XSyncCollector.idl b/offapi/com/sun/star/sync/XSyncCollector.idl
deleted file mode 100644
index c45391e..0000000
--- a/offapi/com/sun/star/sync/XSyncCollector.idl
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_XSyncCollector_idl__
-#define __com_sun_star_sync_XSyncCollector_idl__
-
-#include <com/sun/star/ucb/XContentProviderManager.idl>
-#include <com/sun/star/ucb/XContent.idl>
-#include <com/sun/star/sync/SyncScheme.idl>
-#include <com/sun/star/sync/SyncInfo.idl>
-#include <com/sun/star/sync/SyncElement.idl>
-
-
-module com {  module sun {  module star {  module sync {
-
-/// @deprecated
-published interface XSyncCollector: com::sun::star::uno::XInterface
-{
-    boolean                                         initialize( [in] com::sun::star::ucb::XContentProviderManager xMgr,
-                                                                [in] sequence<com::sun::star::sync::SyncScheme> aSyncSchemes,
-                                                                [in] string aBaseFileName );
-
-    sequence<com::sun::star::sync::SyncScheme>      getRegisteredSyncSchemes();
-
-    sequence<com::sun::star::sync::SyncElement>     getSyncSequence( [in] string aSyncSchemeName,
-                                                                     [in] com::sun::star::sync::SyncInfo aSyncInfo );
-
-    [oneway] void                                   beginSynchronize();
-
-    [oneway] void                                   endSynchronize();
-
-    boolean                                         getCorrespondingElement( [in] com::sun::star::sync::SyncScheme aSyncSchemeIn,
-                                                                             [in] com::sun::star::sync::SyncElement aSyncElementIn,
-                                                                             [out] com::sun::star::sync::SyncElement aSyncElementOut );
-
-    boolean                                         executeElementCommand( [in] string aSyncSchemeName,
-                                                                           [in] com::sun::star::sync::SyncElement aSyncElement,
-                                                                            [in] string aCommandName,
-                                                                           [out] any aAny );
-
-    [oneway] void                                   elementSynchronized( [in] string aSyncSchemeName,
-                                                                         [in] com::sun::star::sync::SyncElement aSyncElement,
-                                                                         [in] unsigned long nSyncAction );
-
-    [oneway] void                                   notify( [in] com::sun::star::ucb::XContent XCnt,
-                                                            [in] unsigned long nEvent );
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync/XSynchronizer.idl b/offapi/com/sun/star/sync/XSynchronizer.idl
deleted file mode 100644
index 720cf25..0000000
--- a/offapi/com/sun/star/sync/XSynchronizer.idl
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync_XSynchronizer_idl__
-#define __com_sun_star_sync_XSynchronizer_idl__
-
-#include <com/sun/star/sync/XSyncCollector.idl>
-#include <com/sun/star/sync/SyncInfo.idl>
-
-
-module com {  module sun {  module star {  module sync {
-
-/// @deprecated
-published interface XSynchronizer: com::sun::star::uno::XInterface
-{
-    boolean                                         beginSynchronize( [in] com::sun::star::sync::XSyncCollector xClientCollector,
-                                                                      [in] com::sun::star::sync::XSyncCollector xServerCollector,
-                                                                      [in] string aSchemeName, [in] FilterData aFilterData,
-                                                                      [in] unsigned long nSyncMode, [in] unsigned long nSyncOptions );
-
-    boolean                                         getSyncList( [out] sequence<com::sun::star::sync::SyncElement> aSyncSeq );
-
-    boolean                                         performSync( [in] sequence<com::sun::star::sync::SyncElement> aSyncSeq );
-
-    boolean                                         endSynchronize();
-};
-
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/sync2/BadPartnershipException.idl b/offapi/com/sun/star/sync2/BadPartnershipException.idl
deleted file mode 100644
index e3a46e5..0000000
--- a/offapi/com/sun/star/sync2/BadPartnershipException.idl
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef __com_sun_star_sync2_BadPartnershipException_idl__
-#define __com_sun_star_sync2_BadPartnershipException_idl__
-
-#include <com/sun/star/uno/Exception.idl>
-
-module com { module sun { module star { module sync2 {
-
-/** indicates that a partnership does not exist, or that there are problems
-    accessing the partnership state.
-
-    @deprecated
- */
-published exception BadPartnershipException: com::sun::star::uno::Exception
-{
-    /** contains the name of the partnership, or is left empty if this is
-        unknown.
-     */
-    string Partnership;
-};
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/task/InteractionHandler.idl b/offapi/com/sun/star/task/InteractionHandler.idl
index 74e7323..c105a90 100644
--- a/offapi/com/sun/star/task/InteractionHandler.idl
+++ b/offapi/com/sun/star/task/InteractionHandler.idl
@@ -39,7 +39,6 @@ module com { module sun { module star { module task {
     <UL>
         <LI><type scope="com::sun::star::ucb">AuthenticationRequest</type></LI>
         <LI><type scope="com::sun::star::ucb">CertificateValidationRequest</type></LI>
-        <LI><type scope="com::sun::star::sync2">BadPartnershipException</type>*</LI>
         <LI><type scope="com::sun::star::ucb">HandleCookiesRequest</type></LI>
         <LI><type scope="com::sun::star::ucb">InteractiveAugmentedIOException</type>*</LI>
         <LI><type scope="com::sun::star::ucb">InteractiveCHAOSException</type>*</LI>
diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb
index 9348ade..e792d99 100644
Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ
diff --git a/uui/util/uui.xml b/uui/util/uui.xml
index 7ae4119..7c12cfc 100644
--- a/uui/util/uui.xml
+++ b/uui/util/uui.xml
@@ -58,7 +58,6 @@
     <type>com.sun.star.lang.XServiceInfo</type>
     <type>com.sun.star.lang.XTypeProvider</type>
     <type>com.sun.star.registry.XRegistryKey</type>
-    <type>com.sun.star.sync2.BadPartnershipException</type>
     <type>com.sun.star.task.InteractionClassification</type>
     <type>com.sun.star.task.NoMasterException</type>
     <type>com.sun.star.task.PasswordRequest</type>
commit 0d3a25c8dd8c47e72dc1b241480280ace745dd94
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 29 13:35:59 2012 +0100

    offapi: remove empty modules "test" and "pgp"
    
    Change-Id: I52f92b8293a6a09d494f1ce2e067d5cfcc217c31

diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl
index c541d06..e8eec3f 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -115,9 +115,6 @@ module media {};
 /// Interfaces for Mozilla integration.
 module mozilla {};
 
-/// Pretty Good Privacy (deprecated).
-module pgp {};
-
 /// Netscape-like plugin interfaces.
 module plugin {};
 
@@ -166,9 +163,6 @@ module table {};
 /// Task management interfaces.
 module task {};
 
-/// Test interfaces for core-reflection, introspection and marshalling.
-module test {};
-
 /// Text specific interfaces.
 module text {};
 


More information about the Libreoffice-commits mailing list