1 files changed, 20 insertions, 33 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index d45e057e1e76..8259d59fb065 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -1,31 +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.
- * Copyright 2010 Miklos Vajna.
+ * 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 "rtfexportfilter.hxx"
 #include "rtfsdrexport.hxx"
@@ -835,24 +825,21 @@ sal_uInt16 RtfExport::GetColor( const Color& rColor ) const
 void RtfExport::InsColor( const Color& rCol )
 {
     sal_uInt16 n;
-    bool bContainsAuto = false;
+    bool bAutoColorInTable = false;
     for (RtfColorTbl::iterator it=m_aColTbl.begin() ; it != m_aColTbl.end(); ++it )
         if ((*it).second == rCol)
             return; // Already in the table
         else if ((*it).second == COL_AUTO)
-            bContainsAuto = true;
+            bAutoColorInTable = true;
     if (rCol.GetColor() == COL_AUTO)
+        // COL_AUTO gets value 0
         n = 0;
     else
     {
+        // other colors get values >0
         n = m_aColTbl.size();
-        // Fix for the case when first a !COL_AUTO gets inserted as #0, then
-        // gets overwritten by COL_AUTO
-        if (!n)
-            n++;
-
-        // Fix the case where the table doesn't contain the COL_AUTO at #0
-        else if (!bContainsAuto)
+        if (!bAutoColorInTable)
+            // reserve value "0" for COL_AUTO (if COL_AUTO wasn't inserted until now)
             n++;
     }
     m_aColTbl.insert(std::pair<sal_uInt16,Color>( n, rCol ));