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/AllLangResTarget_textconversiondlgs.mk | |
parent | Revert "sb140: #i114718# avoid references to object across XAggregation::setD... (diff) | |
download | core-0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c.tar.gz core-0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c.zip |
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/AllLangResTarget_textconversiondlgs.mk')
-rw-r--r-- | svx/AllLangResTarget_textconversiondlgs.mk | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk index 981f34ade777..e40c8f483c30 100644 --- a/svx/AllLangResTarget_textconversiondlgs.mk +++ b/svx/AllLangResTarget_textconversiondlgs.mk @@ -1,30 +1,21 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# 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 is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# 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. +# 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 . # -# 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. -# -#************************************************************************* $(eval $(call gb_AllLangResTarget_AllLangResTarget,textconversiondlgs)) |