[Libreoffice-commits] core.git: include/sfx2 include/svl include/svtools include/vcl jvmfwk/source sfx2/source svl/source svtools/source svx/source unusedcode.easy vcl/source vcl/unx vcl/win
Caolán McNamara
caolanm at redhat.com
Thu Dec 4 02:45:09 PST 2014
include/sfx2/sidebar/EnumContext.hxx | 3
include/svl/currencytable.hxx | 2
include/svl/zforlist.hxx | 13 --
include/svtools/valueset.hxx | 2
include/vcl/settings.hxx | 6 -
jvmfwk/source/elements.cxx | 28 ----
jvmfwk/source/elements.hxx | 7 -
jvmfwk/source/framework.cxx | 10 -
jvmfwk/source/framework.hxx | 1
jvmfwk/source/fwkutil.cxx | 79 -------------
jvmfwk/source/fwkutil.hxx | 17 --
jvmfwk/source/libxmlutil.cxx | 5
jvmfwk/source/libxmlutil.hxx | 3
sfx2/source/sidebar/EnumContext.cxx | 19 ---
svl/source/numbers/currencytable.cxx | 10 -
svl/source/numbers/zforlist.cxx | 17 --
svtools/source/control/valueset.cxx | 9 -
svx/source/sidebar/ColorPanel.cxx | 204 -----------------------------------
unusedcode.easy | 12 +-
vcl/source/app/settings.cxx | 34 -----
vcl/unx/kde/salnativewidgets-kde.cxx | 8 -
vcl/unx/kde4/KDESalFrame.cxx | 3
vcl/win/source/window/salframe.cxx | 1
23 files changed, 11 insertions(+), 482 deletions(-)
New commits:
commit f4d03933dc764139dc1e40fe6985a3cac090216e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Dec 4 09:27:12 2014 +0000
callcatcher: update unused code
Change-Id: Ia25b857738bb7b6c3baf18c68ef0d1bc0b3e142e
diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx
index 4cd58bd..2918537 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -119,11 +119,8 @@ public:
*/
sal_Int32 GetCombinedContext_DI(void) const;
- const ::rtl::OUString& GetApplicationName (void) const;
Application GetApplication_DI (void) const;
- const ::rtl::OUString& GetContextName (void) const;
-
bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther);
diff --git a/include/svl/currencytable.hxx b/include/svl/currencytable.hxx
index 940a584..ed2e5f4 100644
--- a/include/svl/currencytable.hxx
+++ b/include/svl/currencytable.hxx
@@ -23,9 +23,7 @@ public:
typedef DataType::const_iterator const_iterator;
iterator begin();
- iterator end();
const_iterator begin() const;
- const_iterator end() const;
NfCurrencyEntry& operator[] ( size_t i );
const NfCurrencyEntry& operator[] ( size_t i ) const;
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index 7ada1b5..8d5b9fc 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -255,8 +255,6 @@ public:
sal_Unicode cZero );
~NfCurrencyEntry() {}
- NfCurrencyEntry* Clone() const;
-
/// Symbols and language identical
bool operator==( const NfCurrencyEntry& r ) const;
@@ -304,11 +302,6 @@ public:
static inline sal_Unicode GetEuroSymbol() { return sal_Unicode(0x20AC); }
};
-inline NfCurrencyEntry* new_clone( const NfCurrencyEntry& r )
-{
- return r.Clone();
-}
-
typedef std::vector< OUString > NfWSStringsDtor;
class SvNumberFormatterRegistry_Impl;
@@ -642,8 +635,6 @@ public:
/// DEPRECATED: Return first character of the decimal separator of the current language/country
sal_Unicode GetDecSep() const;
- /// Return the decimal separator of the current language/country
- OUString GetDecimalSep() const;
/// Return the decimal separator matching the locale of the given format
OUString GetFormatDecimalSep( sal_uInt32 nFormat ) const;
@@ -921,10 +912,6 @@ public:
// return corresponding Transliteration wrapper
const ::utl::TransliterationWrapper* GetTransliteration() const;
- // return corresponding Transliteration wrapper with loadModuleByImplName()
- const ::utl::TransliterationWrapper* GetTransliterationForModule(
- const OUString& rModule, LanguageType eLang ) const;
-
// return the corresponding CharacterClassification wrapper
const CharClass* GetCharClass() const;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 4ddc64d..10db4d5 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -308,8 +308,6 @@ public:
void InsertItem( sal_uInt16 nItemId, const Image& rImage,
size_t nPos = VALUESET_APPEND );
- void InsertItem( sal_uInt16 nItemId, const Color& rColor,
- size_t nPos = VALUESET_APPEND );
void InsertItem( sal_uInt16 nItemId,
const Image& rImage, const OUString& rStr,
size_t nPos = VALUESET_APPEND );
diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 9650828..5873c8e3 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -278,9 +278,6 @@ public:
void SetActiveColor( const Color& rColor );
const Color& GetActiveColor() const;
- void SetActiveColor2( const Color& rColor );
- const Color& GetActiveColor2() const;
-
void SetActiveTextColor( const Color& rColor );
const Color& GetActiveTextColor() const;
@@ -290,9 +287,6 @@ public:
void SetDeactiveColor( const Color& rColor );
const Color& GetDeactiveColor() const;
- void SetDeactiveColor2( const Color& rColor );
- const Color& GetDeactiveColor2() const;
-
void SetDeactiveTextColor( const Color& rColor );
const Color& GetDeactiveTextColor() const;
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index a1c5aa9..b89ea9a 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -644,29 +644,6 @@ void NodeJava::setVmParameters(rtl_uString * * arOptions, sal_Int32 size)
}
}
-void NodeJava::setJRELocations(rtl_uString * * arLocations, sal_Int32 size)
-{
- OSL_ASSERT( !(arLocations == 0 && size != 0));
- if (! m_JRELocations)
- m_JRELocations = boost::optional<std::vector<OUString> > (
- std::vector<OUString>());
- m_JRELocations->clear();
- if (arLocations != NULL)
- {
- for (int i = 0; i < size; i++)
- {
- const OUString & sLocation = static_cast<rtl_uString*>(arLocations[i]);
-
- //only add the path if not already present
- std::vector<OUString>::const_iterator it =
- std::find(m_JRELocations->begin(), m_JRELocations->end(),
- sLocation);
- if (it == m_JRELocations->end())
- m_JRELocations->push_back(sLocation);
- }
- }
-}
-
void NodeJava::addJRELocation(rtl_uString * sLocation)
{
OSL_ASSERT( sLocation);
@@ -681,11 +658,6 @@ void NodeJava::addJRELocation(rtl_uString * sLocation)
m_JRELocations->push_back(OUString(sLocation));
}
-
-
-
-
-
jfw::FileStatus NodeJava::checkSettingsFileStatus(OUString const & sURL) const
{
jfw::FileStatus ret = FILE_DOES_NOT_EXIST;
diff --git a/jvmfwk/source/elements.hxx b/jvmfwk/source/elements.hxx
index d81874d..f62e7b0 100644
--- a/jvmfwk/source/elements.hxx
+++ b/jvmfwk/source/elements.hxx
@@ -207,13 +207,6 @@ public:
*/
void setVmParameters(rtl_uString * * arParameters, sal_Int32 size);
- /** sets the /java/jreLocations/location elements.
- When this method is called then all previous values are removed
- and replaced by those in arParamters.
- /java/jreLocations at xsi:nil will be set to true write() is called.
- */
- void setJRELocations(rtl_uString * * arParameters, sal_Int32 size);
-
/** adds a location to the already existing locations.
Note: call load() before, then add the location and then call write().
*/
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index d2092dcc..05dd3fd 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -1067,16 +1067,6 @@ CJavaInfo & CJavaInfo::operator = (const ::JavaInfo* info)
return *this;
}
-
-
-OUString CJavaInfo::getVendor() const
-{
- if (pInfo)
- return OUString(pInfo->sVendor);
- else
- return OUString();
-}
-
OUString CJavaInfo::getLocation() const
{
if (pInfo)
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 0d0ba18..fcd687c 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -100,7 +100,6 @@ public:
operator ::JavaInfo const * () const { return pInfo;}
::JavaInfo* cloneJavaInfo() const;
- OUString getVendor() const;
OUString getLocation() const;
sal_uInt64 getFeatures() const;
};
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 4edb4e8..b6a6eef 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -195,85 +195,6 @@ OUString getExecutableDirectory()
return getDirFromFile(ouExe);
}
-OUString findPlugin(
- const OUString & baseUrl, const OUString & plugin)
-{
- OUString expandedPlugin;
- try
- {
- expandedPlugin = cppu::bootstrap_expandUri(plugin);
- }
- catch (const com::sun::star::lang::IllegalArgumentException & e)
- {
- throw FrameworkException(
- JFW_E_ERROR,
- OString("[Java framework] IllegalArgumentException in findPlugin: ")
- + OUStringToOString(e.Message, osl_getThreadTextEncoding()));
- }
- OUString sUrl;
- try
- {
- sUrl = rtl::Uri::convertRelToAbs(baseUrl, expandedPlugin);
- }
- catch (const rtl::MalformedUriException & e)
- {
- throw FrameworkException(
- JFW_E_ERROR,
- OString("[Java framework] rtl::MalformedUriException in findPlugin: ")
- + OUStringToOString(
- e.getMessage(), osl_getThreadTextEncoding()));
- }
- if (checkFileURL(sUrl) == jfw::FILE_OK)
- {
- return sUrl;
- }
- OUString retVal;
- OUString sProgDir = getExecutableDirectory();
- sUrl = sProgDir + "/" + plugin;
- jfw::FileStatus s = checkFileURL(sUrl);
- if (s == jfw::FILE_INVALID || s == jfw::FILE_DOES_NOT_EXIST)
- {
- //If only the name of the library is given, then
- //use PATH, LD_LIBRARY_PATH etc. to locate the plugin
- if (plugin.indexOf('/') == -1)
- {
- OUString url;
-#ifdef UNX
-#if defined(MACOSX)
- OUString path = "DYLD_LIBRARY_PATH";
-#elif defined(AIX)
- OUString path = "LIBPATH";
-#else
- OUString path = "LD_LIBRARY_PATH";
-#endif
- OUString env_path;
- oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData);
- if (err != osl_Process_E_None && err != osl_Process_E_NotFound)
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function findPlugin (fwkutil.cxx).");
- if (err == osl_Process_E_NotFound)
- return retVal;
- if (osl_searchFileURL(plugin.pData, env_path.pData, &url.pData)
- == osl_File_E_None)
-#else
- if (osl_searchFileURL(plugin.pData, NULL, &url.pData)
- == osl_File_E_None)
-#endif
- retVal = url;
- else
- throw FrameworkException(
- JFW_E_ERROR,
- "[Java framework] Error in function findPlugin (fwkutil.cxx).");
- }
- }
- else
- {
- retVal = sUrl;
- }
- return retVal;
-}
-
OUString getLibraryLocation()
{
OString sExcMsg("[Java framework] Error in function getLibraryLocation "
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index 71479d2..af157d0 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -79,23 +79,6 @@ OUString getDirFromFile(const OUString& usFilePath);
/** Returns the file URL of the folder where the executable resides.
*/
OUString getExecutableDirectory();
-/** Locates the plugin library and returns the file URL.
-
- First tries to locate plugin relative to baseUrl (if relative);
- vnd.sun.star.expand URLs are supported. If that fails, tries to
- locate plugin relative to the executable. If that fails, and plugin
- contains no slashes, tries to locate plugin in a platform-specific way
- (e.g., LD_LIBRARY_PATH).
-
- @param baseUrl
- The base file URL relative to which the plugin argument is interpreted.
-
- @param plugin
- The argument is an absolute or relative URL or just the name of the plugin.
- */
-OUString findPlugin(
- const OUString & baseUrl, const OUString & plugin);
-
enum FileStatus
{
diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index 838c735..8a69361 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -22,11 +22,6 @@
namespace jfw
{
-CXPathObjectPtr::CXPathObjectPtr(xmlXPathObject* aObject)
- : _object(aObject)
-{
-}
-
CXPathObjectPtr::CXPathObjectPtr():_object(NULL)
{
}
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 1679110..9cf1346 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -32,9 +32,6 @@ class CXPathObjectPtr
CXPathObjectPtr(const CXPathObjectPtr&);
public:
CXPathObjectPtr();
- /** Takes ownership of xmlXPathObject
- */
- CXPathObjectPtr(xmlXPathObject* aObject);
~CXPathObjectPtr();
/** Takes ownership of xmlXPathObject
*/
diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx
index 139121c..7f674c3 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -102,25 +102,6 @@ EnumContext::Application EnumContext::GetApplication_DI (void) const
}
}
-
-
-
-const ::rtl::OUString& EnumContext::GetApplicationName (void) const
-{
- return EnumContext::GetApplicationName(meApplication);
-}
-
-
-
-
-const ::rtl::OUString& EnumContext::GetContextName (void) const
-{
- return EnumContext::GetContextName(meContext);
-}
-
-
-
-
bool EnumContext::operator== (const EnumContext aOther)
{
return meApplication==aOther.meApplication
diff --git a/svl/source/numbers/currencytable.cxx b/svl/source/numbers/currencytable.cxx
index ee65e8f..77745e4 100644
--- a/svl/source/numbers/currencytable.cxx
+++ b/svl/source/numbers/currencytable.cxx
@@ -14,21 +14,11 @@ NfCurrencyTable::iterator NfCurrencyTable::begin()
return maData.begin();
}
-NfCurrencyTable::iterator NfCurrencyTable::end()
-{
- return maData.end();
-}
-
NfCurrencyTable::const_iterator NfCurrencyTable::begin() const
{
return maData.begin();
}
-NfCurrencyTable::const_iterator NfCurrencyTable::end() const
-{
- return maData.end();
-}
-
NfCurrencyEntry& NfCurrencyTable::operator[] ( size_t i )
{
return maData[i];
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f0fe0c9..cb7af29 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -473,12 +473,6 @@ const ::utl::TransliterationWrapper* SvNumberFormatter::GetTransliteration() con
return xTransliteration.get();
}
-const ::utl::TransliterationWrapper* SvNumberFormatter::GetTransliterationForModule( const OUString& rModule,
- LanguageType eLang ) const
-{
- return xTransliteration.getForModule( rModule, eLang );
-}
-
const CharClass* SvNumberFormatter::GetCharClass() const { return pCharClass; }
const LocaleDataWrapper* SvNumberFormatter::GetLocaleData() const { return xLocaleData.get(); }
@@ -1805,11 +1799,6 @@ sal_Unicode SvNumberFormatter::GetDecSep() const
return GetNumDecimalSep()[0];
}
-OUString SvNumberFormatter::GetDecimalSep() const
-{
- return GetNumDecimalSep();
-}
-
OUString SvNumberFormatter::GetFormatDecimalSep( sal_uInt32 nFormat ) const
{
const SvNumberformat* pFormat = GetFormatEntry(nFormat);
@@ -3848,12 +3837,6 @@ NfCurrencyEntry::NfCurrencyEntry(
nPositiveFormat(nPositiveFmt), nNegativeFormat(nNegativeFmt),
nDigits(nDig), cZeroChar(cZero) {}
-NfCurrencyEntry* NfCurrencyEntry::Clone() const
-{
- return new NfCurrencyEntry(
- aSymbol, aBankSymbol, eLanguage, nPositiveFormat, nNegativeFormat, nDigits, cZeroChar);
-}
-
bool NfCurrencyEntry::operator==( const NfCurrencyEntry& r ) const
{
return aSymbol == r.aSymbol
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 10552e5..4c0e80a 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1567,15 +1567,6 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, size_t nPos
ImplInsertItem( pItem, nPos );
}
-void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, size_t nPos )
-{
- ValueSetItem* pItem = new ValueSetItem( *this );
- pItem->mnId = nItemId;
- pItem->meType = VALUESETITEM_COLOR;
- pItem->maColor = rColor;
- ImplInsertItem( pItem, nPos );
-}
-
void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage,
const OUString& rText, size_t nPos )
{
diff --git a/svx/source/sidebar/ColorPanel.cxx b/svx/source/sidebar/ColorPanel.cxx
deleted file mode 100644
index d6c8111..0000000
--- a/svx/source/sidebar/ColorPanel.cxx
+++ /dev/null
@@ -1,204 +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 "precompiled_svx.hxx"
-
-#include "ColorPanel.hxx"
-
-#include <vcl/image.hxx>
-#include <vcl/svapp.hxx>
-
-namespace svx { namespace sidebar {
-
-ColorPanel::ColorPanel (vcl::Window* pParent)
- : ValueSet(pParent),
- mnPreferredColumnCount(2)
-{
- WinBits aStyle =
- WB_ITEMBORDER
- | WB_DOUBLEBORDER
- | WB_NAMEFIELD
- | WB_FLATVALUESET
- | WB_TABSTOP
- | WB_VSCROLL;
-
- SetStyle(GetStyle() | aStyle);
- SetExtraSpacing(2);
-
- Fill ();
- Show();
-}
-
-
-
-
-ColorPanel::~ColorPanel (void)
-{
-}
-
-void ColorPanel::Resize (void)
-{
- vcl::Window::Resize();
- Size aWindowSize = GetOutputSizePixel();
- SetPosSizePixel(Point(0,0), aWindowSize);
- if (IsVisible() && aWindowSize.Width() > 0)
- {
- // Calculate the number of rows and columns.
- if (GetItemCount() > 0)
- {
- Image aImage = GetItemImage(GetItemId(0));
- Size aItemSize = CalcItemSizePixel (
- aImage.GetSizePixel());
- int nColumnCount = aWindowSize.Width() / 30;
- if (nColumnCount < 1)
- nColumnCount = 1;
- else if (nColumnCount > 4)
- nColumnCount = 4;
-
- sal_uInt16 nRowCount = (sal_uInt16)CalculateRowCount(aItemSize, nColumnCount);
-
- SetColCount((sal_uInt16)nColumnCount);
- SetLineCount(nRowCount);
- }
- }
-
-}
-
-
-
-
-int ColorPanel::CalculateRowCount (const Size&, int nColumnCount)
-{
- int nRowCount = 0;
-
- if (GetItemCount()>0 && nColumnCount>0)
- {
- nRowCount = GetOutputSizePixel().Height() / 30;
- if (nRowCount < 1)
- nRowCount = 1;
- }
-
- return nRowCount;
-}
-
-
-
-
-void ColorPanel::DataChanged (const DataChangedEvent& rEvent)
-{
- Fill();
-}
-
-
-
-
-void ColorPanel::Fill (void)
-{
- const StyleSettings& rSettings (
- Application::GetSettings().GetStyleSettings());
- Clear();
- SetItemWidth (30);
- SetItemHeight (30);
- sal_uInt16 i = 0;
- InsertItem (++i, rSettings.GetFaceColor());
- SetItemText (i, String::CreateFromAscii("FaceColor"));
- InsertItem (++i, rSettings.GetCheckedColor());
- SetItemText (i, String::CreateFromAscii("CheckedColor"));
- InsertItem (++i, rSettings.GetLightColor());
- SetItemText (i, String::CreateFromAscii("LightColor"));
- InsertItem (++i, rSettings.GetLightBorderColor());
- SetItemText (i, String::CreateFromAscii("LightBorderColor"));
- InsertItem (++i, rSettings.GetShadowColor());
- SetItemText (i, String::CreateFromAscii("ShadowColor"));
- InsertItem (++i, rSettings.GetDarkShadowColor());
- SetItemText (i, String::CreateFromAscii("DarkShadowColor"));
- InsertItem (++i, rSettings.GetButtonTextColor());
- SetItemText (i, String::CreateFromAscii("ButtonTextColor"));
- InsertItem (++i, rSettings.GetRadioCheckTextColor());
- SetItemText (i, String::CreateFromAscii("RadioCheckTextColor"));
- InsertItem (++i, rSettings.GetGroupTextColor());
- SetItemText (i, String::CreateFromAscii("GroupTextColor"));
- InsertItem (++i, rSettings.GetLabelTextColor());
- SetItemText (i, String::CreateFromAscii("LabelTextColor"));
- InsertItem (++i, rSettings.GetInfoTextColor());
- SetItemText (i, String::CreateFromAscii("InfoTextColor"));
- InsertItem (++i, rSettings.GetWindowColor());
- SetItemText (i, String::CreateFromAscii("WindowColor"));
- InsertItem (++i, rSettings.GetWindowTextColor());
- SetItemText (i, String::CreateFromAscii("WindowTextColor"));
- InsertItem (++i, rSettings.GetDialogColor());
- SetItemText (i, String::CreateFromAscii("DialogColor"));
- InsertItem (++i, rSettings.GetDialogTextColor());
- SetItemText (i, String::CreateFromAscii("DialogTextColor"));
- InsertItem (++i, rSettings.GetWorkspaceColor());
- SetItemText (i, String::CreateFromAscii("WorkspaceColor"));
- InsertItem (++i, rSettings.GetFieldColor());
- SetItemText (i, String::CreateFromAscii("FieldColor"));
- InsertItem (++i, rSettings.GetFieldTextColor());
- SetItemText (i, String::CreateFromAscii("FieldTextColor"));
- InsertItem (++i, rSettings.GetActiveColor());
- SetItemText (i, String::CreateFromAscii("ActiveColor"));
- InsertItem (++i, rSettings.GetActiveColor2());
- SetItemText (i, String::CreateFromAscii("ActiveColor2"));
- InsertItem (++i, rSettings.GetActiveTextColor());
- SetItemText (i, String::CreateFromAscii("ActiveTextColor"));
- InsertItem (++i, rSettings.GetActiveBorderColor());
- SetItemText (i, String::CreateFromAscii("ActiveBorderColor"));
- InsertItem (++i, rSettings.GetDeactiveColor());
- SetItemText (i, String::CreateFromAscii("DeactiveColor"));
- InsertItem (++i, rSettings.GetDeactiveColor2());
- SetItemText (i, String::CreateFromAscii("DeactiveColor2"));
- InsertItem (++i, rSettings.GetDeactiveTextColor());
- SetItemText (i, String::CreateFromAscii("DeactiveTextColor"));
- InsertItem (++i, rSettings.GetDeactiveBorderColor());
- SetItemText (i, String::CreateFromAscii("DeactiveBorderColor"));
- InsertItem (++i, rSettings.GetHighlightColor());
- SetItemText (i, String::CreateFromAscii("HighlightColor"));
- InsertItem (++i, rSettings.GetHighlightTextColor());
- SetItemText (i, String::CreateFromAscii("HighlightTextColor"));
- InsertItem (++i, rSettings.GetDisableColor());
- SetItemText (i, String::CreateFromAscii("DisableColor"));
- InsertItem (++i, rSettings.GetHelpColor());
- SetItemText (i, String::CreateFromAscii("HelpColor"));
- InsertItem (++i, rSettings.GetHelpTextColor());
- SetItemText (i, String::CreateFromAscii("HelpTextColor"));
- InsertItem (++i, rSettings.GetMenuColor());
- SetItemText (i, String::CreateFromAscii("MenuColor"));
- InsertItem (++i, rSettings.GetMenuBarColor());
- SetItemText (i, String::CreateFromAscii("MenuBarColor"));
- InsertItem (++i, rSettings.GetMenuBorderColor());
- SetItemText (i, String::CreateFromAscii("MenuBorderColor"));
- InsertItem (++i, rSettings.GetMenuTextColor());
- SetItemText (i, String::CreateFromAscii("MenuTextColor"));
- InsertItem (++i, rSettings.GetMenuHighlightColor());
- SetItemText (i, String::CreateFromAscii("MenuHighlightColor"));
- InsertItem (++i, rSettings.GetMenuHighlightTextColor());
- SetItemText (i, String::CreateFromAscii("MenuHighlightTextColor"));
- InsertItem (++i, rSettings.GetLinkColor());
- SetItemText (i, String::CreateFromAscii("LinkColor"));
- InsertItem (++i, rSettings.GetVisitedLinkColor());
- SetItemText (i, String::CreateFromAscii("VisitedLinkColor"));
- InsertItem (++i, rSettings.GetHighlightLinkColor());
- SetItemText (i, String::CreateFromAscii("HighlightLinkColor"));
- InsertItem (++i, rSettings.GetFontColor());
- SetItemText (i, String::CreateFromAscii("FontColor"));
-}
-
-} } // end of namespace ::svx::sidebar
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index cb99ad9..fe2e1a5 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -5,11 +5,15 @@ GDriveDocument::GDriveDocument(GDriveSession*)
GDriveFolder::GDriveFolder(GDriveSession*)
GDriveProperty::GDriveProperty()
GDriveSession::GDriveSession()
+ImpBitmap::ImplCrop(Rectangle const&)
+ImpBitmap::ImplErase(Color const&)
ImpBitmap::ImplSetSalBitmap(SalBitmap*)
+OpenGLContext::init(_XDisplay*, unsigned long, unsigned int, unsigned int, int)
OpenGLContext::renderToFile()
OpenGLContext::requestSingleBufferedRendering()
OpenGLContext::requestVirtualDevice()
OpenGLRender::CreateTextTexture(rtl::OUString const&, vcl::Font, long, com::sun::star::awt::Point, com::sun::star::awt::Size, long)
+OpenGLTexture::Draw()
OutputDevice::GetCanvas() const
OutputDevice::HasAlpha()
OutputDevice::LogicHeightToDeviceCoordinate(long) const
@@ -22,7 +26,9 @@ Primitive2dXmlDump::filterActionType(unsigned short, bool)
Primitive2dXmlDump::filterAllActionTypes()
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
ScBroadcastAreaSlotMachine::AreaBroadcastInRange(ScRange const&, ScHint const&) const
+ScCellValue::set(ScRefCellValue const&)
ScDocument::CreateFormatTable() const
+ScDocument::EndAllListeners(ScRange const&)
ScFormulaCellGroup::scheduleCompilation()
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
@@ -169,7 +175,6 @@ basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon c
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const&)
chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
-comphelper::ThreadPool::getSharedOptimalPool()
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
@@ -185,6 +190,11 @@ sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::finish()
sc::CLBuildKernelThread::produce()
sc::CellValues::transferTo(ScColumn&, int)
+sc::FormulaGroupAreaListener::getGroupLength() const
+sc::FormulaGroupAreaListener::getRange() const
+sc::FormulaGroupAreaListener::getTopCellPos() const
+sc::FormulaGroupAreaListener::isEndFixed() const
+sc::FormulaGroupAreaListener::isStartFixed() const
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sdr::contact::ViewContactOfTextObj::GetTextObj() const
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 648f030..7a7e425 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -90,7 +90,6 @@ struct ImplStyleData
Color maActiveBorderColor;
Color maActiveColor;
- Color maActiveColor2;
Color maActiveTextColor;
Color maRowColor;
Color maAlternatingRowColor;
@@ -100,7 +99,6 @@ struct ImplStyleData
Color maDarkShadowColor;
Color maDeactiveBorderColor;
Color maDeactiveColor;
- Color maDeactiveColor2;
Color maDeactiveTextColor;
Color maDialogColor;
Color maDialogTextColor;
@@ -564,7 +562,6 @@ ImplStyleData::ImplStyleData() :
ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maActiveBorderColor( rData.maActiveBorderColor ),
maActiveColor( rData.maActiveColor ),
- maActiveColor2( rData.maActiveColor2 ),
maActiveTextColor( rData.maActiveTextColor ),
maRowColor( rData.maRowColor ),
maAlternatingRowColor( rData.maAlternatingRowColor ),
@@ -574,7 +571,6 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
maDarkShadowColor( rData.maDarkShadowColor ),
maDeactiveBorderColor( rData.maDeactiveBorderColor ),
maDeactiveColor( rData.maDeactiveColor ),
- maDeactiveColor2( rData.maDeactiveColor2 ),
maDeactiveTextColor( rData.maDeactiveTextColor ),
maDialogColor( rData.maDialogColor ),
maDialogTextColor( rData.maDialogTextColor ),
@@ -721,11 +717,9 @@ void ImplStyleData::SetStandardStyles()
maFieldTextColor = Color( COL_BLACK );
maFieldRolloverTextColor = Color( COL_BLACK );
maActiveColor = Color( COL_BLUE );
- maActiveColor2 = Color( COL_BLACK );
maActiveTextColor = Color( COL_WHITE );
maActiveBorderColor = Color( COL_LIGHTGRAY );
maDeactiveColor = Color( COL_GRAY );
- maDeactiveColor2 = Color( COL_BLACK );
maDeactiveTextColor = Color( COL_LIGHTGRAY );
maDeactiveBorderColor = Color( COL_LIGHTGRAY );
maMenuColor = Color( COL_LIGHTGRAY );
@@ -1049,19 +1043,6 @@ StyleSettings::GetActiveColor() const
}
void
-StyleSettings::SetActiveColor2( const Color& rColor )
-{
- CopyData();
- mpData->maActiveColor2 = rColor;
-}
-
-const Color&
-StyleSettings::GetActiveColor2() const
-{
- return mpData->maActiveColor2;
-}
-
-void
StyleSettings::SetActiveTextColor( const Color& rColor )
{
CopyData();
@@ -1101,19 +1082,6 @@ StyleSettings::GetDeactiveColor() const
}
void
-StyleSettings::SetDeactiveColor2( const Color& rColor )
-{
- CopyData();
- mpData->maDeactiveColor2 = rColor;
-}
-
-const Color&
-StyleSettings::GetDeactiveColor2() const
-{
- return mpData->maDeactiveColor2;
-}
-
-void
StyleSettings::SetDeactiveTextColor( const Color& rColor )
{
CopyData();
@@ -2325,11 +2293,9 @@ bool StyleSettings::operator ==( const StyleSettings& rSet ) const
(mpData->maFieldColor == rSet.mpData->maFieldColor) &&
(mpData->maFieldTextColor == rSet.mpData->maFieldTextColor) &&
(mpData->maActiveColor == rSet.mpData->maActiveColor) &&
- (mpData->maActiveColor2 == rSet.mpData->maActiveColor2) &&
(mpData->maActiveTextColor == rSet.mpData->maActiveTextColor) &&
(mpData->maActiveBorderColor == rSet.mpData->maActiveBorderColor) &&
(mpData->maDeactiveColor == rSet.mpData->maDeactiveColor) &&
- (mpData->maDeactiveColor2 == rSet.mpData->maDeactiveColor2) &&
(mpData->maDeactiveTextColor == rSet.mpData->maDeactiveTextColor) &&
(mpData->maDeactiveBorderColor == rSet.mpData->maDeactiveBorderColor) &&
(mpData->maMenuColor == rSet.mpData->maMenuColor) &&
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 0a7fca9..f0e5ebe 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -1856,18 +1856,10 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
if ( pConfig->hasKey( pKey ) )
aStyleSettings.SetActiveColor( readColor( pConfig, pKey ) );
- pKey = "activeBlend";
- if ( pConfig->hasKey( pKey ) )
- aStyleSettings.SetActiveColor2( readColor( pConfig, pKey ) );
-
pKey = "inactiveBackground";
if ( pConfig->hasKey( pKey ) )
aStyleSettings.SetDeactiveColor( readColor( pConfig, pKey ) );
- pKey = "inactiveBlend";
- if ( pConfig->hasKey( pKey ) )
- aStyleSettings.SetDeactiveColor2( readColor( pConfig, pKey ) );
-
pKey = "inactiveForeground";
if ( pConfig->hasKey( pKey ) )
aStyleSettings.SetDeactiveTextColor( readColor( pConfig, pKey ) );
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index cf525ff..173ba12 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -171,9 +171,6 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetActiveColor(toColor(pal.color(QPalette::Active, QPalette::Window)));
style.SetDeactiveColor(toColor(pal.color(QPalette::Inactive, QPalette::Window)));
- style.SetActiveColor2(toColor(pal.color(QPalette::Active, QPalette::Window)));
- style.SetDeactiveColor2(toColor(pal.color(QPalette::Inactive, QPalette::Window)));
-
style.SetActiveTextColor(toColor(pal.color(QPalette::Active, QPalette::WindowText)));
style.SetDeactiveTextColor(toColor(pal.color(QPalette::Inactive, QPalette::WindowText)));
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index a048e2e..9bddbfc 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2660,7 +2660,6 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetTitleHeight( GetSystemMetrics( SM_CYCAPTION ) );
aStyleSettings.SetActiveBorderColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVEBORDER ) ) );
aStyleSettings.SetDeactiveBorderColor( ImplWinColorToSal( GetSysColor( COLOR_INACTIVEBORDER ) ) );
- aStyleSettings.SetActiveColor2( ImplWinColorToSal( GetSysColor( COLOR_GRADIENTACTIVECAPTION ) ) );
aStyleSettings.SetDeactiveColor( ImplWinColorToSal( GetSysColor( COLOR_GRADIENTINACTIVECAPTION ) ) );
aStyleSettings.SetFaceColor( ImplWinColorToSal( GetSysColor( COLOR_3DFACE ) ) );
aStyleSettings.SetInactiveTabColor( aStyleSettings.GetFaceColor() );
More information about the Libreoffice-commits
mailing list