diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-21 22:06:52 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-27 12:55:10 +0000 |
| commit | 0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c (patch) | |
| tree | b371e874cd9909f48bfed8cb1ae1c2d190d51c3b /svx/source/table/tablerow.cxx | |
| parent | b13e1d306e3302b23745b91d291f023f94613f31 (diff) | |
re-base on ALv2 code. Includes:
Patch contributed by Christian Lippka
impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx
http://svn.apache.org/viewvc?view=revision&revision=1167619
Patches contributed by Mathias Bauer
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
cws mba34issues01: #i117712#: fix several resource errors introduced by
IAccessible2 implementation
http://svn.apache.org/viewvc?view=revision&revision=1172343
cws mba34issues01: #i117719#: use correct resource ID
http://svn.apache.org/viewvc?view=revision&revision=1172351
Patch contributed by Andre Fischer
Do not add targets for junit tests when junit is disabled.
http://svn.apache.org/viewvc?view=revision&revision=1241508
Patches contributed by Armin Le-Grand
#118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested
http://svn.apache.org/viewvc?view=revision&revision=1240195
fix for #118525#: Using primitives for chart sub-geometry visualisation
http://svn.apache.org/viewvc?view=revision&revision=1226879
#118485# - Styles for OLEs are not saved.
http://svn.apache.org/viewvc?view=revision&revision=1182166
#118524: apply patch, followup fixes to 118485
http://svn.apache.org/viewvc?view=revision&revision=1186077 13f79535-47bb-0310-9956-ffa450edef68
Patch contributed by Regina Henschel
linecap: Reintegrating finished LineCap feature
http://svn.apache.org/viewvc?view=revision&revision=1232507
Patch contributed by Wang Lei (leiw)
#i118760# split the first table cell vertically, then undo&redo,
the Presentation app will crash
http://svn.apache.org/viewvc?view=revision&revision=1301361
cleanup globlmn hacks, undo dependent fixmes.
Diffstat (limited to 'svx/source/table/tablerow.cxx')
| -rw-r--r-- | svx/source/table/tablerow.cxx | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 2890a8b35176..7810acd5f7f2 100644 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx @@ -1,30 +1,21 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* +/* + * This file is part of the LibreOffice project. * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * 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/. * - * Copyright 2000, 2010 Oracle and/or its affiliates. + * This file incorporates work covered by the following license notice: * - * 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. - * - ************************************************************************/ + * 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 . + */ #include <com/sun/star/lang/DisposedException.hpp> |