Author: damjan
Date: Tue Feb 23 00:53:23 2016
New Revision: 1731769
URL: http://svn.apache.org/viewvc?rev=1731769&view=rev
Log:
gbuild seems to need each declaration in its own IDL file; sc build breaks
without it.
Patch by: me
Added:
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamedEx.idl
Modified:
openoffice/branches/gbuild-reintegration/main/udkapi/UnoApi_udkapi.mk
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamed.idl
Modified: openoffice/branches/gbuild-reintegration/main/udkapi/UnoApi_udkapi.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/udkapi/UnoApi_udkapi.mk?rev=1731769&r1=1731768&r2=1731769&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/udkapi/UnoApi_udkapi.mk
(original)
+++ openoffice/branches/gbuild-reintegration/main/udkapi/UnoApi_udkapi.mk Tue
Feb 23 00:53:23 2016
@@ -227,6 +227,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfil
udkapi/com/sun/star/container/XNameContainer \
udkapi/com/sun/star/container/XNameReplace \
udkapi/com/sun/star/container/XNamed \
+ udkapi/com/sun/star/container/XNamedEx \
udkapi/com/sun/star/container/XSet \
udkapi/com/sun/star/container/XStringKeyMap \
udkapi/com/sun/star/container/XUniqueIDAccess \
Modified:
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamed.idl
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamed.idl?rev=1731769&r1=1731768&r2=1731769&view=diff
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamed.idl
(original)
+++
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamed.idl
Tue Feb 23 00:53:23 2016
@@ -56,27 +56,6 @@ published interface XNamed: com::sun::st
//=============================================================================
-/** specifies the display name of the object.
-
- <p>The name is generally unique in the container of the object.</p>
- */
-published interface XNamedEx: XNamed
-{
-
//-------------------------------------------------------------------------
-
- /** @returns
- the display name of the object.
- */
- string getDisplayName();
-
-
//-------------------------------------------------------------------------
-
- /** sets the display name of the object.
- */
- [oneway] void setDisplayName( [in] string aName );
-
-};
-
}; }; }; };
#endif
Added:
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamedEx.idl
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamedEx.idl?rev=1731769&view=auto
==============================================================================
---
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamedEx.idl
(added)
+++
openoffice/branches/gbuild-reintegration/main/udkapi/com/sun/star/container/XNamedEx.idl
Tue Feb 23 00:53:23 2016
@@ -0,0 +1,64 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+#ifndef __com_sun_star_container_XNamedEx_idl__
+#define __com_sun_star_container_XNamedEx_idl__
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_container_XNamed_idl__
+#include <com/sun/star/container/XNamed.idl>
+
+//=============================================================================
+
+module com { module sun { module star { module container {
+
+//=============================================================================
+
+/** specifies the display name of the object.
+
+ <p>The name is generally unique in the container of the object.</p>
+ */
+published interface XNamedEx: XNamed
+{
+
//-------------------------------------------------------------------------
+
+ /** @returns
+ the display name of the object.
+ */
+ string getDisplayName();
+
+
//-------------------------------------------------------------------------
+
+ /** sets the display name of the object.
+ */
+ [oneway] void setDisplayName( [in] string aName );
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
