[Libreoffice-commits] .: 24 commits - offapi/com
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 7 12:01:44 PST 2012
offapi/com/sun/star/animations/TargetPropertiesCreator.idl | 38 ++++------
offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl | 38 ++++------
offapi/com/sun/star/drawing/CanvasFeature.idl | 43 ++++--------
offapi/com/sun/star/drawing/XSlidePreviewCache.idl | 1
offapi/com/sun/star/drawing/XSlidePreviewCacheListener.idl | 45 ++++---------
offapi/com/sun/star/frame/UntitledNumbersConst.idl | 44 +++++-------
offapi/com/sun/star/inspection/StringRepresentation.idl | 43 ++++--------
offapi/com/sun/star/presentation/SlideShow.idl | 44 +++++-------
offapi/com/sun/star/presentation/TransitionFactory.idl | 44 +++++-------
offapi/com/sun/star/rendering/ARGBColor.idl | 1
offapi/com/sun/star/rendering/BitmapCanvas.idl | 44 +++++-------
offapi/com/sun/star/rendering/Canvas.idl | 44 +++++-------
offapi/com/sun/star/rendering/Color.idl | 44 +++++-------
offapi/com/sun/star/rendering/ColorComponent.idl | 43 ++++--------
offapi/com/sun/star/rendering/RGBColor.idl | 44 +++++-------
offapi/com/sun/star/rendering/XCanvas.idl | 12 +--
offapi/com/sun/star/report/FormatCondition.idl | 44 +++++-------
offapi/com/sun/star/report/FormattedField.idl | 38 ++++------
offapi/com/sun/star/report/Function.idl | 44 +++++-------
offapi/com/sun/star/report/Group.idl | 44 +++++-------
offapi/com/sun/star/report/ImageControl.idl | 38 ++++------
offapi/com/sun/star/report/ReportControlModel.idl | 38 ++++------
offapi/com/sun/star/report/ReportDefinition.idl | 38 ++++------
offapi/com/sun/star/util/SearchFlags.idl | 37 ++++------
offapi/com/sun/star/util/SearchOptions.idl | 37 ++++------
offapi/com/sun/star/util/SearchResult.idl | 43 ++++--------
offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl | 43 ++++--------
27 files changed, 406 insertions(+), 610 deletions(-)
New commits:
commit e06c6c4cfc55a95ca6a340ac8527fe2d61b3f003
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:30:58 2012 -0600
split idl with multiple class into one idl per.
Change-Id: Id0b8be359dc6f9cc24aa784ab34b066928ad17bd
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
new file mode 100644
index 0000000..8c13371
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
@@ -0,0 +1,57 @@
+/* -*- 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 .
+ */
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
+#define __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * Defines priority for the element mark's notification.
+ * <p>
+ * The PRI_MINIMUM priority is a value less than any practical
+ * priority value, it is used when compare between different
+ * priority values.
+ * <p>
+ * The PRI_AFTERMODIFY priority represents the notification will be
+ * sent after any internal modification has finished.
+ * <p>
+ * The PRI_BEFOREMODIFY proirity represents the notification will be
+ * sent before any internal modification happens.
+ * <p>
+ * So an element mark with PRI_BEFOREMODIFY will be handled first,
+ * and one with PRI_AFTERMODIFY will be handled at last.
+ */
+enum ElementMarkPriority
+{
+ MINIMUM = 1,
+ AFTERMODIFY,
+ BEFOREMODIFY
+};
+
+} ; } ; } ; } ; } ; } ;
+
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
new file mode 100644
index 0000000..9a1bb82
--- /dev/null
+++ b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
@@ -0,0 +1,46 @@
+/* -*- 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 .
+ */
+
+//i20156 - new file for xmlsecurity module
+
+/** -- idl definition -- **/
+
+#ifndef __com_sun_star_xml_crypto_sax_elementmarktype_idl_
+#define __com_sun_star_xml_crypto_sax_elementmarktype_idl_
+
+module com { module sun { module star { module xml { module crypto { module sax {
+
+/**
+ * Defines types of element mark.
+ * <p>
+ * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
+ * type represents a element collector.
+ */
+enum ElementMarkType
+{
+ ELEMENTMARK = 1,
+ ELEMENTCOLLECTOR
+};
+
+
+} ; } ; } ; } ; } ; } ;
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index 493eabf..855397d 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -16,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
-//i20156 - new file for xmlsecurity module
+//i20156 - new file for XML security module
/** -- idl definition -- **/
@@ -27,53 +27,13 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
+#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
+#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
module com { module sun { module star { module xml { module crypto { module sax {
/**
- * Represents the undefined security id
- */
-constants ConstOfSecurityId
-{
- const long UNDEFINEDSECURITYID = -1;
-};
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
- MINIMUM = 1,
- AFTERMODIFY,
- BEFOREMODIFY
-};
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
- ELEMENTMARK = 1,
- ELEMENTCOLLECTOR
-};
-
-/**
* Interface of Security SAX Event Keeper.
* <p>
* This interface is an extension of the XSAXEventKeeper interface,
@@ -123,3 +83,4 @@ interface XSecuritySAXEventKeeper : XSAXEventKeeper
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 4eaac3770982c5072891fa9dd47d9b4a8bc01507
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:27:32 2012 -0600
rebase XSecuritySAXEventKeeper
Change-Id: I7ca3461ece4a18cdc9642ba02d18d53a7fdbc576
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
deleted file mode 100644
index 8c13371..0000000
--- a/offapi/com/sun/star/xml/crypto/sax/ElementMarkPriority.idl
+++ /dev/null
@@ -1,57 +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 .
- */
-
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
-
-#ifndef __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
-#define __com_sun_star_xml_crypto_sax_elementmarkpriority_idl_
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Defines priority for the element mark's notification.
- * <p>
- * The PRI_MINIMUM priority is a value less than any practical
- * priority value, it is used when compare between different
- * priority values.
- * <p>
- * The PRI_AFTERMODIFY priority represents the notification will be
- * sent after any internal modification has finished.
- * <p>
- * The PRI_BEFOREMODIFY proirity represents the notification will be
- * sent before any internal modification happens.
- * <p>
- * So an element mark with PRI_BEFOREMODIFY will be handled first,
- * and one with PRI_AFTERMODIFY will be handled at last.
- */
-enum ElementMarkPriority
-{
- MINIMUM = 1,
- AFTERMODIFY,
- BEFOREMODIFY
-};
-
-} ; } ; } ; } ; } ; } ;
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl b/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
deleted file mode 100644
index 7ae935c..0000000
--- a/offapi/com/sun/star/xml/crypto/sax/ElementMarkType.idl
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-//i20156 - new file for xmlsecurity module
-
-/** -- idl definition -- **/
-
-#ifndef __com_sun_star_xml_crypto_sax_elementmarktype_idl_
-#define __com_sun_star_xml_crypto_sax_elementmarktype_idl_
-
-module com { module sun { module star { module xml { module crypto { module sax {
-
-/**
- * Defines types of element mark.
- * <p>
- * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
- * type represents a element collector.
- */
-enum ElementMarkType
-{
- ELEMENTMARK = 1,
- ELEMENTCOLLECTOR
-};
-
-
-} ; } ; } ; } ; } ; } ;
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
index 855397d..493eabf 100644
--- a/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
+++ b/offapi/com/sun/star/xml/crypto/sax/XSecuritySAXEventKeeper.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -17,7 +16,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-//i20156 - new file for XML security module
+
+//i20156 - new file for xmlsecurity module
/** -- idl definition -- **/
@@ -27,13 +27,53 @@
#include <com/sun/star/uno/XInterface.idl>
#include <com/sun/star/uno/Exception.idl>
#include <com/sun/star/xml/crypto/sax/XSAXEventKeeper.idl>
-#include <com/sun/star/xml/crypto/sax/ConstOfSecurityId.idl>
-#include <com/sun/star/xml/crypto/sax/ElementMarkPriority.idl>
-#include <com/sun/star/xml/crypto/sax/ElementMarkType.idl>
module com { module sun { module star { module xml { module crypto { module sax {
/**
+ * Represents the undefined security id
+ */
+constants ConstOfSecurityId
+{
+ const long UNDEFINEDSECURITYID = -1;
+};
+
+/**
+ * Defines priority for the element mark's notification.
+ * <p>
+ * The PRI_MINIMUM priority is a value less than any practical
+ * priority value, it is used when compare between different
+ * priority values.
+ * <p>
+ * The PRI_AFTERMODIFY priority represents the notification will be
+ * sent after any internal modification has finished.
+ * <p>
+ * The PRI_BEFOREMODIFY proirity represents the notification will be
+ * sent before any internal modification happens.
+ * <p>
+ * So an element mark with PRI_BEFOREMODIFY will be handled first,
+ * and one with PRI_AFTERMODIFY will be handled at last.
+ */
+enum ElementMarkPriority
+{
+ MINIMUM = 1,
+ AFTERMODIFY,
+ BEFOREMODIFY
+};
+
+/**
+ * Defines types of element mark.
+ * <p>
+ * the TYPEOFELEMENTMARK type represents a blocker, and the TYPEOFELEMENTCOLLECTOR
+ * type represents a element collector.
+ */
+enum ElementMarkType
+{
+ ELEMENTMARK = 1,
+ ELEMENTCOLLECTOR
+};
+
+/**
* Interface of Security SAX Event Keeper.
* <p>
* This interface is an extension of the XSAXEventKeeper interface,
@@ -83,4 +123,3 @@ interface XSecuritySAXEventKeeper : XSAXEventKeeper
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 7b1d2ccee8cf7d9804c037f1e24184625a2c8a51
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:24:33 2012 -0600
split idl with multiple class into one idl per.
Change-Id: I7f6de24d77b8032f1fb0383685379b276daa14d8
diff --git a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
new file mode 100644
index 0000000..2a34af2
--- /dev/null
+++ b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
@@ -0,0 +1,38 @@
+/* -*- 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_report_DatabaseDataProvider_idl__
+#define __com_sun_star_report_DatabaseDataProvider_idl__
+
+#include <com/sun/star/chart2/data/XDatabaseDataProvider.idl>
+
+
+ module com { module sun { module star { module chart2 { module data {
+
+
+service DatabaseDataProvider : XDatabaseDataProvider
+{
+ createWithConnection([in] com::sun::star::sdbc::XConnection connection);
+};
+
+ }; }; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index 57a4f41..9e625d9 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -15,13 +16,10 @@
* 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_report_XDatabaseDataProvider_idl__
#define __com_sun_star_report_XDatabaseDataProvider_idl__
-#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
-#endif
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/beans/UnknownPropertyException.idl>
#include <com/sun/star/lang/XInitialization.idl>
@@ -32,11 +30,9 @@
#include <com/sun/star/chart2/data/XDataProvider.idl>
#include <com/sun/star/chart2/data/XRangeXMLConversion.idl>
-//=============================================================================
module com { module sun { module star { module chart2 { module data {
-//=============================================================================
/** identifies a <type>XDataProvider</type> for result sets.
@@ -84,7 +80,7 @@ interface XDatabaseDataProvider
/**is used for subreports and contains the names of the columns of the subreport
which are related to the master fields of the parent report.
<p>Entries in this sequence can either denote column names in the sub report,
- or paramater names.<br/>
+ or parameter names.<br/>
For instance, you could base the report on the SQL statement
<code>SELECT * FROM invoices WHERE cust_ref = :cid</code>, and add <code>cid</code>
to the DetailFields property. In this case, the parameter will be filled from
@@ -96,7 +92,7 @@ interface XDatabaseDataProvider
master field.<br/>
If a string in this property denotes both a column name and a parameter name, it
is undefined which way it is interpreted, but implementations of the service are required
- to either decide for the paramter or the column, and proceed as usual.
+ to either decide for the parameter or the column, and proceed as usual.
</p>
<p>The columns specified herein typically represent a part of the primary key
fields or their aliases of the detail report.</p>
@@ -127,14 +123,14 @@ interface XDatabaseDataProvider
<p><member>Command</member> needs to be interpreted depending on the value of this property.</p>
- <p>This property is only meaningfull together with the <member>Command</member>
+ <p>This property is only meaningful together with the <member>Command</member>
property, thus either <em>both</em> or <em>none</em> of them are present.</p>
@see com::sun::star::sdb::CommandType
*/
[attribute,bound] long CommandType;
- /** specifies an addtional filter to optinally use.
+ /** specifies an additional filter to optionally use.
<p>The Filter string has to form a SQL WHERE-clause, <em>without</em> the WHERE-string itself.</p>
@@ -169,7 +165,7 @@ interface XDatabaseDataProvider
set raises (com::sun::star::beans::UnknownPropertyException);
};
- /** is a additional sort order definition for a rowset.
+ /** is a additional sort order definition for a row set.
*/
[attribute,bound] string Order;
@@ -196,21 +192,15 @@ interface XDatabaseDataProvider
{
set raises (com::sun::star::lang::IllegalArgumentException);
};
- /** is the name of the datasource to use, this could be a named datasource
+ /** is the name of the data source to use, this could be a named data source
or the URL of a data access component.
*/
[attribute,bound] string DataSourceName;
};
-service DatabaseDataProvider : XDatabaseDataProvider
-{
- createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
-//=============================================================================
}; }; }; }; };
-/*=============================================================================
-
-=============================================================================*/
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0a078b50d49fe3fd70e9a5d81e329f625b55c448
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:23:26 2012 -0600
rebase XDatabaseDataProvider
Change-Id: Iacb4b5f52eae6b434a2f95d497995dfae400fc9b
diff --git a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
deleted file mode 100644
index 95dff79..0000000
--- a/offapi/com/sun/star/chart2/data/DatabaseDataProvider.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_report_DatabaseDataProvider_idl__
-#define __com_sun_star_report_DatabaseDataProvider_idl__
-
-#include <com/sun/star/chart2/data/XDatabaseDataProvider.idl>
-
-
- module com { module sun { module star { module chart2 { module data {
-
-
-service DatabaseDataProvider : XDatabaseDataProvider
-{
- createWithConnection([in] com::sun::star::sdbc::XConnection connection);
-};
-
- }; }; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index 9e625d9..57a4f41 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -16,10 +15,13 @@
* 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_report_XDatabaseDataProvider_idl__
#define __com_sun_star_report_XDatabaseDataProvider_idl__
+#ifndef __com_sun_star_container_NoSuchElementException_idl__
#include <com/sun/star/container/NoSuchElementException.idl>
+#endif
#include <com/sun/star/beans/XPropertySet.idl>
#include <com/sun/star/beans/UnknownPropertyException.idl>
#include <com/sun/star/lang/XInitialization.idl>
@@ -30,9 +32,11 @@
#include <com/sun/star/chart2/data/XDataProvider.idl>
#include <com/sun/star/chart2/data/XRangeXMLConversion.idl>
+//=============================================================================
module com { module sun { module star { module chart2 { module data {
+//=============================================================================
/** identifies a <type>XDataProvider</type> for result sets.
@@ -80,7 +84,7 @@ interface XDatabaseDataProvider
/**is used for subreports and contains the names of the columns of the subreport
which are related to the master fields of the parent report.
<p>Entries in this sequence can either denote column names in the sub report,
- or parameter names.<br/>
+ or paramater names.<br/>
For instance, you could base the report on the SQL statement
<code>SELECT * FROM invoices WHERE cust_ref = :cid</code>, and add <code>cid</code>
to the DetailFields property. In this case, the parameter will be filled from
@@ -92,7 +96,7 @@ interface XDatabaseDataProvider
master field.<br/>
If a string in this property denotes both a column name and a parameter name, it
is undefined which way it is interpreted, but implementations of the service are required
- to either decide for the parameter or the column, and proceed as usual.
+ to either decide for the paramter or the column, and proceed as usual.
</p>
<p>The columns specified herein typically represent a part of the primary key
fields or their aliases of the detail report.</p>
@@ -123,14 +127,14 @@ interface XDatabaseDataProvider
<p><member>Command</member> needs to be interpreted depending on the value of this property.</p>
- <p>This property is only meaningful together with the <member>Command</member>
+ <p>This property is only meaningfull together with the <member>Command</member>
property, thus either <em>both</em> or <em>none</em> of them are present.</p>
@see com::sun::star::sdb::CommandType
*/
[attribute,bound] long CommandType;
- /** specifies an additional filter to optionally use.
+ /** specifies an addtional filter to optinally use.
<p>The Filter string has to form a SQL WHERE-clause, <em>without</em> the WHERE-string itself.</p>
@@ -165,7 +169,7 @@ interface XDatabaseDataProvider
set raises (com::sun::star::beans::UnknownPropertyException);
};
- /** is a additional sort order definition for a row set.
+ /** is a additional sort order definition for a rowset.
*/
[attribute,bound] string Order;
@@ -192,15 +196,21 @@ interface XDatabaseDataProvider
{
set raises (com::sun::star::lang::IllegalArgumentException);
};
- /** is the name of the data source to use, this could be a named data source
+ /** is the name of the datasource to use, this could be a named datasource
or the URL of a data access component.
*/
[attribute,bound] string DataSourceName;
};
+service DatabaseDataProvider : XDatabaseDataProvider
+{
+ createWithConnection([in] com::sun::star::sdbc::XConnection connection);
+};
+//=============================================================================
}; }; }; }; };
-#endif
+/*=============================================================================
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+=============================================================================*/
+#endif
commit 7057666b5e85756b90034235639080a24885d04d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:21:23 2012 -0600
split idl with multiple class into one idl per.
Change-Id: I3a6cfc4214bd56b35a4778861f13cfeed6596a4c
diff --git a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
new file mode 100644
index 0000000..6f7169f
--- /dev/null
+++ b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
@@ -0,0 +1,37 @@
+/* -*- 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_animations_TargetPropertiesCreator_idl__
+#define __com_sun_star_animations_TargetPropertiesCreator_idl__
+
+#ifndef __com_sun_star_animations_TargetProperties_idl__
+#include <com/sun/star/animations/XTargetPropertiesCreator.idl>
+#endif
+
+
+ module com { module sun { module star { module animations {
+
+
+service TargetPropertiesCreator: XTargetPropertiesCreator;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
index 748e5e7..b5d782a 100644
--- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -15,23 +16,15 @@
* 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_animations_XTargetPropertiesCreator_idl__
#define __com_sun_star_animations_XTargetPropertiesCreator_idl__
-#ifndef __com_sun_star_animations_TargetProperties_idl__
#include <com/sun/star/animations/TargetProperties.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-//=============================================================================
module com { module sun { module star { module animations {
-//=============================================================================
/** Factory interface to generate properties for all animated targets.<p>
@@ -62,10 +55,9 @@ interface XTargetPropertiesCreator : ::com::sun::star::uno::XInterface
};
-//=============================================================================
-
-service TargetPropertiesCreator: XTargetPropertiesCreator;
}; }; }; };
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e8f250201de6c59cbb04331f92c9e08548a3002c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:20:03 2012 -0600
rebase XTargetPropertiesCreator
Change-Id: I0803be54f9626f8734f1e842661da99dc0f99615
diff --git a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl b/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
deleted file mode 100644
index b406aac..0000000
--- a/offapi/com/sun/star/animations/TargetPropertiesCreator.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_animations_TargetPropertiesCreator_idl__
-#define __com_sun_star_animations_TargetPropertiesCreator_idl__
-
-#ifndef __com_sun_star_animations_TargetProperties_idl__
-#include <com/sun/star/animations/XTargetPropertiesCreator.idl>
-#endif
-
-
- module com { module sun { module star { module animations {
-
-
-service TargetPropertiesCreator: XTargetPropertiesCreator;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
index b5d782a..748e5e7 100644
--- a/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
+++ b/offapi/com/sun/star/animations/XTargetPropertiesCreator.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -16,15 +15,23 @@
* 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_animations_XTargetPropertiesCreator_idl__
#define __com_sun_star_animations_XTargetPropertiesCreator_idl__
+#ifndef __com_sun_star_animations_TargetProperties_idl__
#include <com/sun/star/animations/TargetProperties.idl>
+#endif
+#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
+#endif
+//=============================================================================
module com { module sun { module star { module animations {
+//=============================================================================
/** Factory interface to generate properties for all animated targets.<p>
@@ -55,9 +62,10 @@ interface XTargetPropertiesCreator : ::com::sun::star::uno::XInterface
};
+//=============================================================================
+
+service TargetPropertiesCreator: XTargetPropertiesCreator;
}; }; }; };
#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d22ad824c27b5e26159ab04b169b56e0f3076d6e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:13:33 2012 -0600
split idl with multiple class into one idl per.
Change-Id: I5b23bd5ef9c2e2c15066f460bcb2628f479996e1
diff --git a/offapi/com/sun/star/drawing/CanvasFeature.idl b/offapi/com/sun/star/drawing/CanvasFeature.idl
new file mode 100644
index 0000000..2710bbd
--- /dev/null
+++ b/offapi/com/sun/star/drawing/CanvasFeature.idl
@@ -0,0 +1,37 @@
+/* -*- 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_drawing_CanvasFeature_idl__
+#define __com_sun_star_drawing_CanvasFeature_idl__
+
+module com { module sun { module star { module drawing {
+
+constants CanvasFeature
+{
+ const short None = 0;
+ const short SpriteCanvas = 1;
+};
+
+
+
+}; }; }; }; // ::com::sun::star::drawing
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index afa5612..003b6c1 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -19,27 +20,14 @@
#ifndef __com_sun_star_drawing_XPresenterHelper_idl__
#define __com_sun_star_drawing_XPresenterHelper_idl__
-#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
-#endif
-#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#endif
+#include <com/sun/star/drawing/CanvasFeature.idl>
module com { module sun { module star { module drawing {
-constants CanvasFeature
-{
- const short None = 0;
- const short SpriteCanvas = 1;
-};
-
/** This interface is a collection of functions that are necessary to
implement larger parts of the presenter screen as extension. The
methods of this interface give access to services that can, at the
@@ -168,3 +156,5 @@ interface XPresenterHelper
}; }; }; }; // ::com::sun::star::drawing
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit ca440343dba0e63b07820a109885202a09403bbd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 13:11:45 2012 -0600
rebase XPresentationHelper
Change-Id: Ib3c0ff5ebe0bfb56d5f3f4debf9f47b0687121ae
diff --git a/offapi/com/sun/star/drawing/CanvasFeature.idl b/offapi/com/sun/star/drawing/CanvasFeature.idl
deleted file mode 100644
index c61c7f3..0000000
--- a/offapi/com/sun/star/drawing/CanvasFeature.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef __com_sun_star_drawing_CanvasFeature_idl__
-#define __com_sun_star_drawing_CanvasFeature_idl__
-
-module com { module sun { module star { module drawing {
-
-constants CanvasFeature
-{
- const short None = 0;
- const short SpriteCanvas = 1;
-};
-
-
-
-}; }; }; }; // ::com::sun::star::drawing
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/drawing/XPresenterHelper.idl b/offapi/com/sun/star/drawing/XPresenterHelper.idl
index 003b6c1..afa5612 100644
--- a/offapi/com/sun/star/drawing/XPresenterHelper.idl
+++ b/offapi/com/sun/star/drawing/XPresenterHelper.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -20,14 +19,27 @@
#ifndef __com_sun_star_drawing_XPresenterHelper_idl__
#define __com_sun_star_drawing_XPresenterHelper_idl__
+#ifndef __com_sun_star_awt_XWindow_idl__
#include <com/sun/star/awt/XWindow.idl>
+#endif
+#ifndef __com_sun_star_rendering_XCanvas_idl__
#include <com/sun/star/rendering/XCanvas.idl>
+#endif
+#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
+#endif
+#ifndef __com_sun_star_awt_Rectangle_idl__
#include <com/sun/star/awt/Rectangle.idl>
-#include <com/sun/star/drawing/CanvasFeature.idl>
+#endif
module com { module sun { module star { module drawing {
+constants CanvasFeature
+{
+ const short None = 0;
+ const short SpriteCanvas = 1;
+};
+
/** This interface is a collection of functions that are necessary to
implement larger parts of the presenter screen as extension. The
methods of this interface give access to services that can, at the
@@ -156,5 +168,3 @@ interface XPresenterHelper
}; }; }; }; // ::com::sun::star::drawing
#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5fe755a0a253950c4792fb9b867440f24c4eb3f8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 12:24:07 2012 -0600
split idl with multiple class into one idl per.
Change-Id: Iee527b866365215dd88f7dfb2767900c6a989c23
diff --git a/offapi/com/sun/star/frame/UntitledNumbersConst.idl b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
new file mode 100644
index 0000000..3ff9b50
--- /dev/null
+++ b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
@@ -0,0 +1,34 @@
+/* -*- 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_frame_UntitledNumbersConst_idl__
+#define __com_sun_star_frame_UntitledNumbersConst_idl__
+
+ module com { module sun { module star { module frame {
+
+constants UntitledNumbersConst
+{
+ const long INVALID_NUMBER = 0;
+};
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index a9a4169..231707b 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -15,38 +16,24 @@
* 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_frame_XUntitledNumbers_idl__
#define __com_sun_star_frame_XUntitledNumbers_idl__
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-
-#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
-#endif
-//=============================================================================
module com { module sun { module star { module frame {
-constants UntitledNumbersConst
-{
- const long INVALID_NUMBER = 0;
-};
-
-//=============================================================================
/** knows all currently used and all free numbers for using with untitled
but counted objects.
*/
interface XUntitledNumbers : com::sun::star::uno::XInterface
{
- //-------------------------------------------------------------------------
- /** calli has to lease a number befor he can use it within in its own title.
+ /** callee has to lease a number before he can use it within in its own title.
Such number must be freed after using e.g. while the object was closed or
- get's another title (e.g. by saving a document to a real location on disc).
+ gets another title (e.g. by saving a document to a real location on disc).
@param xComponent
the component which has to be registered for the leased number.
@@ -59,13 +46,12 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
long leaseNumber ( [in] com::sun::star::uno::XInterface xComponent )
raises (com::sun::star::lang::IllegalArgumentException);
- //-------------------------------------------------------------------------
/** has to be used to mark those number as "free for using".
- If the reqistered component does not use such leased number any longer
+ If the registered component does not use such leased number any longer
it has to be released so it can be used for new components.
- Note: calling this method with an unknown (but normaly valid number)
+ Note: calling this method with an unknown (but normally valid number)
has to be ignored. No exceptions - no errors.
@param nNumber
@@ -77,7 +63,6 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
void releaseNumber ( [in] long nNumber )
raises (com::sun::star::lang::IllegalArgumentException);
- //-------------------------------------------------------------------------
/** does the same then releaseNumber () but it searches the corresponding
number for the specified component and deregister it.
@@ -90,11 +75,10 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
void releaseNumberForComponent ( [in] com::sun::star::uno::XInterface xComponent )
raises (com::sun::star::lang::IllegalArgumentException);
- //-------------------------------------------------------------------------
- /** returns the localized string value to be used for untitles objects in
+ /** returns the localized string value to be used for untitled objects in
combination with the leased number.
- Note: Such string already contains leading spaces/tabs etcpp. !
+ Note: Such string already contains leading spaces/tabs etc. !
The only thing which an outside code has todo then ... adding a leased number
to the string.
@@ -103,8 +87,9 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
string getUntitledPrefix ();
};
-//=============================================================================
}; }; }; };
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit fa0db4b951878aad26aeae4eb2e2e18d0ccce1d3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 12:22:41 2012 -0600
rebase XUntitledNumbers
Change-Id: I59c62bb5a8cad34a1da3e118a23f9e7320e44a06
diff --git a/offapi/com/sun/star/frame/UntitledNumbersConst.idl b/offapi/com/sun/star/frame/UntitledNumbersConst.idl
deleted file mode 100644
index 645ea37..0000000
--- a/offapi/com/sun/star/frame/UntitledNumbersConst.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_frame_UntitledNumbersConst_idl__
-#define __com_sun_star_frame_UntitledNumbersConst_idl__
-
- module com { module sun { module star { module frame {
-
-constants UntitledNumbersConst
-{
- const long INVALID_NUMBER = 0;
-};
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/frame/XUntitledNumbers.idl b/offapi/com/sun/star/frame/XUntitledNumbers.idl
index 231707b..a9a4169 100644
--- a/offapi/com/sun/star/frame/XUntitledNumbers.idl
+++ b/offapi/com/sun/star/frame/XUntitledNumbers.idl
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -16,24 +15,38 @@
* 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_frame_XUntitledNumbers_idl__
#define __com_sun_star_frame_XUntitledNumbers_idl__
+#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
#include <com/sun/star/lang/IllegalArgumentException.idl>
+#endif
+//=============================================================================
module com { module sun { module star { module frame {
+constants UntitledNumbersConst
+{
+ const long INVALID_NUMBER = 0;
+};
+
+//=============================================================================
/** knows all currently used and all free numbers for using with untitled
but counted objects.
*/
interface XUntitledNumbers : com::sun::star::uno::XInterface
{
- /** callee has to lease a number before he can use it within in its own title.
+ //-------------------------------------------------------------------------
+ /** calli has to lease a number befor he can use it within in its own title.
Such number must be freed after using e.g. while the object was closed or
- gets another title (e.g. by saving a document to a real location on disc).
+ get's another title (e.g. by saving a document to a real location on disc).
@param xComponent
the component which has to be registered for the leased number.
@@ -46,12 +59,13 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
long leaseNumber ( [in] com::sun::star::uno::XInterface xComponent )
raises (com::sun::star::lang::IllegalArgumentException);
+ //-------------------------------------------------------------------------
/** has to be used to mark those number as "free for using".
- If the registered component does not use such leased number any longer
+ If the reqistered component does not use such leased number any longer
it has to be released so it can be used for new components.
- Note: calling this method with an unknown (but normally valid number)
+ Note: calling this method with an unknown (but normaly valid number)
has to be ignored. No exceptions - no errors.
@param nNumber
@@ -63,6 +77,7 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
void releaseNumber ( [in] long nNumber )
raises (com::sun::star::lang::IllegalArgumentException);
+ //-------------------------------------------------------------------------
/** does the same then releaseNumber () but it searches the corresponding
number for the specified component and deregister it.
@@ -75,10 +90,11 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
void releaseNumberForComponent ( [in] com::sun::star::uno::XInterface xComponent )
raises (com::sun::star::lang::IllegalArgumentException);
- /** returns the localized string value to be used for untitled objects in
+ //-------------------------------------------------------------------------
+ /** returns the localized string value to be used for untitles objects in
combination with the leased number.
- Note: Such string already contains leading spaces/tabs etc. !
+ Note: Such string already contains leading spaces/tabs etcpp. !
The only thing which an outside code has todo then ... adding a leased number
to the string.
@@ -87,9 +103,8 @@ interface XUntitledNumbers : com::sun::star::uno::XInterface
string getUntitledPrefix ();
};
+//=============================================================================
}; }; }; };
#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a80b3c06ee0457d536071d770ae4c16fcaf3ff05
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 12:17:07 2012 -0600
split idl with multiple class into one idl per.
Change-Id: I0703a647e2dd2082cee004b0bcd0d4988997e447
diff --git a/offapi/com/sun/star/presentation/SlideShow.idl b/offapi/com/sun/star/presentation/SlideShow.idl
new file mode 100644
index 0000000..acd6153
--- /dev/null
+++ b/offapi/com/sun/star/presentation/SlideShow.idl
@@ -0,0 +1,33 @@
+/* -*- 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_presentation_SlideShow_idl
+#define _com_sun_star_presentation_SlideShow_idl
+
+#include <com/sun/star/presentation/XSlideShow.idl>
+
+module com { module sun { module star { module presentation {
+
+service SlideShow : XSlideShow;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/TransitionFactory.idl b/offapi/com/sun/star/presentation/TransitionFactory.idl
new file mode 100644
index 0000000..a4c93c9
--- /dev/null
+++ b/offapi/com/sun/star/presentation/TransitionFactory.idl
@@ -0,0 +1,34 @@
+/* -*- 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_presentation_TransitionFactory_idl__
+#define __com_sun_star_presentation_TransitionFactory_idl__
+
+#include <com/sun/star/presentation/XTransitionFactory.idl>
+
+
+module com { module sun { module star { module presentation {
+
+service TransitionFactory : XTransitionFactory;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index 4cd4622..c99cc09 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -1,84 +1,56 @@
-/**************************************************************
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
*
- * 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
+ * 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/.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This file incorporates work covered by the following license notice:
*
- * 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.
- *
- *************************************************************/
-
-
+ * 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_presentation_XSlideShow_idl
#define _com_sun_star_presentation_XSlideShow_idl
-#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
-#endif
-#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
-#endif
-#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
-#endif
-#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
-#endif
-#endif
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
-#endif
-#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#include <com/sun/star/drawing/XDrawPagesSupplier.idl>
-#endif
-#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowView_idl__
#include <com/sun/star/presentation/XSlideShowView.idl>
-#endif
-#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
#include <com/sun/star/presentation/XSlideShowListener.idl>
-#endif
-#ifndef __com_sun_star_presentation_XShapeEventListener_idl__
#include <com/sun/star/presentation/XShapeEventListener.idl>
-#endif
module com { module sun { module star { module presentation {
-/** Slideshow interface to perform slideshow presentations.<p>
+/** Slide show interface to perform slide show presentations.<p>
This interface provides the necessary methods to run and control a
- slideshow from a given set of XDrawPage slides. The slideshow can
+ slide show from a given set of XDrawPage slides. The slide show can
be displayed simultaneously on multiple targets.<p>
- Note: To controll a running slideshow inside a presentation, please
+ Note: To control a running slide show inside a presentation, please
use <type>XPresentation2</type> and <type>XSlideShowController</type>.
@since OOo 3.0
*/
interface XSlideShow : ::com::sun::star::uno::XInterface
{
- /** Trigger the next effect of the slideshow.<p>
+ /** Trigger the next effect of the slide show.<p>
This method triggers the next effect on the currently
- displayed slide. If there is currently no slideshow running,
+ displayed slide. If there is currently no slide show running,
this method does nothing. If there are no more effects on the
current slide, a possible slide transition effect is issued
and the next slide is displayed.<p>
@@ -91,7 +63,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
*/
boolean nextEffect();
- /** Undo the last effect in the main sequence of the slideshow.<p>
+ /** Undo the last effect in the main sequence of the slide show.<p>
The current slide is displayed as if the last user-triggered effect
has never been triggered. If there is no previous effect on the
@@ -99,7 +71,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
XSlideShowListener objects, which can then trigger a change to the
previous slide. Note that this command is executed asynchronously.
Multiple calls to update() may be necessary to complete its execution.
- If there is currently no slideshow running, this method does
+ If there is currently no slide show running, this method does
nothing.<p>
@return <TRUE/>, if the previous effect was successfully
@@ -148,7 +120,8 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
The slide to display.
@param xDrawPages
- For future use.
+ For future use.
+ This parameter can be NULL when the ENABLE_PRESENTER_EXTRA_UI feature is disabled.
@param xAnimationNode
The animation node determine the animations to display.
@@ -161,7 +134,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
<li>name: Prefetch, value: ::com::sun::star::drawing::XDrawPage. When given,
this slide is prepared in the background to be displayed next. The next
call to displaySlide() with the given slide may be faster if there was
- enough time for prefatching. If the next call to displaySlide() uses
+ enough time for prefetching. If the next call to displaySlide() uses
a different slide, this will still work but will not have any performance
improvements
</li>
@@ -170,7 +143,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
are triggered. This is typically used when going back one
effect leads to the previous slide. On that slide all
effects have to be shown in order to continue the backward
- travelling.
+ traveling.
When <FALSE/>, the default, then no main sequence effect is
triggered.
</li>
@@ -208,7 +181,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
/** Query the currently displayed slide.<p>
@return the instance of the current slide. If there's no
- slideshow running at the moment, this method returns an
+ slide show running at the moment, this method returns an
empty reference.
*/
::com::sun::star::drawing::XDrawPage getCurrentSlide();
@@ -221,7 +194,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
void registerUserPaintPolygons([in] ::com::sun::star::lang::XMultiServiceFactory xDocFactory);
- /** Change a property of the slideshow.<p>
+ /** Change a property of the slide show.<p>
@param aShowProperty
Property values, which influence the way the slides are
@@ -300,7 +273,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
/** Add a slide show listener.<p>
This method adds a listener to the slide show, which will get
- notified when a registerend shape is clicked upon, or a new
+ notified when a registered shape is clicked upon, or a new
slide is about to be displayed. Note that the listeners will
<em>not</em> be notified, when the slide change is directly
requested by one of the nextSlide(), previousSlide() or
@@ -365,9 +338,8 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
};
-service SlideShow : XSlideShow;
-
}; }; }; };
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 7a064e3..1eef967 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -1,34 +1,26 @@
-/**************************************************************
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
*
- * 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
+ * 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/.
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * This file incorporates work covered by the following license notice:
*
- * 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.
- *
- *************************************************************/
-
-
+ * 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_presentation_XTransitionFactory_idl__
#define __com_sun_star_presentation_XTransitionFactory_idl__
-#ifndef __com_sun_star_presentation_XTransition_idl__
#include <com/sun/star/presentation/XTransition.idl>
-#endif
-#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
-#endif
module com { module sun { module star {
@@ -40,7 +32,7 @@ module presentation {
interface XTransition;
interface XSlideShowView;
-/** TransitionFactory interface to request optional custom Transition instances for slideshow transitions.<p>
+/** TransitionFactory interface to request optional custom Transition instances for slide show transitions.<p>
This interface provides the necessary methods to query and create optional transition effects for a SlideShow<p>
@@ -61,7 +53,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
Subtype for the transition (@see ::com::sun::star::animation::TransitionSubType)
@param view
- Slideshow view to display on
+ Slide show view to display on
@param leavingBitmap
Bitmap of the slide that's going to leave the screen
@@ -71,7 +63,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
@param slideOffset
Offset in pixel from the top, left edge of the view, such that the
- slide displays similar to normal slideshow
+ slide displays similar to normal slide show
*/
XTransition createTransition( [in] short transitionType,
[in] short transitionSubType,
@@ -80,9 +72,8 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
[in] com::sun::star::rendering::XBitmap enteringBitmap );
};
-service TransitionFactory : XTransitionFactory;
-
}; }; }; };
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit a0704a33a8ec2372f4b62a3a6094ae27d05c3464
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 12:15:09 2012 -0600
rebase XSlideShow, XTransitionFactory
Change-Id: Ia68d6904d3b3059f13a303d066080bab040087fe
diff --git a/offapi/com/sun/star/presentation/SlideShow.idl b/offapi/com/sun/star/presentation/SlideShow.idl
deleted file mode 100644
index e9e116a..0000000
--- a/offapi/com/sun/star/presentation/SlideShow.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _com_sun_star_presentation_SlideShow_idl
-#define _com_sun_star_presentation_SlideShow_idl
-
-#include <com/sun/star/presentation/XSlideShow.idl>
-
-module com { module sun { module star { module presentation {
-
-service SlideShow : XSlideShow;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/TransitionFactory.idl b/offapi/com/sun/star/presentation/TransitionFactory.idl
deleted file mode 100644
index d45cefd..0000000
--- a/offapi/com/sun/star/presentation/TransitionFactory.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef __com_sun_star_presentation_TransitionFactory_idl__
-#define __com_sun_star_presentation_TransitionFactory_idl__
-
-#include <com/sun/star/presentation/XTransitionFactory.idl>
-
-
-module com { module sun { module star { module presentation {
-
-service TransitionFactory : XTransitionFactory;
-
-}; }; }; };
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/XSlideShow.idl b/offapi/com/sun/star/presentation/XSlideShow.idl
index c99cc09..4cd4622 100644
--- a/offapi/com/sun/star/presentation/XSlideShow.idl
+++ b/offapi/com/sun/star/presentation/XSlideShow.idl
@@ -1,56 +1,84 @@
-/* -*- 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/.
+ * 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
*
- * This file incorporates work covered by the following license notice:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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_presentation_XSlideShow_idl
#define _com_sun_star_presentation_XSlideShow_idl
+#ifndef __com_sun_star_uno_XInterface_idl__
#include <com/sun/star/uno/XInterface.idl>
+#endif
+#ifndef __com_sun_star_beans_PropertyValue_idl__
#include <com/sun/star/beans/PropertyValue.idl>
+#endif
+#ifndef __com_sun_star_geometry_RealRectangle2D_idl__
#include <com/sun/star/geometry/RealRectangle2D.idl>
+#endif
+#ifndef __com_sun_star_rendering_XSpriteCanvas_idl__
#include <com/sun/star/rendering/XSpriteCanvas.idl>
+#endif
+#ifndef __com_sun_star_animations_XAnimationNode_idl__
#include <com/sun/star/animations/XAnimationNode.idl>
+#endif
+#endif
+#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
#include <com/sun/star/lang/XMultiServiceFactory.idl>
+#ifndef __com_sun_star_drawing_XDrawPage_idl__
#include <com/sun/star/drawing/XDrawPage.idl>
+#endif
+#ifndef __com_sun_star_drawing_XDrawPagesSupplier_idl__
#include <com/sun/star/drawing/XDrawPagesSupplier.idl>
+#endif
+#ifndef __com_sun_star_drawing_XShape_idl__
#include <com/sun/star/drawing/XShape.idl>
+#endif
+#ifndef __com_sun_star_presentation_XSlideShowView_idl__
#include <com/sun/star/presentation/XSlideShowView.idl>
+#endif
+#ifndef __com_sun_star_presentation_XSlideShowListener_idl__
#include <com/sun/star/presentation/XSlideShowListener.idl>
+#endif
+#ifndef __com_sun_star_presentation_XShapeEventListener_idl__
#include <com/sun/star/presentation/XShapeEventListener.idl>
+#endif
module com { module sun { module star { module presentation {
-/** Slide show interface to perform slide show presentations.<p>
+/** Slideshow interface to perform slideshow presentations.<p>
This interface provides the necessary methods to run and control a
- slide show from a given set of XDrawPage slides. The slide show can
+ slideshow from a given set of XDrawPage slides. The slideshow can
be displayed simultaneously on multiple targets.<p>
- Note: To control a running slide show inside a presentation, please
+ Note: To controll a running slideshow inside a presentation, please
use <type>XPresentation2</type> and <type>XSlideShowController</type>.
@since OOo 3.0
*/
interface XSlideShow : ::com::sun::star::uno::XInterface
{
- /** Trigger the next effect of the slide show.<p>
+ /** Trigger the next effect of the slideshow.<p>
This method triggers the next effect on the currently
- displayed slide. If there is currently no slide show running,
+ displayed slide. If there is currently no slideshow running,
this method does nothing. If there are no more effects on the
current slide, a possible slide transition effect is issued
and the next slide is displayed.<p>
@@ -63,7 +91,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
*/
boolean nextEffect();
- /** Undo the last effect in the main sequence of the slide show.<p>
+ /** Undo the last effect in the main sequence of the slideshow.<p>
The current slide is displayed as if the last user-triggered effect
has never been triggered. If there is no previous effect on the
@@ -71,7 +99,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
XSlideShowListener objects, which can then trigger a change to the
previous slide. Note that this command is executed asynchronously.
Multiple calls to update() may be necessary to complete its execution.
- If there is currently no slide show running, this method does
+ If there is currently no slideshow running, this method does
nothing.<p>
@return <TRUE/>, if the previous effect was successfully
@@ -120,8 +148,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
The slide to display.
@param xDrawPages
- For future use.
- This parameter can be NULL when the ENABLE_PRESENTER_EXTRA_UI feature is disabled.
+ For future use.
@param xAnimationNode
The animation node determine the animations to display.
@@ -134,7 +161,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
<li>name: Prefetch, value: ::com::sun::star::drawing::XDrawPage. When given,
this slide is prepared in the background to be displayed next. The next
call to displaySlide() with the given slide may be faster if there was
- enough time for prefetching. If the next call to displaySlide() uses
+ enough time for prefatching. If the next call to displaySlide() uses
a different slide, this will still work but will not have any performance
improvements
</li>
@@ -143,7 +170,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
are triggered. This is typically used when going back one
effect leads to the previous slide. On that slide all
effects have to be shown in order to continue the backward
- traveling.
+ travelling.
When <FALSE/>, the default, then no main sequence effect is
triggered.
</li>
@@ -181,7 +208,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
/** Query the currently displayed slide.<p>
@return the instance of the current slide. If there's no
- slide show running at the moment, this method returns an
+ slideshow running at the moment, this method returns an
empty reference.
*/
::com::sun::star::drawing::XDrawPage getCurrentSlide();
@@ -194,7 +221,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
void registerUserPaintPolygons([in] ::com::sun::star::lang::XMultiServiceFactory xDocFactory);
- /** Change a property of the slide show.<p>
+ /** Change a property of the slideshow.<p>
@param aShowProperty
Property values, which influence the way the slides are
@@ -273,7 +300,7 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
/** Add a slide show listener.<p>
This method adds a listener to the slide show, which will get
- notified when a registered shape is clicked upon, or a new
+ notified when a registerend shape is clicked upon, or a new
slide is about to be displayed. Note that the listeners will
<em>not</em> be notified, when the slide change is directly
requested by one of the nextSlide(), previousSlide() or
@@ -338,8 +365,9 @@ interface XSlideShow : ::com::sun::star::uno::XInterface
};
+service SlideShow : XSlideShow;
+
}; }; }; };
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/presentation/XTransitionFactory.idl b/offapi/com/sun/star/presentation/XTransitionFactory.idl
index 1eef967..7a064e3 100644
--- a/offapi/com/sun/star/presentation/XTransitionFactory.idl
+++ b/offapi/com/sun/star/presentation/XTransitionFactory.idl
@@ -1,26 +1,34 @@
-/* -*- 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/.
+ * 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
*
- * This file incorporates work covered by the following license notice:
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * 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_presentation_XTransitionFactory_idl__
#define __com_sun_star_presentation_XTransitionFactory_idl__
+#ifndef __com_sun_star_presentation_XTransition_idl__
#include <com/sun/star/presentation/XTransition.idl>
+#endif
+#ifndef __com_sun_star_geometry_RealPoint2D_idl__
#include <com/sun/star/geometry/RealPoint2D.idl>
+#endif
module com { module sun { module star {
@@ -32,7 +40,7 @@ module presentation {
interface XTransition;
interface XSlideShowView;
-/** TransitionFactory interface to request optional custom Transition instances for slide show transitions.<p>
+/** TransitionFactory interface to request optional custom Transition instances for slideshow transitions.<p>
This interface provides the necessary methods to query and create optional transition effects for a SlideShow<p>
@@ -53,7 +61,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
Subtype for the transition (@see ::com::sun::star::animation::TransitionSubType)
@param view
- Slide show view to display on
+ Slideshow view to display on
@param leavingBitmap
Bitmap of the slide that's going to leave the screen
@@ -63,7 +71,7 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
@param slideOffset
Offset in pixel from the top, left edge of the view, such that the
- slide displays similar to normal slide show
+ slide displays similar to normal slideshow
*/
XTransition createTransition( [in] short transitionType,
[in] short transitionSubType,
@@ -72,8 +80,9 @@ interface XTransitionFactory : ::com::sun::star::uno::XInterface
[in] com::sun::star::rendering::XBitmap enteringBitmap );
};
+service TransitionFactory : XTransitionFactory;
+
}; }; }; };
#endif
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 03fff01af264521952263ba2fcd3ea5517b5f61f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Nov 7 12:10:38 2012 -0600
split idl with multiple class into one idl per.
Change-Id: I8b3e3203e8a360fb7f49892a9ac5927da7c3a764
diff --git a/offapi/com/sun/star/report/FormatCondition.idl b/offapi/com/sun/star/report/FormatCondition.idl
new file mode 100644
index 0000000..44b53dd
--- /dev/null
+++ b/offapi/com/sun/star/report/FormatCondition.idl
@@ -0,0 +1,32 @@
+/* -*- 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_report_FormatCondition_idl__
+#define __com_sun_star_report_FormatCondition_idl__
+
+#include <com/sun/star/report/XFormatCondition.idl>
+
+ module com { module sun { module star { module report {
+
+service FormatCondition : XFormatCondition;
+
+}; }; }; };
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/FormattedField.idl b/offapi/com/sun/star/report/FormattedField.idl
new file mode 100644
index 0000000..ba378ed
--- /dev/null
+++ b/offapi/com/sun/star/report/FormattedField.idl
@@ -0,0 +1,35 @@
+/* -*- 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_report_FormattedField_idl__
+#define __com_sun_star_report_FormattedField_idl__
+
+#include <com/sun/star/report/XFormattedField.idl>
+
+
+ module com { module sun { module star { module report {
+
+
+service FormattedField : XFormattedField;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/Function.idl b/offapi/com/sun/star/report/Function.idl
new file mode 100644
index 0000000..4a463f3
--- /dev/null
+++ b/offapi/com/sun/star/report/Function.idl
@@ -0,0 +1,35 @@
+/* -*- 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_report_Function_idl__
+#define __com_sun_star_report_Function_idl__
+
+#include <com/sun/star/report/XFunction.idl>
+
+ module com { module sun { module star { module report {
+
+service Function : XFunction
+{
+ create();
+};
+
+}; }; }; };
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/Group.idl b/offapi/com/sun/star/report/Group.idl
new file mode 100644
index 0000000..5cf13a6
--- /dev/null
+++ b/offapi/com/sun/star/report/Group.idl
@@ -0,0 +1,34 @@
+/* -*- 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_report_Group_idl__
+#define __com_sun_star_report_Group_idl__
+
+#include <com/sun/star/report/XGroup.idl>
+
+
+ module com { module sun { module star { module report {
+
+service Group : XGroup;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/ImageControl.idl b/offapi/com/sun/star/report/ImageControl.idl
new file mode 100644
index 0000000..29045e6
--- /dev/null
+++ b/offapi/com/sun/star/report/ImageControl.idl
@@ -0,0 +1,35 @@
+/* -*- 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_report_ImageControl_idl__
+#define __com_sun_star_report_ImageControl_idl__
+
+#include <com/sun/star/report/XImageControl.idl>
+
+
+ module com { module sun { module star { module report {
+
+
+service ImageControl : XImageControl;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/ReportControlModel.idl b/offapi/com/sun/star/report/ReportControlModel.idl
new file mode 100644
index 0000000..27314fa
--- /dev/null
+++ b/offapi/com/sun/star/report/ReportControlModel.idl
@@ -0,0 +1,35 @@
+/* -*- 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_report_ReportControlModel_idl__
+#define __com_sun_star_report_ReportControlModel_idl__
+
+#include <com/sun/star/report/XReportControlModel.idl>
+
+
+ module com { module sun { module star { module report {
+
+
+service ReportControlModel : XReportControlModel;
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/ReportDefinition.idl b/offapi/com/sun/star/report/ReportDefinition.idl
new file mode 100644
index 0000000..bc01c05
--- /dev/null
+++ b/offapi/com/sun/star/report/ReportDefinition.idl
@@ -0,0 +1,36 @@
+/* -*- 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_report_ReportDefinition_idl__
+#define __com_sun_star_report_ReportDefinition_idl__
+
+#include <com/sun/star/report/XReportDefinition.idl>
+
+
+ module com { module sun { module star { module report {
+
+
+service ReportDefinition : XReportDefinition;
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/XFormatCondition.idl b/offapi/com/sun/star/report/XFormatCondition.idl
index 12f137a..aab255e 100644
--- a/offapi/com/sun/star/report/XFormatCondition.idl
+++ b/offapi/com/sun/star/report/XFormatCondition.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -15,20 +16,15 @@
* 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_report_XFormatCondition_idl__
#define __com_sun_star_report_XFormatCondition_idl__
-#ifndef __com_sun_star_report_XReportControlFormat_idl__
#include <com/sun/star/report/XReportControlFormat.idl>
-#endif
-//=============================================================================
module com { module sun { module star { module report {
-//=============================================================================
/** specifies a format condition for a control.
*/
-published interface XFormatCondition
+interface XFormatCondition
{
interface XReportControlFormat;
@@ -46,8 +42,8 @@ published interface XFormatCondition
[attribute,bound] string Formula;
};
-service FormatCondition : XFormatCondition;
-//=============================================================================
}; }; }; };
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/report/XFormattedField.idl b/offapi/com/sun/star/report/XFormattedField.idl
index e36deb2..8d668a2 100644
--- a/offapi/com/sun/star/report/XFormattedField.idl
+++ b/offapi/com/sun/star/report/XFormattedField.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -15,28 +16,21 @@
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list