From e022c608fd927bfec20bdec5bee5b600668eeaac Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 27 Nov 2013 14:07:59 +0000 Subject: XAccessibleGetAccFlowTo is missing and there's a strange stray ifdef in MSAAService.idl add mode-lines and remove unnecessary headerguard etc Change-Id: I072960ac073b2c33d7d820e7dbfe02145685d3f3 --- offapi/UnoApi_offapi.mk | 1 + .../sun/star/accessibility/AccessibleEventId.idl | 2 - offapi/com/sun/star/accessibility/MSAAService.idl | 35 ++++++++--------- .../XAccessibleExtendedAttributes.idl | 39 ++++++++----------- .../star/accessibility/XAccessibleGetAccFlowTo.idl | 38 ++++++++++++++++++ .../accessibility/XAccessibleGroupPosition.idl | 39 ++++++++----------- .../accessibility/XAccessibleTableSelection.idl | 39 ++++++++----------- .../accessibility/XAccessibleTextSelection.idl | 45 ++++++++-------------- offapi/com/sun/star/accessibility/XMSAAService.idl | 36 ++++++++--------- 9 files changed, 141 insertions(+), 133 deletions(-) create mode 100644 offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl (limited to 'offapi') diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index a1ad8314aa62..41e8ea6d834d 100755 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -1621,6 +1621,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/accessibility,\ XAccessibleEventListener \ XAccessibleExtendedAttributes \ XAccessibleExtendedComponent \ + XAccessibleGetAccFlowTo \ XAccessibleGroupPosition \ XAccessibleHyperlink \ XAccessibleHypertext \ diff --git a/offapi/com/sun/star/accessibility/AccessibleEventId.idl b/offapi/com/sun/star/accessibility/AccessibleEventId.idl index efafc1ae329b..7e31996da099 100644 --- a/offapi/com/sun/star/accessibility/AccessibleEventId.idl +++ b/offapi/com/sun/star/accessibility/AccessibleEventId.idl @@ -373,7 +373,6 @@ constants AccessibleEventId */ const short LISTBOX_ENTRY_COLLAPSED = 33; - //IAccessibility2 Implementation 2009----- const short ACTIVE_DESCENDANT_CHANGED_NOFOCUS = 34; const short SELECTION_CHANGED_ADD =35; const short SELECTION_CHANGED_REMOVE =36; @@ -381,7 +380,6 @@ constants AccessibleEventId const short PAGE_CHANGED =38; const short SECTION_CHANGED =39; const short COLUMN_CHANGED =40; - //-----IAccessibility2 Implementation 2009 }; }; }; }; }; diff --git a/offapi/com/sun/star/accessibility/MSAAService.idl b/offapi/com/sun/star/accessibility/MSAAService.idl index f71854b86e6c..5d59596ae272 100644 --- a/offapi/com/sun/star/accessibility/MSAAService.idl +++ b/offapi/com/sun/star/accessibility/MSAAService.idl @@ -1,24 +1,21 @@ -/************************************************************** +/* -*- 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_accessibility_Accessible_idl__ #define __com_sun_star_accessibility_Accessible_idl__ @@ -31,3 +28,5 @@ service MSAAService: XMSAAService; }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl b/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl index e9fd849b26f0..11eb963273f3 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleExtendedAttributes.idl @@ -1,33 +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_accessibility_XAccessibleAttribute_idl__ #define __com_sun_star_accessibility_XAccessibleAttribute_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include -#endif -#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ #include -#endif module com { module sun { module star { module accessibility { @@ -40,3 +33,5 @@ interface XAccessibleExtendedAttributes : ::com::sun::star::uno::XInterface }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl b/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl new file mode 100644 index 000000000000..0ac0f94d9ab9 --- /dev/null +++ b/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.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_accessibility_XAccessibleGetAccFlowTo_idl_ +#define __com_sun_star_accessibility_XAccessibleGetAccFlowTo_idl_ + +#include + +module com { module sun { module star { module accessibility { + +// !!! +// MT: When integrating this, interface and method names should be renamed somehow. Of course, file name also need to change then... +// !!! +interface XAccessibleGetAccFlowTo : ::com::sun::star::uno::XInterface +{ + sequence get_AccFlowTo([in] any aXShape, [in] long nType); +}; + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl b/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl index 5a77d3ab9266..1c2ca50b75d9 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleGroupPosition.idl @@ -1,33 +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_accessibility_XAccessibleGroupPosition_idl__ #define __com_sun_star_accessibility_XAccessibleGroupPosition_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include -#endif -#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ #include -#endif module com { module sun { module star { module accessibility { @@ -43,3 +36,5 @@ interface XAccessibleGroupPosition : ::com::sun::star::uno::XInterface }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl index 4b8f43ef5fc1..a5b3d2f26bc9 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleTableSelection.idl @@ -1,33 +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_accessibility_XAccessibleTableSelection_idl__ #define __com_sun_star_accessibility_XAccessibleTableSelection_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include -#endif -#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ #include -#endif module com { module sun { module star { module accessibility { @@ -45,3 +38,5 @@ interface XAccessibleTableSelection : ::com::sun::star::uno::XInterface }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl b/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl index ed0735be2d49..ecc61e721c21 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleTextSelection.idl @@ -1,42 +1,29 @@ -/************************************************************** +/* -*- 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_accessibility_XAccessibleTextSelection_idl__ #define __com_sun_star_accessibility_XAccessibleTextSelection_idl__ -#ifndef __com_sun_star_uno_XInterface_idl__ #include -#endif -#ifndef __com_sun_star_awt_Point_idl__ #include -#endif -#ifndef __com_sun_star_awt_Rectangle_idl__ #include -#endif -#ifndef __com_sun_star_lang_IndexOutOfBoundsException_idl__ #include -#endif -#ifndef __com_sun_star_lang_IllegalArgumentException_idl__ #include -#endif module com { module sun { module star { module accessibility { @@ -58,3 +45,5 @@ interface XAccessibleTextSelection : ::com::sun::star::uno::XInterface }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/accessibility/XMSAAService.idl b/offapi/com/sun/star/accessibility/XMSAAService.idl index d091dec06468..42b259196485 100644 --- a/offapi/com/sun/star/accessibility/XMSAAService.idl +++ b/offapi/com/sun/star/accessibility/XMSAAService.idl @@ -1,29 +1,25 @@ -/************************************************************** +/* -*- 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_accessibility_XMSAASERVICE_idl__ #define __com_sun_star_accessibility_XMSAASERVICE_idl__ #include -#endif module com { module sun { module star { module accessibility { @@ -46,3 +42,5 @@ interface XMSAAService : ::com::sun::star::lang::XComponent }; }; }; }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3