From 17ff7b41d15ab9928e2e2706faa26234a09802cd Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 12 Nov 2012 17:21:24 +0000 Subject: re-base on ALv2 code. Includes: Patches contributed by: Armin Le Grand. #118558# Correcting OLE attributes of LO3.4 at load time by loading as OOo3.3, details see task. http://svn.apache.org/viewvc?view=revision&revision=1195906 #118485# - Styles for OLEs are not saved. http://svn.apache.org/viewvc?view=revision&revision=1182166 #118898# Adapted ImpGraphic::ImplGetBitmap to correctly convert metafiles http://svn.apache.org/viewvc?view=revision&revision=1293316 #119337# Solves the wrong get/setPropertyValue calls in SvxShapeText (and thus in SvxOle2Shape) http://svn.apache.org/viewvc?view=revision&revision=1344156 Patches contributed by Mathias Bauer (and others) gnumake4 work variously http://svn.apache.org/viewvc?view=revision&revision=1394707 http://svn.apache.org/viewvc?view=revision&revision=1394326 cws mba34issues01: #i117717#: remove wrong assertion http://svn.apache.org/viewvc?view=revision&revision=1172349 Patch contributed by Herbert Duerr goodbye Registration and License dialogs, don't let the door hit you http://svn.apache.org/viewvc?view=revision&revision=1172613 help gcc 4.6.0 on 32bit ubuntu 11.10" http://svn.apache.org/viewvc?view=revision&revision=1245357 Do not add targets for junit tests when junit is disabled. Patch contributed by Andre Fischer http://svn.apache.org/viewvc?view=revision&revision=1241508 Revert "sb140: #i117082# avoid unncessary static class data members commit 21d97438e2944861e26e4984195f959a0cce1e41. remove obsolete FreeBSD visibility special case. retain consolidated BSD bridge code, remove OS/2 pieces. --- framework/source/uielement/toolbarmanager.cxx | 37 ++++++++++----------------- 1 file changed, 14 insertions(+), 23 deletions(-) (limited to 'framework/source/uielement/toolbarmanager.cxx') diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 21d23bdd46dc..2cd1c12ccabc 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.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 - * - * 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 -- cgit ion> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/xmloff/inc/txtfldi.hxx
AgeCommit message (Expand)Author
2014-10-15More -Werror,-Wunused-private-fieldStephan Bergmann
2014-04-15xmloff: sal_Bool->boolNoel Grandin
2014-03-31xmloff: sal_Bool->boolNoel Grandin
2014-03-26First batch of adding SAL_OVERRRIDE to overriding function declarationsStephan Bergmann
2014-03-26Split TYPEINFO into plain and TYPEINFO_OVERRIDEStephan Bergmann
2014-03-13xmloff,vbahelper: prefer passing OUString and OString by referenceNoel Grandin
2014-02-06Typo: atribute(s) -> attribute(s)Julien Nabet
2014-01-08123792: complete annotations on text ranges featureOliver-Rainer Wittmann
2013-12-10xmloff: remove unused XMLTimeFieldImportContext::fTimeValueMichael Stahl
2013-10-23fixincludeguards.sh: xmloffThomas Arnhold
2013-08-31fix indentationPhilipp Riemer
2013-08-31fdo#62475 - remove visual noisePhilipp Riemer
2013-08-20Re-work 8bit characters in source code, or remove them.Michael Meeks
2013-04-07remove needless forward rtl::OUString declarationsLuboš Luňák
2013-04-07mass removal of rtl:: prefixes for O(U)String*Luboš Luňák
2013-02-25fdo#38838,::rtl::OUString_to_OUStringelixir
2012-08-16-Werror,-Wunused-private-field (Clang towards 3.2)Stephan Bergmann
2012-07-20office:annotation-end importMiklos Vajna
2012-07-16xmloff: implement import/export of SwPostItField::aInitialsMiklos Vajna
2012-06-21re-base on ALv2 code.Michael Meeks
2012-01-06Removed unnecessary tools/debug.hxx includes.Marcel Metz
2011-03-29drop bogus executable flag from [ch]xx/bas/asm filesFrancisco Saito
2011-03-12Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Thorsten Behrens
2010-11-10 removetooltypes01: #i112600# resync to DEV300_m92; remove tooltypes from xml...Xiaofei Zhang
2010-10-28add modelines to .hxx files as wellCaolán McNamara
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun Mi...Jens-Heiner Rechtien
2009-10-12#i105687# enable number format for custom date/datetime/time dataos
2008-10-01CWS-TOOLING: integrate CWS swlists02Vladimir Glazounov
2008-04-10INTEGRATION: CWS changefileheader (1.37.42); FILE MERGEDRüdiger Timm
2008-02-19INTEGRATION: CWS notes2 (1.35.56); FILE MERGEDRüdiger Timm
2007-11-26INTEGRATION: CWS customfields (1.35.72); FILE MERGEDIvo Hinkelmann