path: root/svx/source/tbxctrls/colorwindow.hxx
diff options
authorMichael Meeks <>2012-11-21 22:06:52 +0000
committerMichael Meeks <>2012-11-27 12:55:10 +0000
commit0a063f3a36eaf7b90ab6a5cd5b2ad6a63ce9742c (patch)
treeb371e874cd9909f48bfed8cb1ae1c2d190d51c3b /svx/source/tbxctrls/colorwindow.hxx
parentb13e1d306e3302b23745b91d291f023f94613f31 (diff)
re-base on ALv2 code. Includes:
Patch contributed by Christian Lippka impress212: #i113063# patch: dubios self assign in svx/source/dialog/framelink.cxx Patches contributed by Mathias Bauer gnumake4 work variously cws mba34issues01: #i117712#: fix several resource errors introduced by IAccessible2 implementation cws mba34issues01: #i117719#: use correct resource ID Patch contributed by Andre Fischer Do not add targets for junit tests when junit is disabled. Patches contributed by Armin Le-Grand #118804# corrected GraphicExporter behaviour on shortcut when pixel graphic is requested fix for #118525#: Using primitives for chart sub-geometry visualisation #118485# - Styles for OLEs are not saved. #118524: apply patch, followup fixes to 118485 13f79535-47bb-0310-9956-ffa450edef68 Patch contributed by Regina Henschel linecap: Reintegrating finished LineCap feature Patch contributed by Wang Lei (leiw) #i118760# split the first table cell vertically, then undo&redo, the Presentation app will crash cleanup globlmn hacks, undo dependent fixmes.
Diffstat (limited to 'svx/source/tbxctrls/colorwindow.hxx')
1 files changed, 18 insertions, 0 deletions
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 5de812f2becd..a08ba91a05a0 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -1,4 +1,22 @@
/* -*- 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
+ *
+ * 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 .
+ */
// class SvxColorWindow_Impl --------------------------------------------------