From c857dff7fc4b180c1d405ea5584e06c0581427ae Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Tue, 24 Jan 2012 15:48:30 -0600 Subject: switch to include-based build rather than sourced-based build --- offapi/Makefile | 37 ++----------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) (limited to 'offapi') diff --git a/offapi/Makefile b/offapi/Makefile index 7bbbe6c703e6..ccb1c85a04da 100644 --- a/offapi/Makefile +++ b/offapi/Makefile @@ -1,40 +1,7 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* -# -# 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 -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -gb_PARTIALBUILD := T -ifeq ($(strip $(SOLARENV)),) -include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk -else +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) -gb_SourceEnvAndRecurse_STAGE=gbuild -include $(SOLARENV)/gbuild/gbuild.mk +include $(module_directory)/../solenv/gbuild/partial_build.mk -$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) - -endif # vim: set noet sw=4 ts=4: -- cgit From fb78dbcdc5a76997856285af3b041ffd087c40a5 Mon Sep 17 00:00:00 2001 From: Josh Heidenreich Date: Mon, 6 Feb 2012 13:22:05 +1030 Subject: Added READMEs for modules related to URE, with content from the wiki --- offapi/README | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 offapi/README (limited to 'offapi') diff --git a/offapi/README b/offapi/README new file mode 100644 index 000000000000..c33424d4a7e5 --- /dev/null +++ b/offapi/README @@ -0,0 +1,4 @@ +Contains all of the IDL files except those in [[udkapi]] + +i.e. the interfaces that are specific to the OppenOffice.org application. +An artificial (?) separation. -- cgit From f02f97bcdf7b6789e42f04600fb30daf3e0bfd37 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 9 Feb 2012 14:37:44 +0100 Subject: added TableBorder2 using BorderLine2, implemented BorderLine2 properly * added com::sun::star::table::TableBorder2 with com::sun::star::table::BorderLine2 members * added optional com::sun::star::table::BorderLine2 properties to com::sun::star::table::CellProperties service * changes in Calc * support TableBorder2, additionally to TableBorder * reverted change that made all BorderLine properties operate with BorderLine2 structs * instead support both, BorderLine and BorderLine2 --- offapi/UnoApi_offapi.mk | 1 + offapi/com/sun/star/sheet/TableAutoFormatField.idl | 11 ++++ offapi/com/sun/star/table/BorderLine2.idl | 2 +- offapi/com/sun/star/table/CellProperties.idl | 70 ++++++++++++++++++++++ 4 files changed, 83 insertions(+), 1 deletion(-) (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 23c4523c790a..1220adc1734a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -3550,6 +3550,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/table,\ ShadowFormat \ ShadowLocation \ TableBorder \ + TableBorder2 \ TableBorderDistances \ TableOrientation \ TableSortField \ diff --git a/offapi/com/sun/star/sheet/TableAutoFormatField.idl b/offapi/com/sun/star/sheet/TableAutoFormatField.idl index 31597271b6f3..b3c88a95f051 100644 --- a/offapi/com/sun/star/sheet/TableAutoFormatField.idl +++ b/offapi/com/sun/star/sheet/TableAutoFormatField.idl @@ -38,6 +38,7 @@ #include #include #include +#include //============================================================================= @@ -300,6 +301,16 @@ published service TableAutoFormatField @since OOo 1.1.2 */ [optional, property] com::sun::star::table::TableBorder TableBorder; + + //------------------------------------------------------------------------- + + /** property containing a description of the cell border. + Preferred over TableBorder + TableBorder. + + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::TableBorder2 TableBorder2; }; //============================================================================= diff --git a/offapi/com/sun/star/table/BorderLine2.idl b/offapi/com/sun/star/table/BorderLine2.idl index ef5aac755429..a54d3d346be5 100644 --- a/offapi/com/sun/star/table/BorderLine2.idl +++ b/offapi/com/sun/star/table/BorderLine2.idl @@ -39,7 +39,7 @@ module com { module sun { module star { module table { //============================================================================= -struct BorderLine2 : BorderLine +published struct BorderLine2 : BorderLine { /** Style of the border. @see BorderLineStyle */ diff --git a/offapi/com/sun/star/table/CellProperties.idl b/offapi/com/sun/star/table/CellProperties.idl index 4d4ae413bf1b..1473a67b1571 100644 --- a/offapi/com/sun/star/table/CellProperties.idl +++ b/offapi/com/sun/star/table/CellProperties.idl @@ -37,7 +37,9 @@ #include #include #include +#include #include +#include #include //============================================================================= @@ -234,6 +236,74 @@ published service CellProperties */ [optional, property] boolean ShrinkToFit; + + //=== BorderLine2 / TableBorder2 optional properties, preferred =========== + + /** contains a description of the cell or cell range border. + Preferred over TableBorder>/type> TableBorder. + +

If used with a cell range, the top, left, right, and bottom + lines are at the edges of the entire range, not at the edges of + the individual cell.

+ + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::TableBorder2 TableBorder2; + + //------------------------------------------------------------------------- + + /** contains a description of the top border line of each cell. + Preferred over BorderLine TopBorder. + + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::BorderLine2 TopBorder2; + + //------------------------------------------------------------------------- + + /** contains a description of the bottom border line of each cell. + Preferred over BorderLine BottomBorder. + + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::BorderLine2 BottomBorder2; + + //------------------------------------------------------------------------- + + /** contains a description of the left border line of each cell. + Preferred over BorderLine LeftBorder. + + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::BorderLine2 LeftBorder2; + + //------------------------------------------------------------------------- + + /** contains a description of the right border line of each cell. + Preferred over BorderLine RightBorder. + + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::BorderLine2 RightBorder2; + + //------------------------------------------------------------------------- + + /** contains a description of the top left to bottom right diagonal line of each cell. + Preferred over BorderLine DiagonalTLBR. + + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::BorderLine2 DiagonalTLBR2; + + //------------------------------------------------------------------------- + + /** contains a description of the bottom left to top right diagonal line of each cell. + Preferred over BorderLine DiagonalBLTR. + + @since LibreOffice 3.6 + */ + [optional, property] com::sun::star::table::BorderLine2 DiagonalBLTR2; + //------------------------------------------------------------------------- }; -- cgit From 46ed67999274b0de201bfcf20e099d4ba363a78c Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 9 Feb 2012 16:00:24 +0100 Subject: forgot to git add TableBorder2.idl needed for f02f97bcdf7b6789e42f04600fb30daf3e0bfd37 --- offapi/com/sun/star/table/TableBorder2.idl | 160 +++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 offapi/com/sun/star/table/TableBorder2.idl (limited to 'offapi') diff --git a/offapi/com/sun/star/table/TableBorder2.idl b/offapi/com/sun/star/table/TableBorder2.idl new file mode 100644 index 000000000000..4f826726976b --- /dev/null +++ b/offapi/com/sun/star/table/TableBorder2.idl @@ -0,0 +1,160 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Red Hat, Inc., Eike Rathke + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef __com_sun_star_table_TableBorder2_idl__ +#define __com_sun_star_table_TableBorder2_idl__ + +#include + +//============================================================================= + +module com { module sun { module star { module table { + +//============================================================================= + +/** contains the style settings of the border lines of all cells in a cell + range. + + TableBorder2 is nearly identical to TableBorder, except that it has + members of BorderLine2 instead of + BorderLine. + +

In a queried structure, the flags in + TableBorder2::Is...LineValid indicate that not all + lines of the boxes have the same values.

+ +

In a structure which is used for setting, these flags determine + if the corresponding line should be set or if the old value should + be kept.

+ + @since LibreOffice 3.6 + */ +published struct TableBorder2 +{ + //------------------------------------------------------------------------- + + /** determines the line style at the top edge. + */ + com::sun::star::table::BorderLine2 TopLine; + + //------------------------------------------------------------------------- + + /** specifies whether the value of + TableBorder2::TopLine is used. + */ + boolean IsTopLineValid; + + //------------------------------------------------------------------------- + + /** determines the line style at the bottom edge. + */ + com::sun::star::table::BorderLine2 BottomLine; + + //------------------------------------------------------------------------- + + /** specifies whether the value of + TableBorder2::BottomLine is used. + */ + boolean IsBottomLineValid; + + //------------------------------------------------------------------------- + + /** determines the line style at the left edge. + */ + com::sun::star::table::BorderLine2 LeftLine; + + //------------------------------------------------------------------------- + + /** specifies whether the value of + TableBorder2::LeftLine is used. + */ + boolean IsLeftLineValid; + + //------------------------------------------------------------------------- + + /** determines the line style at the right edge. + */ + com::sun::star::table::BorderLine2 RightLine; + + //------------------------------------------------------------------------- + + /** specifies whether the value of + TableBorder2::RightLine is used. + */ + boolean IsRightLineValid; + + //------------------------------------------------------------------------- + + /** determines the line style of horizontal lines for the inner part + of a cell range. + */ + com::sun::star::table::BorderLine2 HorizontalLine; + + //------------------------------------------------------------------------- + + /** specifies whether the value of + TableBorder2::HorizontalLine is used. + */ + boolean IsHorizontalLineValid; + + //------------------------------------------------------------------------- + + /** determines the line style of vertical lines for the inner part + of a cell range. + */ + com::sun::star::table::BorderLine2 VerticalLine; + + //------------------------------------------------------------------------- + + /** specifies whether the value of + TableBorder2::VerticalLine is used. + */ + boolean IsVerticalLineValid; + + //------------------------------------------------------------------------- + + /** contains the distance between the lines and other contents. + */ + short Distance; + + //------------------------------------------------------------------------- + + /** specifies whether the value of + TableBorder2::Distance is used. + */ + boolean IsDistanceValid; + +}; + +//============================================================================= + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 7535373fa693ddff5311054800efcc602cdcacd9 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Tue, 14 Feb 2012 06:19:08 +0100 Subject: correct documentation of com::sun::star::sdbc::XDatabaseMetaData --- offapi/com/sun/star/sdbc/XDatabaseMetaData.idl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl index 4f06bb54f0e0..abee6d219dbd 100644 --- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl +++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl @@ -45,31 +45,33 @@ the form of XResultSet objects. - You can use the normal XResultSet + You can use the normal XRow + (or XColumn) methods such as - XResultSet::getString() + XRow::getString() and - XResultSet::getInt() + XRow::getInt() to retrieve the data from these XResultSets. If a given form of metadata is not available, these methods should throw a SQLException . - That a value of XResultSet is - can be checked with the method XResultSet::wasNull(). + After calling one of the getXXX() methods, + one can check whether that value is + with the method XRow::wasNull(). In the text only "(may be )" is mentioned for this case.

Some of these methods take arguments that are String patterns. These arguments all have names such as fooPattern. Within a pattern String, "%" means match any substring of 0 or more characters, and "_" means match any one character. Only metadata entries matching the search pattern - are returned. If a search pattern argument is set to , + is returned. If a search pattern argument is set to , that argument's criteria will be dropped from the search.

A SQLException will be thrown if a driver does not support - a meta data method. In the case of methods that return an XResultSet, + a metadata method. In the case of methods that return an XResultSet, either an XResultSet (which may be empty) is returned or a SQLException is thrown.

*/ -- cgit From cf3c4f63d94b39c73858d3455ede1b10dac2fe7d Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Tue, 14 Feb 2012 15:43:00 +0100 Subject: plural right after all --- offapi/com/sun/star/sdbc/XDatabaseMetaData.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl index abee6d219dbd..bf5563088653 100644 --- a/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl +++ b/offapi/com/sun/star/sdbc/XDatabaseMetaData.idl @@ -64,7 +64,7 @@ arguments all have names such as fooPattern. Within a pattern String, "%" means match any substring of 0 or more characters, and "_" means match any one character. Only metadata entries matching the search pattern - is returned. If a search pattern argument is set to , + are returned. If a search pattern argument is set to , that argument's criteria will be dropped from the search.

-- cgit From 23af031b09dffe37222517d69f5337db26fdb307 Mon Sep 17 00:00:00 2001 From: Elton Chung Date: Sat, 18 Feb 2012 12:37:04 +0800 Subject: Fix typos in comments --- offapi/com/sun/star/chart/XAxisSupplier.idl | 4 ++-- offapi/com/sun/star/chart2/ScaleData.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/chart/XAxisSupplier.idl b/offapi/com/sun/star/chart/XAxisSupplier.idl index a1aada8f7d3f..8e1f2715c5f8 100644 --- a/offapi/com/sun/star/chart/XAxisSupplier.idl +++ b/offapi/com/sun/star/chart/XAxisSupplier.idl @@ -42,7 +42,7 @@ interface XAxisSupplier : ::com::sun::star::uno::XInterface the primary axis of the specified dimension. The returned object supports service ChartAxis. @param nDimensionIndex - Parameter nDimensionIndex says wether it is a x, y or z-axis (0 for x). + Parameter nDimensionIndex says whether it is a x, y or z-axis (0 for x). */ com::sun::star::chart::XAxis getAxis( [in] long nDimensionIndex ); @@ -50,7 +50,7 @@ interface XAxisSupplier : ::com::sun::star::uno::XInterface the secondary axis of the specified dimension. The returned object supports service ChartAxis. @param nDimensionIndex - Parameter nDimensionIndex says wether it is a x, y or z-axis (0 for x). + Parameter nDimensionIndex says whether it is a x, y or z-axis (0 for x). */ com::sun::star::chart::XAxis getSecondaryAxis( [in] long nDimensionIndex ); }; diff --git a/offapi/com/sun/star/chart2/ScaleData.idl b/offapi/com/sun/star/chart2/ScaleData.idl index 0bb2f839ae07..c63096e5a83f 100644 --- a/offapi/com/sun/star/chart2/ScaleData.idl +++ b/offapi/com/sun/star/chart2/ScaleData.idl @@ -73,7 +73,7 @@ struct ScaleData */ boolean AutoDateAxis; - /** describes wether data points on category or date axis are placed between tickmarks or not + /** describes whether data points on category or date axis are placed between tickmarks or not if true the maximum on the scale will be expanded for one interval */ boolean ShiftedCategoryPosition; -- cgit From 5ca858c01cb2e2aa93c8aca65fd271a900785e3f Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 18 Feb 2012 21:29:58 +0100 Subject: offapi: remove obsolete XInplaceLayout --- offapi/UnoApi_offapi.mk | 1 - offapi/com/sun/star/frame/LayoutManager.idl | 7 --- offapi/com/sun/star/frame/XInplaceLayout.idl | 68 ---------------------------- 3 files changed, 76 deletions(-) delete mode 100644 offapi/com/sun/star/frame/XInplaceLayout.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1220adc1734a..b5a696a69d69 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2516,7 +2516,6 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XFrameSetModel \ XFrames \ XFramesSupplier \ - XInplaceLayout \ XInterceptorInfo \ XLayoutManager \ XLayoutManagerEventBroadcaster \ diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl index aee70e7c7dbd..9e30376ad717 100644 --- a/offapi/com/sun/star/frame/LayoutManager.idl +++ b/offapi/com/sun/star/frame/LayoutManager.idl @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -100,12 +99,6 @@ service LayoutManager */ [optional] interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster; - /** interface to support settings a menu bar for inplace editing of - components inside OpenOffice.org. - - @deprecated - */ - [optional] interface ::com::sun::star::frame::XInplaceLayout; }; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl deleted file mode 100644 index aeeeadda8e08..000000000000 --- a/offapi/com/sun/star/frame/XInplaceLayout.idl +++ /dev/null @@ -1,68 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef __com_sun_star_frame_XInplaceLayout_idl__ -#define __com_sun_star_frame_XInplaceLayout_idl__ - -#include - -//============================================================================= - -module com { module sun { module star { module frame { - -//============================================================================= - -/** special interface to support inplace editing of components inside - OpenOffice.org. - - @deprecated - - @since OOo 2.0 -*/ - -interface XInplaceLayout : com::sun::star::uno::XInterface -{ - /** sets an inplace menu to the container window of the attached frame. - - @param InplaceMenuBarPointer - must be a VCL menu bar pointer which is accessible within the - layout manager process. - */ - void setInplaceMenuBar( [in] hyper InplaceMenuBarPointer ); - - /** removes an inplace menu and sets back a previously created menu bar if one - has been set before. - */ - void resetInplaceMenuBar(); -}; - -}; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 10e580c57b907420e8c6d816325445a40a720e4a Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 18 Feb 2012 22:16:30 +0100 Subject: Revert "offapi: remove obsolete XInplaceLayout" This reverts commit 5ca858c01cb2e2aa93c8aca65fd271a900785e3f. This change implicates some more changes in layoutmanager.hxx see ::cppu::WeakImplHelper8. So keep it... --- offapi/UnoApi_offapi.mk | 1 + offapi/com/sun/star/frame/LayoutManager.idl | 7 +++ offapi/com/sun/star/frame/XInplaceLayout.idl | 68 ++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) create mode 100644 offapi/com/sun/star/frame/XInplaceLayout.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index b5a696a69d69..1220adc1734a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -2516,6 +2516,7 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XFrameSetModel \ XFrames \ XFramesSupplier \ + XInplaceLayout \ XInterceptorInfo \ XLayoutManager \ XLayoutManagerEventBroadcaster \ diff --git a/offapi/com/sun/star/frame/LayoutManager.idl b/offapi/com/sun/star/frame/LayoutManager.idl index 9e30376ad717..aee70e7c7dbd 100644 --- a/offapi/com/sun/star/frame/LayoutManager.idl +++ b/offapi/com/sun/star/frame/LayoutManager.idl @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -99,6 +100,12 @@ service LayoutManager */ [optional] interface ::com::sun::star::frame::XLayoutManagerEventBroadcaster; + /** interface to support settings a menu bar for inplace editing of + components inside OpenOffice.org. + + @deprecated + */ + [optional] interface ::com::sun::star::frame::XInplaceLayout; }; }; }; }; }; diff --git a/offapi/com/sun/star/frame/XInplaceLayout.idl b/offapi/com/sun/star/frame/XInplaceLayout.idl new file mode 100644 index 000000000000..aeeeadda8e08 --- /dev/null +++ b/offapi/com/sun/star/frame/XInplaceLayout.idl @@ -0,0 +1,68 @@ +/* -*- 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef __com_sun_star_frame_XInplaceLayout_idl__ +#define __com_sun_star_frame_XInplaceLayout_idl__ + +#include + +//============================================================================= + +module com { module sun { module star { module frame { + +//============================================================================= + +/** special interface to support inplace editing of components inside + OpenOffice.org. + + @deprecated + + @since OOo 2.0 +*/ + +interface XInplaceLayout : com::sun::star::uno::XInterface +{ + /** sets an inplace menu to the container window of the attached frame. + + @param InplaceMenuBarPointer + must be a VCL menu bar pointer which is accessible within the + layout manager process. + */ + void setInplaceMenuBar( [in] hyper InplaceMenuBarPointer ); + + /** removes an inplace menu and sets back a previously created menu bar if one + has been set before. + */ + void resetInplaceMenuBar(); +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 55d52165df003d253d813f3ea7085f4d89fdb3ce Mon Sep 17 00:00:00 2001 From: Bartolomé Sánchez Salado Date: Sat, 25 Feb 2012 19:34:35 +0100 Subject: Removed unused code. --- offapi/com/sun/star/media/XPlayer.idl | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/media/XPlayer.idl b/offapi/com/sun/star/media/XPlayer.idl index 059a4c9f4104..121b8004fd0f 100644 --- a/offapi/com/sun/star/media/XPlayer.idl +++ b/offapi/com/sun/star/media/XPlayer.idl @@ -77,26 +77,6 @@ interface XPlayer */ double getMediaTime(); - /** sets the time at which to stop reading the stream. - - @param fTime - the time at which to stop reading the stream in seconds - */ - void setStopTime( [in] double fTime ); - - /** gets the time at which the stream will stop. The result - is not guaranteed if no stop time has been set. - */ - double getStopTime(); - - /** sets the speed of the stream reading relatively to the normal - speed. - - @param fRate - the stream reading rate. 1.0 means normal speed. - */ - void setRate( [in] double fRate ); - /** gets the speed of the stream reading relatively to the normal reading. -- cgit From 30a7a6189916396c7c2ee9bbd5861ad19bf7724c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 2 Mar 2012 18:58:33 +0100 Subject: Document how to incompatibly change udkapi/offapi --- offapi/type_reference/typelibrary_history.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'offapi') diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index a678ca7d6a7d..963b555616dd 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -1,3 +1,22 @@ +Example of updating an incompatibly-changed type in the accompanying types.rdb: + +.../core> mkdir tmp +.../core> LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \ + solver/unxlngx6/bin/regmerge tmp/out1.rdb /UCR \ + workdir/unxlngx6/UnoApiPartTarget/udkapi/com/sun/star/script/Converter.urd +.../core> LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \ + solver/unxlngx6/bin/regmerge tmp/out2.rdb / offapi/type_reference/types.rdb \ + tmp/out1.rdb +.../core> diff <(LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \ + solver/unxlngx6/bin/regview offapi/type_reference/types.rdb) \ + <(LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib solver/unxlngx6/bin/regview \ + tmp/out2.rdb) # sanity check +.../core> mv tmp/out2.rdb offapi/type_reference/types.rdb +.../core> rm -rf tmp + + + + 07/07/2004 (SB): BugID=i29741 Reference registries for the OOo 2.0 branch copied from the OOo 1.1 branch: OO_20/types.rdb <- OO_11/types.rdb 1.6 @@ -165,3 +184,5 @@ 01/28/11 (JSC): TaskID=116682 Update css.awt.UnoControlDialog to reflect the supported XDialog2 interface additionally to XDialog + +For later changes, consult the git log of the accompanying types.rdb file. -- cgit From 6f04bf5e90ff75288dcf75c43843edf798641e3d Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 8 Mar 2012 18:50:59 +0100 Subject: SvxULSpaceItem: implement contextual spacing --- offapi/com/sun/star/style/ParagraphProperties.idl | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'offapi') diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl b/offapi/com/sun/star/style/ParagraphProperties.idl index ce770eee1d79..885f320e6c7b 100644 --- a/offapi/com/sun/star/style/ParagraphProperties.idl +++ b/offapi/com/sun/star/style/ParagraphProperties.idl @@ -152,6 +152,15 @@ published service ParagraphProperties */ [property] long ParaBottomMargin; + /** determines if contextual spacing is used. + + @since LibreOffice 3.6 + +

If true, the top and bottom margins of the paragraph should not be + applied when the previous and next paragraphs have the same style.

+ */ + [optional, property] boolean ParaContextMargin; + //------------------------------------------------------------------------- /** determines if the paragraph is included in the -- cgit From 3f89190894b056639e9a323ebffe7a2e20ad4dc4 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Mar 2012 19:55:21 +0100 Subject: Make Converter service new-style, for easier use --- offapi/type_reference/types.rdb | Bin 7307264 -> 7291392 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'offapi') diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index c12270b17c05..19ad36b394c7 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ -- cgit From d4b67611c421ebe9b75284106fe389b434419961 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 16 Mar 2012 11:16:14 +0100 Subject: Introduced SystemShellExecuteFlags::URIS_ONLY --- offapi/com/sun/star/system/SystemShellExecuteFlags.idl | 6 ++++++ offapi/com/sun/star/system/XSystemShellExecute.idl | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl index ec33586a026e..be6991f912d6 100644 --- a/offapi/com/sun/star/system/SystemShellExecuteFlags.idl +++ b/offapi/com/sun/star/system/SystemShellExecuteFlags.idl @@ -48,6 +48,12 @@ published constants SystemShellExecuteFlags method XSystemShellExecute::execute() fails. */ const long NO_SYSTEM_ERROR_MESSAGE = 1; + + /** Only allows opening of absolute URI references. + + @since LibreOffice 3.6 + */ + const long URIS_ONLY = 2; }; //============================================================================= diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl index 0b3e1aadc4ec..d39a627de92e 100644 --- a/offapi/com/sun/star/system/XSystemShellExecute.idl +++ b/offapi/com/sun/star/system/XSystemShellExecute.idl @@ -65,8 +65,10 @@ published interface XSystemShellExecute: com::sun::star::uno::XInterface avoid showing system error messages, in case of failures, etc. @throws com::sun::star::lang::IllegalArgumentException - when the specified flags are wrong or exclude each other. -. + when the specified flags are wrong or exclude each other; also thrown, + with an ArgumentPosition of 0, when nFlags contains URIS_ONLY and + aCommand is not an absolute URI reference + @throws com::sun::star::sys::SystemExecuteException in the case of errors when trying to executed the specified command. -- cgit From a277042e3e273d3d650eb47663f65964cb0b40e3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 16 Mar 2012 16:38:20 +0100 Subject: Some include and comment clean up --- offapi/com/sun/star/system/XSystemShellExecute.idl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/system/XSystemShellExecute.idl b/offapi/com/sun/star/system/XSystemShellExecute.idl index d39a627de92e..14a8326148c2 100644 --- a/offapi/com/sun/star/system/XSystemShellExecute.idl +++ b/offapi/com/sun/star/system/XSystemShellExecute.idl @@ -29,7 +29,6 @@ #ifndef __com_sun_star_system_XSystemShellExecute_idl__ #define __com_sun_star_system_XSystemShellExecute_idl__ -#include #include #include #include @@ -69,7 +68,7 @@ published interface XSystemShellExecute: com::sun::star::uno::XInterface with an ArgumentPosition of 0, when nFlags contains URIS_ONLY and aCommand is not an absolute URI reference - @throws com::sun::star::sys::SystemExecuteException + @throws com::sun::star::system::SystemShellExecuteException in the case of errors when trying to executed the specified command. @see com::sun::star::system::SystemShellExecuteFlags -- cgit From ba8a429a2e062879d1d6641e22838928da1d8573 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 21 Mar 2012 16:30:28 +0100 Subject: Clarify example --- offapi/type_reference/typelibrary_history.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'offapi') diff --git a/offapi/type_reference/typelibrary_history.txt b/offapi/type_reference/typelibrary_history.txt index 963b555616dd..0f7c616777a5 100644 --- a/offapi/type_reference/typelibrary_history.txt +++ b/offapi/type_reference/typelibrary_history.txt @@ -1,4 +1,5 @@ -Example of updating an incompatibly-changed type in the accompanying types.rdb: +Example of updating an incompatibly-changed type (com.sun.star.script.Converter, +in this example) in the accompanying types.rdb: .../core> mkdir tmp .../core> LD_LIBRARY_PATH=.../core/solver/unxlngx6/lib \ -- cgit From e4d9dabce80e7823bcdf28f06a99c83a2950d8c7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 26 Mar 2012 15:05:46 +0200 Subject: fdo#46808, Adapt UNO serviecs to new style, Part 1 Convert the IDL files in the udkapi module, and update the types.rdb database. Signed-off-by: Stephan Bergmann --- offapi/type_reference/types.rdb | Bin 7291392 -> 7292416 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'offapi') diff --git a/offapi/type_reference/types.rdb b/offapi/type_reference/types.rdb index 19ad36b394c7..8e35e759b2b4 100644 Binary files a/offapi/type_reference/types.rdb and b/offapi/type_reference/types.rdb differ -- cgit From 74b274602a5a76b949f6d1a521b343688693090b Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Tue, 27 Mar 2012 20:42:51 +0200 Subject: add interface XDumper for qa/automated testing --- offapi/UnoApi_offapi.mk | 3 ++ offapi/com/sun/star/modules.idl | 3 ++ offapi/com/sun/star/qa/XDumper.idl | 65 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 offapi/com/sun/star/qa/XDumper.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1220adc1734a..f9aee0738346 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -3007,6 +3007,9 @@ $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/resource,\ XStringResourceWithLocation \ XStringResourceWithStorage \ )) +$(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/qa,\ + XDumper \ +)) $(eval $(call gb_UnoApiTarget_add_idlfiles,offapi,offapi/com/sun/star/scanner,\ ScanError \ ScannerContext \ diff --git a/offapi/com/sun/star/modules.idl b/offapi/com/sun/star/modules.idl index 6ef7dca55d37..421d4c7e9235 100644 --- a/offapi/com/sun/star/modules.idl +++ b/offapi/com/sun/star/modules.idl @@ -142,6 +142,9 @@ module rendering {}; /// Interfaces to access (UI) resource files. module resource {}; +/// Interfaces for QA and automated tests +module qa {}; + /// Interfaces for scanner control. module scanner {}; diff --git a/offapi/com/sun/star/qa/XDumper.idl b/offapi/com/sun/star/qa/XDumper.idl new file mode 100644 index 000000000000..4eebb030b55f --- /dev/null +++ b/offapi/com/sun/star/qa/XDumper.idl @@ -0,0 +1,65 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Markus Mohrhard (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef com_sun_star_qa_XDumper_idl +#define com_sun_star_qa_XDumper_idl + +#include + +module com +{ +module sun +{ +module star +{ +module qa +{ + +/** + * Dumps the content into a string. + * This is an internal interface and should not be used outside of Libreoffice source code + */ +interface XDumper : com::sun::star::uno::XInterface +{ + /** + * dump the content into a string + * @since LibreOffice 3.6 + */ + + string dump(); +}; + +} ; // chart2 +} ; // com +} ; // sun +} ; // star + + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit From 78278561130a3faab44472831bfccc074a0e8194 Mon Sep 17 00:00:00 2001 From: Laurent Godard Date: Wed, 28 Mar 2012 17:00:53 +0200 Subject: document queryContentCells limitation add also a missing

in previous paragraph --- offapi/com/sun/star/sheet/XCellRangesQuery.idl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl index f35eec799c5a..a44cc701fafc 100644 --- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl +++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl @@ -76,7 +76,12 @@ published interface XCellRangesQuery: com::sun::star::uno::XInterface

Attention: Despite the CellFlags flags are long values, this method expects a short - parameter. + parameter.

+ +

Attention: Empty cells in the range are not analyzed.Some + CellFlags may not be fully honored. For instance, + when querying for STYLES, the returned ranges may not include empty + cells with styles applied.

@returns all cells of the current cell range(s) with the specified -- cgit From 484b44b39bc2788160f475c3b40ce6b569fdc6cb Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Wed, 28 Mar 2012 14:12:31 -0400 Subject: Changed some wording. --- offapi/com/sun/star/sheet/XCellRangesQuery.idl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'offapi') diff --git a/offapi/com/sun/star/sheet/XCellRangesQuery.idl b/offapi/com/sun/star/sheet/XCellRangesQuery.idl index a44cc701fafc..35bb83132267 100644 --- a/offapi/com/sun/star/sheet/XCellRangesQuery.idl +++ b/offapi/com/sun/star/sheet/XCellRangesQuery.idl @@ -78,10 +78,10 @@ published interface XCellRangesQuery: com::sun::star::uno::XInterface long values, this method expects a short parameter.

-

Attention: Empty cells in the range are not analyzed.Some - CellFlags may not be fully honored. For instance, - when querying for STYLES, the returned ranges may not include empty - cells with styles applied.

+

Attention: Empty cells in the range may be skipped depending on + the content flag used. For instance, when querying for STYLES, + the returned ranges may not include empty cells even if styles are + applied to those cells.

@returns all cells of the current cell range(s) with the specified -- cgit