summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-19 18:27:10 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-19 19:14:18 +0200
commit63a66e57870832dc17b64f40eefcbe5482c1c54e (patch)
treece873c956127fd2951fc70087dbe651bfc0bb2af
parent74f249ffefc1e87cf48843f48e313c9355bf8a80 (diff)
SetSalColor() and GetSalColor() are unused
Change-Id: I1d33abe2e2ccb6d62895da70da89fbbaa0c3b426
-rw-r--r--vcl/Library_vcl.mk1
-rw-r--r--vcl/aqua/source/gdi/atsui/salgdi.cxx1
-rw-r--r--vcl/aqua/source/gdi/salcolorutils.cxx42
-rw-r--r--vcl/inc/aqua/salcolorutils.hxx45
-rw-r--r--vcl/inc/aqua/salvd.h1
-rw-r--r--vcl/inc/ios/salcolorutils.hxx37
-rw-r--r--vcl/inc/ios/salvd.h1
7 files changed, 0 insertions, 128 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a63a5232ca7c..b176fd5e8032 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -444,7 +444,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/aqua/source/dtrans/aqua_clipboard \
vcl/aqua/source/dtrans/service_entry \
vcl/quartz/salbmp \
- vcl/aqua/source/gdi/salcolorutils \
vcl/aqua/source/gdi/salgdicommon \
vcl/aqua/source/gdi/salgdiutils \
vcl/aqua/source/gdi/salmathutils \
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index af86b28644a8..9c9eb9d0fe0f 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -37,7 +37,6 @@
#include "aqua/atsui/salgdi.h"
#include "aqua/salframe.h"
-#include "aqua/salcolorutils.hxx"
#include "aqua/atsui/salatsuifontutils.hxx"
#include "fontsubset.hxx"
diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
deleted file mode 100644
index 7cfaa14cae8a..000000000000
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- 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 http://mozilla.org/MPL/2.0/.
- *
- * 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 http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include "vcl/salbtype.hxx"
-
-#include "aqua/salcolorutils.hxx"
-
-// =======================================================================
-
-SalColor GetSalColor( const float* pQuartzColor )
-{
- return MAKE_SALCOLOR( sal_uInt8( pQuartzColor[0] * 255.0), sal_uInt8( pQuartzColor[1] * 255.0 ), sal_uInt8( pQuartzColor[2] * 255.0 ) );
-}
-
-void SetSalColor( const SalColor& rColor, float* pQuartzColor )
-{
- pQuartzColor[0] = (float) SALCOLOR_RED(rColor) / 255.0;
- pQuartzColor[1] = (float) SALCOLOR_GREEN(rColor) / 255.0;
- pQuartzColor[2] = (float) SALCOLOR_BLUE(rColor) / 255.0;
- pQuartzColor[3] = 1.0;
-}
-
-// =======================================================================
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salcolorutils.hxx b/vcl/inc/aqua/salcolorutils.hxx
deleted file mode 100644
index bba70e2062c5..000000000000
--- a/vcl/inc/aqua/salcolorutils.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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 http://mozilla.org/MPL/2.0/.
- *
- * 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 http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SV_SALCOLORUTILS_HXX
-#define _SV_SALCOLORUTILS_HXX
-
-#ifndef _LIMITS_H
- #include <limits.h>
-#endif
-
-#include "premac.h"
-#include <ApplicationServices/ApplicationServices.h>
-#include "postmac.h"
-
-#include "vcl/salbtype.hxx"
-#include "vcl/salgtype.hxx"
-#include "salmathutils.hxx"
-
-// ------------------------------------------------------------------
-
-SalColor GetSalColor( const float* pQuartzColor );
-
-void SetSalColor( const SalColor& rColor, float* pQuartzColor );
-
-// ------------------------------------------------------------------
-
-#endif // _SV_SALCOLORUTILS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salvd.h b/vcl/inc/aqua/salvd.h
index 987636fd896f..51f5d4112a73 100644
--- a/vcl/inc/aqua/salvd.h
+++ b/vcl/inc/aqua/salvd.h
@@ -24,7 +24,6 @@
#include <ApplicationServices/ApplicationServices.h>
#include "postmac.h"
-#include "aqua/salcolorutils.hxx"
#include "aqua/salgdi.h"
#include "salvd.hxx"
diff --git a/vcl/inc/ios/salcolorutils.hxx b/vcl/inc/ios/salcolorutils.hxx
deleted file mode 100644
index a66c9fae321d..000000000000
--- a/vcl/inc/ios/salcolorutils.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- 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 http://mozilla.org/MPL/2.0/.
- *
- * 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 http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _SV_SALCOLORUTILS_HXX
-#define _SV_SALCOLORUTILS_HXX
-
-#include "vcl/salbtype.hxx"
-#include "vcl/salgtype.hxx"
-#include "salmathutils.hxx"
-
-// ------------------------------------------------------------------
-
-SalColor GetSalColor( const float* pQuartzColor );
-
-void SetSalColor( const SalColor& rColor, float* pQuartzColor );
-
-// ------------------------------------------------------------------
-
-#endif // _SV_SALCOLORUTILS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/ios/salvd.h b/vcl/inc/ios/salvd.h
index 792b9d6d8732..83c9d4544d94 100644
--- a/vcl/inc/ios/salvd.h
+++ b/vcl/inc/ios/salvd.h
@@ -20,7 +20,6 @@
#ifndef _SV_SALVD_H
#define _SV_SALVD_H
-#include "ios/salcolorutils.hxx"
#include "coretext/salgdi.h"
#include "salvd.hxx"