svx/Library_svx.mk|6
svx/source/accessibility/DGColorNameLookUp.cxx| 140 --
svx/source/accessibility/DescriptionGenerator.cxx |4
svx/source/accessibility/lookupcolorname.cxx | 134 +
svx/source/accessibility/lookupcolorname.hxx | 66 ++
svx/source/inc/DGColorNameLookUp.hxx | 92 --
6 files changed, 205 insertions(+), 237 deletions(-)
New commits:
commit cce442bc139b93ec4263173d26cdd94dbbf5f3b0
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Sep 30 19:43:09 2011 +0200
Cleaned up DGColorNameLookUp.
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index ddc8f58..3754d8b 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -85,15 +85,15 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/accessibility/AccessibleShapeTreeInfo \
svx/source/accessibility/AccessibleTextEventQueue \
svx/source/accessibility/AccessibleTextHelper \
-svx/source/accessibility/charmapacc \
svx/source/accessibility/ChildrenManager \
svx/source/accessibility/ChildrenManagerImpl \
svx/source/accessibility/DescriptionGenerator \
-svx/source/accessibility/DGColorNameLookUp \
svx/source/accessibility/GraphCtlAccessibleContext \
svx/source/accessibility/ShapeTypeHandler \
-svx/source/accessibility/svxrectctaccessiblecontext \
svx/source/accessibility/SvxShapeTypes \
+svx/source/accessibility/charmapacc \
+svx/source/accessibility/lookupcolorname \
+svx/source/accessibility/svxrectctaccessiblecontext \
svx/source/customshapes/EnhancedCustomShape3d \
svx/source/customshapes/EnhancedCustomShapeEngine \
svx/source/customshapes/EnhancedCustomShapeFontWork \
diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx
b/svx/source/accessibility/DGColorNameLookUp.cxx
deleted file mode 100644
index ca67301..000
--- a/svx/source/accessibility/DGColorNameLookUp.cxx
+++ /dev/null
@@ -1,140 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * 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.
- *
- /
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include precompiled_svx.hxx
-#include DGColorNameLookUp.hxx
-#include com/sun/star/container/XNameContainer.hpp
-#include com/sun/star/container/XNameAccess.hpp
-#include com/sun/star/lang/XMultiServiceFactory.hpp
-#include comphelper/processfactory.hxx
-#include osl/mutex.hxx
-#include vcl/svapp.hxx
-
-
-using ::rtl::OUString;
-using namespace ::com::sun::star;
-
-namespace accessibility {
-
-namespace
-{
-class theDGColorNameLookUp
-: public rtl::Static DGColorNameLookUp, theDGColorNameLookUp
-{
-};
-}
-
-DGColorNameLookUp DGColorNameLookUp::Instance()
-{
-return theDGColorNameLookUp::get();
-}
-
-OUString DGColorNameLookUp::LookUpColor (long int nColor) const
-{
-OUString sColorName;
-tColorValueToNameMap::const_iterator I;
-I = maColorValueToNameMap.find (nColor);
-if (I != maColorValueToNameMap.end())
-// Found the color value. Return the associated name.
-sColorName = I-second;
-else
-{
-// Did not find the given color. Append its rgb tuple to the
-// description.
-::rtl::OUStringBuffer sNameBuffer;
-sNameBuffer.append (sal_Unicode('#'));
-sNameBuffer.append (nColor, 16);
-sColorName = sNameBuffer.makeStringAndClear();
-}
-return sColorName;
-}
-
-
-
-
-DGColorNameLookUp::DGColorNameLookUp()
-{
-uno::SequenceOUString aNames;
-uno::Referencecontainer::XNameAccess xNA;
-
-try
-{
-// Create color table in which to look up the given color.
-uno::Referencecontainer::XNameContainer xColorTable (
-
