[Libreoffice-commits] core.git: 23 commits - basegfx/source framework/inc framework/source i18nlangtag/source include/basegfx include/i18nlangtag include/oox include/sax include/sfx2 include/svtools include/svx include/tools include/unotools include/vcl oox/source sax/source sc/inc sc/source sfx2/source svtools/source svx/source tools/source unotools/source unusedcode.easy vcl/source writerfilter/inc writerfilter/source
Noel Grandin
noel at peralex.com
Tue Feb 25 05:17:49 PST 2014
basegfx/source/numeric/ftools.cxx | 48 --------------
framework/inc/classes/menumanager.hxx | 2
framework/inc/uielement/menubarmanager.hxx | 2
framework/source/classes/menumanager.cxx | 5 -
framework/source/uielement/menubarmanager.cxx | 5 -
i18nlangtag/source/languagetag/languagetag.cxx | 14 ----
include/basegfx/numeric/ftools.hxx | 16 ----
include/i18nlangtag/languagetag.hxx | 2
include/oox/crypto/CryptTools.hxx | 5 -
include/sax/fshelper.hxx | 2
include/sfx2/bindings.hxx | 1
include/sfx2/templdlg.hxx | 2
include/svtools/treelistbox.hxx | 1
include/svx/sdr/overlay/overlayrectangle.hxx | 3
include/tools/stream.hxx | 1
include/unotools/datetime.hxx | 1
include/unotools/mediadescriptor.hxx | 2
include/vcl/menu.hxx | 4 -
oox/source/crypto/CryptTools.cxx | 8 --
sax/source/tools/fastserializer.cxx | 14 ----
sax/source/tools/fastserializer.hxx | 2
sax/source/tools/fshelper.cxx | 10 --
sc/inc/editutil.hxx | 1
sc/inc/formulacell.hxx | 1
sc/inc/formularesult.hxx | 1
sc/source/core/data/formulacell.cxx | 11 ---
sc/source/core/tool/editutil.cxx | 6 -
sc/source/core/tool/formularesult.cxx | 36 ----------
sc/source/filter/inc/formulaparser.hxx | 3
sc/source/filter/oox/formulaparser.cxx | 13 ---
sc/source/ui/docshell/datastream.cxx | 12 ---
sc/source/ui/inc/datastream.hxx | 2
sfx2/source/control/bindings.cxx | 5 -
sfx2/source/dialog/templdlg.cxx | 11 ---
svtools/source/contnr/treelistbox.cxx | 21 ------
svx/source/sdr/overlay/overlayrectangle.cxx | 14 ----
tools/source/stream/stream.cxx | 6 -
unotools/source/misc/datetime.cxx | 27 -------
unotools/source/misc/mediadescriptor.cxx | 6 -
unusedcode.easy | 22 ------
vcl/source/window/menu.cxx | 20 -----
writerfilter/inc/resourcemodel/ResourceModelHelper.hxx | 1
writerfilter/source/resourcemodel/ResourceModelHelper.cxx | 8 --
43 files changed, 1 insertion(+), 376 deletions(-)
New commits:
commit 54ce662d3043fc0b892d8f000a6f5877e32b7325
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 10:15:40 2014 +0200
remove unused code writerfilter::resourcemodel::resolveAttributeProperties
Change-Id: I4f48d11889d4d6b963ea9b3a1f43636cc6e66daa
diff --git a/unusedcode.easy b/unusedcode.easy
index 06a133e..1e3158f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -342,5 +342,4 @@ writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::ch
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, rtl::OUString const&)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, unsigned int)
-writerfilter::resourcemodel::resolveAttributeProperties(writerfilter::Properties&, writerfilter::Value&)
writerfilter::toString(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)
diff --git a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
index d3678b1..7e0417e 100644
--- a/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
+++ b/writerfilter/inc/resourcemodel/ResourceModelHelper.hxx
@@ -25,7 +25,6 @@ namespace writerfilter {
namespace resourcemodel {
void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveSprmProps(Properties & rHandler, Sprm & rSprm);
-void WRITERFILTER_RESOURCEMODEL_DLLPUBLIC resolveAttributeProperties(Properties & rHandler, Value & rValue);
}}
diff --git a/writerfilter/source/resourcemodel/ResourceModelHelper.cxx b/writerfilter/source/resourcemodel/ResourceModelHelper.cxx
index 29aa69b..f605017 100644
--- a/writerfilter/source/resourcemodel/ResourceModelHelper.cxx
+++ b/writerfilter/source/resourcemodel/ResourceModelHelper.cxx
@@ -29,14 +29,6 @@ void resolveSprmProps(Properties & rHandler, Sprm & rSprm)
pProperties->resolve(rHandler);
}
-void resolveAttributeProperties(Properties & rHandler, Value & val)
-{
- writerfilter::Reference<Properties>::Pointer_t pProperties = val.getProperties();
- if( pProperties.get())
- pProperties->resolve(rHandler);
-}
-
-
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c875ded2e9f1a839c85f2abfc2bfa1ba5c2b11d7
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 10:13:14 2014 +0200
remove unused code LanguageTag::convertLocaleToBcp47()
Change-Id: I4c655c16850ccfec44010ce8b100eeff0c8c3826
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index c74bce1..721bb31 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1362,13 +1362,6 @@ void LanguageTagImpl::convertLocaleToBcp47()
}
-void LanguageTag::convertLocaleToBcp47()
-{
- getImpl()->convertLocaleToBcp47();
- syncFromImpl();
-}
-
-
void LanguageTagImpl::convertLocaleToLang( bool bAllowOnTheFlyID )
{
if (mbSystemLocale)
diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx
index ee7b1a1..d646127 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -521,7 +521,6 @@ private:
void syncVarsFromRawImpl() const;
void syncVarsFromImpl() const;
- void convertLocaleToBcp47();
void convertLocaleToLang();
void convertBcp47ToLocale();
void convertBcp47ToLang();
diff --git a/unusedcode.easy b/unusedcode.easy
index 904e79b..06a133e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -30,7 +30,6 @@ Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocat
Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&)
Json::swap(Json&)
LanguageTag::LanguageTag()
-LanguageTag::convertLocaleToBcp47()
LanguageTag::getRegion() const
LanguageTag::reset(_rtl_Locale const&)
ListBox::GetMRUCount() const
commit a4d6cb008ec1f64f7dc804c1492ee227d6ec26b4
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 10:12:09 2014 +0200
remove unused code LanguageTag::convertLangToBcp47()
Change-Id: Iebbef192b7a8692003dc3f31d5b905efeae2cf25
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index 695343e..c74bce1 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1495,13 +1495,6 @@ void LanguageTagImpl::convertLangToBcp47()
}
-void LanguageTag::convertLangToBcp47()
-{
- getImpl()->convertLangToBcp47();
- syncFromImpl();
-}
-
-
void LanguageTag::convertFromRtlLocale()
{
// The rtl_Locale follows the Open Group Base Specification,
diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx
index 3c1a135..ee7b1a1 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -526,7 +526,6 @@ private:
void convertBcp47ToLocale();
void convertBcp47ToLang();
void convertLangToLocale();
- void convertLangToBcp47();
void convertFromRtlLocale();
diff --git a/unusedcode.easy b/unusedcode.easy
index 34aee7f..904e79b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -30,7 +30,6 @@ Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocat
Json::Json(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, boost::shared_ptr<libcmis::Property>, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, boost::shared_ptr<libcmis::Property> > > > const&)
Json::swap(Json&)
LanguageTag::LanguageTag()
-LanguageTag::convertLangToBcp47()
LanguageTag::convertLocaleToBcp47()
LanguageTag::getRegion() const
LanguageTag::reset(_rtl_Locale const&)
commit 1a4822853533933eefc190c6605a029adc1e106d
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 10:01:58 2014 +0200
remove unused code Menu::GetItemAccKeyStrFromPos(unsigned short)
Change-Id: Ia6967bd5ae412b473187d8bf5485e56fdc934efb
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 97d0092..ebb28a3 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -239,8 +239,6 @@ public:
void SetHightlightItem(sal_uInt16 nHighlightedItem);
sal_uInt16 GetHighlightItem() const;
- OUString GetItemAccKeyStrFromPos(sal_uInt16 nPos) const;
-
void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; }
sal_uInt16 GetDefaultItem() const { return nDefaultItem; }
diff --git a/unusedcode.easy b/unusedcode.easy
index f5796f8..34aee7f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -36,7 +36,6 @@ LanguageTag::getRegion() const
LanguageTag::reset(_rtl_Locale const&)
ListBox::GetMRUCount() const
Menu::GetHighlightItem() const
-Menu::GetItemAccKeyStrFromPos(unsigned short) const
MenuBar::AddMenuBarButton(Image const&, Link const&, rtl::OUString const&, unsigned short)
MenuBar::GetMenuBarButtonRectPixel(unsigned short)
MenuBar::RemoveMenuBarButton(unsigned short)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index b0469b1..0494619 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1584,16 +1584,6 @@ sal_uInt16 Menu::GetHighlightItem() const
return nHighlightedItem;
}
-OUString Menu::GetItemAccKeyStrFromPos(sal_uInt16 nPos) const
-{
- MenuItemData* pData = pItemList->GetDataFromPos( nPos );
- if (pData)
- {
- return pData->aAccelKey.GetName();
- }
- return OUString();
-}
-
sal_uInt16 Menu::GetCurItemId() const
{
return nSelectedId;
commit b510f69859249fe81546177bae3aad7161a81010
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 09:53:35 2014 +0200
remove unused code Menu::IsTemporaryItemFromPos(unsigned short)
Change-Id: I90a9116aba75316992d2bddaf2f6466288b95bd0
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 7e07746..97d0092 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -241,8 +241,6 @@ public:
OUString GetItemAccKeyStrFromPos(sal_uInt16 nPos) const;
- bool IsTemporaryItemFromPos(sal_uInt16 nPos) const;
-
void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; }
sal_uInt16 GetDefaultItem() const { return nDefaultItem; }
diff --git a/unusedcode.easy b/unusedcode.easy
index 60fee99..f5796f8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -37,7 +37,6 @@ LanguageTag::reset(_rtl_Locale const&)
ListBox::GetMRUCount() const
Menu::GetHighlightItem() const
Menu::GetItemAccKeyStrFromPos(unsigned short) const
-Menu::IsTemporaryItemFromPos(unsigned short) const
MenuBar::AddMenuBarButton(Image const&, Link const&, rtl::OUString const&, unsigned short)
MenuBar::GetMenuBarButtonRectPixel(unsigned short)
MenuBar::RemoveMenuBarButton(unsigned short)
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index bdd52f3..b0469b1 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1594,16 +1594,6 @@ OUString Menu::GetItemAccKeyStrFromPos(sal_uInt16 nPos) const
return OUString();
}
-bool Menu::IsTemporaryItemFromPos(sal_uInt16 nPos ) const
-{
- MenuItemData* pData = pItemList->GetDataFromPos( nPos );
- if (pData)
- {
- return pData->bIsTemporary;
- }
- return false;
-}
-
sal_uInt16 Menu::GetCurItemId() const
{
return nSelectedId;
commit 9321117acdb64a977b000dfc44d296dddd37500d
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 09:44:25 2014 +0200
remove unused code oox::core::Decrypt::aes128cbc
Change-Id: I12478278de8b719c51b87c335abd5c440a56bd36
diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx
index 5b87296..ae2c6f6 100644
--- a/include/oox/crypto/CryptTools.hxx
+++ b/include/oox/crypto/CryptTools.hxx
@@ -101,11 +101,6 @@ public:
std::vector<sal_uInt8>& input,
std::vector<sal_uInt8>& key );
- static sal_uInt32 aes128cbc(
- std::vector<sal_uInt8>& output,
- std::vector<sal_uInt8>& input,
- std::vector<sal_uInt8>& key,
- std::vector<sal_uInt8>& iv );
};
class Encrypt : public Crypto
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index d9ba500..d025609 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -147,14 +147,6 @@ sal_uInt32 Decrypt::aes128ecb(vector<sal_uInt8>& output, vector<sal_uInt8>& inpu
return outputLength;
}
-sal_uInt32 Decrypt::aes128cbc(vector<sal_uInt8>& output, vector<sal_uInt8>& input, vector<sal_uInt8>& key, vector<sal_uInt8>& iv)
-{
- sal_uInt32 outputLength = 0;
- Decrypt crypto(key, iv, Crypto::AES_128_CBC);
- outputLength = crypto.update(output, input);
- return outputLength;
-}
-
// ENCRYPT
Encrypt::Encrypt(vector<sal_uInt8>& key, vector<sal_uInt8>& iv, CryptoType type) :
diff --git a/unusedcode.easy b/unusedcode.easy
index a0a593a..60fee99 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -301,7 +301,6 @@ formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::AttributeConversion::decodeDouble(rtl::OUString const&)
-oox::core::Decrypt::aes128cbc(std::vector<unsigned char, std::allocator<unsigned char> >&, std::vector<unsigned char, std::allocator<unsigned char> >&, std::vector<unsigned char, std::allocator<unsigned char> >&, std::vector<unsigned char, std::allocator<unsigned char> >&)
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
oox::xls::WorkbookHelper::getDocShell()
oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
commit 497a24b22e452e1b50bdb730bcc29642eb1db2b0
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 09:41:17 2014 +0200
remove unused code oox::xls::FormulaParser::convertBoolToFormula(bool)
Change-Id: Ib7c5af91e7db78ff41c19b38f7e440f6cd00a089
diff --git a/sc/source/filter/inc/formulaparser.hxx b/sc/source/filter/inc/formulaparser.hxx
index cc61018..5b8f2d0 100644
--- a/sc/source/filter/inc/formulaparser.hxx
+++ b/sc/source/filter/inc/formulaparser.hxx
@@ -125,9 +125,6 @@ public:
BiffInputStream& rStrm,
const sal_uInt16* pnFmlaSize = 0 ) const;
- /** Converts the passed Boolean value to a similar formula. */
- ApiTokenSequence convertBoolToFormula( bool bValue ) const;
-
/** Converts the passed BIFF error code to a similar formula. */
ApiTokenSequence convertErrorToFormula( sal_uInt8 nErrorCode ) const;
diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx
index 25c0a26..f7d96d5 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -2796,19 +2796,6 @@ ApiTokenSequence FormulaParser::importFormula( const CellAddress& rBaseAddress,
return mxImpl->importBiffFormula( rBaseAddress, eType, rStrm, pnFmlaSize );
}
-ApiTokenSequence FormulaParser::convertBoolToFormula( bool bValue ) const
-{
- if( const FunctionInfo* pFuncInfo = getFuncInfoFromBiffFuncId( bValue ? BIFF_FUNC_TRUE : BIFF_FUNC_FALSE ) )
- {
- ApiTokenSequence aTokens( 3 );
- aTokens[ 0 ].OpCode = pFuncInfo->mnApiOpCode;
- aTokens[ 1 ].OpCode = OPCODE_OPEN;
- aTokens[ 2 ].OpCode = OPCODE_CLOSE;
- return aTokens;
- }
- return ApiTokenSequence();
-}
-
ApiTokenSequence FormulaParser::convertErrorToFormula( sal_uInt8 nErrorCode ) const
{
ApiTokenSequence aTokens( 3 );
diff --git a/unusedcode.easy b/unusedcode.easy
index 1ff55b9..a0a593a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -303,7 +303,6 @@ oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::su
oox::AttributeConversion::decodeDouble(rtl::OUString const&)
oox::core::Decrypt::aes128cbc(std::vector<unsigned char, std::allocator<unsigned char> >&, std::vector<unsigned char, std::allocator<unsigned char> >&, std::vector<unsigned char, std::allocator<unsigned char> >&, std::vector<unsigned char, std::allocator<unsigned char> >&)
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
-oox::xls::FormulaParser::convertBoolToFormula(bool) const
oox::xls::WorkbookHelper::getDocShell()
oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
commit 7e6981c3ea98ca06b7c7eb7828a08c64ffa4f7e0
Author: Noel Grandin <noel at peralex.com>
Date: Tue Feb 25 09:39:26 2014 +0200
remove unused method sc::DataStream::ToMoveType(rtl::OUString const&)
Change-Id: I76a677df30649b42c22f6c72525717b8224d2f79
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index a2fa4e4..1b71270 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -312,18 +312,6 @@ DataStream* DataStream::Set(
return pLink;
}
-DataStream::MoveType DataStream::ToMoveType( const OUString& rMoveStr )
-{
- if (rMoveStr == "RANGE_DOWN")
- return RANGE_DOWN;
- if (rMoveStr == "MOVE_DOWN")
- return MOVE_DOWN;
- if (rMoveStr == "MOVE_UP")
- return MOVE_UP;
-
- return NO_MOVE; // default
-}
-
DataStream::DataStream(ScDocShell *pShell, const OUString& rURL, const ScRange& rRange,
sal_Int32 nLimit, MoveType eMove, sal_uInt32 nSettings) :
mpDocShell(pShell),
diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx
index 5600a09..9233f85 100644
--- a/sc/source/ui/inc/datastream.hxx
+++ b/sc/source/ui/inc/datastream.hxx
@@ -72,8 +72,6 @@ public:
static DataStream* Set(ScDocShell *pShell, const OUString& rURL, const ScRange& rRange,
sal_Int32 nLimit, MoveType eMove, sal_uInt32 nSettings);
- static MoveType ToMoveType( const OUString& rMoveStr );
-
DataStream(
ScDocShell *pShell, const OUString& rURL, const ScRange& rRange,
sal_Int32 nLimit, MoveType eMove, sal_uInt32 nSettings);
diff --git a/unusedcode.easy b/unusedcode.easy
index 26b9782..1ff55b9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -317,7 +317,6 @@ sc::CLBuildKernelThread::produce()
sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
sc::ColumnSet::has(short, short) const
sc::CompareFunc(double, sc::Compare::Cell const&, sc::CompareOptions*)
-sc::DataStream::ToMoveType(rtl::OUString const&)
sc::OpenCLDevice::selectedDeviceIsNativeCPU(ds_device)
sc::OpenCLDevice::selectedDeviceIsOpenCL(ds_device)
sc::opencl::OpenclDevice::getOpenclState()
commit 265aea232cca7ce148545662f2a030c7d586ed3a
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:29:21 2014 +0200
remove unused code ScEditUtil::GetSpaceDelimitedString(EditTextObject const&)
Change-Id: Ie18a4c8a75b5cd3b42ecfa3278806a2c8876c8ee
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 1fbd1da..3bcc007 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -55,7 +55,6 @@ public:
/// Retrieves string with paragraphs delimited by spaces
static OUString GetSpaceDelimitedString( const EditEngine& rEngine );
- static OUString GetSpaceDelimitedString( const EditTextObject& rEdit );
/// Retrieves string with paragraphs delimited by new lines ('\n').
static OUString GetMultilineString( const EditEngine& rEngine );
diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx
index 4e7ff26..0a8125c 100644
--- a/sc/source/core/tool/editutil.cxx
+++ b/sc/source/core/tool/editutil.cxx
@@ -94,12 +94,6 @@ OUString ScEditUtil::GetSpaceDelimitedString( const EditEngine& rEngine )
{
return lcl_GetDelimitedString(rEngine, ' ');
}
-
-OUString ScEditUtil::GetSpaceDelimitedString( const EditTextObject& rEdit )
-{
- return lcl_GetDelimitedString(rEdit, ' ');
-}
-
OUString ScEditUtil::GetMultilineString( const EditEngine& rEngine )
{
return lcl_GetDelimitedString(rEngine, '\n');
diff --git a/unusedcode.easy b/unusedcode.easy
index 2d7c3b7..26b9782 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -85,7 +85,6 @@ ScDocument::GetCellCount(short, short) const
ScDocument::GetFormulaTokens(ScAddress const&) const
ScDocument::IsEmptyData(short, short) const
ScDocument::RebuildFormulaGroups()
-ScEditUtil::GetSpaceDelimitedString(EditTextObject const&)
ScExtIButton::GetSelected() const
ScFlatBoolRowSegments::getValue(int)
ScFormulaCell::HasColRowName() const
commit 651d52ca04eae72edb219f4f2977b94e5c8279c9
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:26:55 2014 +0200
remove unused code ScFormulaCell::GetErrorOrString
and then the now unused code in ScFormulaResult::GetErrorOrString
Change-Id: I95de8b5c24c0127cff61399eb6f38359040aace3
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index e901c6e..d3e8853 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -284,7 +284,6 @@ public:
sal_uInt16 GetErrCode(); // interpret first if necessary
sal_uInt16 GetRawError(); // don't interpret, just return code or result error
bool GetErrorOrValue( sal_uInt16& rErr, double& rVal );
- bool GetErrorOrString( sal_uInt16& rErr, svl::SharedString& rStr );
sc::FormulaResultValue GetResult();
sal_uInt8 GetMatrixFlag() const;
ScTokenArray* GetCode();
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 3708c8a..31bb990 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -155,7 +155,6 @@ public:
bool IsMultiline() const;
bool GetErrorOrDouble( sal_uInt16& rErr, double& rVal ) const;
- bool GetErrorOrString( sal_uInt16& rErr, svl::SharedString& rStr ) const;
sc::FormulaResultValue GetResult() const;
/** Get error code if set or GetCellResultType() is formula::svError or svUnknown,
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 88ca441..aa6e8b1 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2348,17 +2348,6 @@ bool ScFormulaCell::GetErrorOrValue( sal_uInt16& rErr, double& rVal )
return aResult.GetErrorOrDouble(rErr, rVal);
}
-bool ScFormulaCell::GetErrorOrString( sal_uInt16& rErr, svl::SharedString& rStr )
-{
- MaybeInterpret();
-
- rErr = pCode->GetCodeError();
- if (rErr)
- return true;
-
- return aResult.GetErrorOrString(rErr, rStr);
-}
-
sc::FormulaResultValue ScFormulaCell::GetResult()
{
MaybeInterpret();
diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx
index 35d5818..66ee0a9 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -345,42 +345,6 @@ bool ScFormulaResult::GetErrorOrDouble( sal_uInt16& rErr, double& rVal ) const
return true;
}
-bool ScFormulaResult::GetErrorOrString( sal_uInt16& rErr, svl::SharedString& rStr ) const
-{
- if (mnError)
- {
- rErr = mnError;
- return true;
- }
-
- formula::StackVar sv = GetCellResultType();
- if (sv == formula::svError)
- {
- if (GetType() == formula::svMatrixCell)
- {
- // don't need to test for mpToken here, GetType() already did it
- rErr = static_cast<const ScMatrixCellResultToken*>(mpToken)->
- GetUpperLeftToken()->GetError();
- }
- else if (mpToken)
- {
- rErr = mpToken->GetError();
- }
- }
-
- if (rErr)
- return true;
-
- if (!mbToken)
- return false;
-
- if (!isString(sv))
- return false;
-
- rStr = GetString();
- return true;
-}
-
sc::FormulaResultValue ScFormulaResult::GetResult() const
{
if (mnError)
diff --git a/unusedcode.easy b/unusedcode.easy
index 7086fdf..2d7c3b7 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -88,7 +88,6 @@ ScDocument::RebuildFormulaGroups()
ScEditUtil::GetSpaceDelimitedString(EditTextObject const&)
ScExtIButton::GetSelected() const
ScFlatBoolRowSegments::getValue(int)
-ScFormulaCell::GetErrorOrString(unsigned short&, svl::SharedString&)
ScFormulaCell::HasColRowName() const
ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
ScGridWindow::HasScenarioRange(unsigned short, int, ScRange&)
commit f6cef562c01b34f88f54cff551e9ebe3e2f4fc2a
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:23:27 2014 +0200
remove unused method SfxBindings::GetDispatchProvider_Impl()
Change-Id: Ie2a04a2b5056bf607911f9705c06b74b9637d211
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 0976d2a..5fb2365 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -167,7 +167,6 @@ public:
const SfxPoolItem **pInternalArgs = 0);
SAL_DLLPRIVATE void SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rFrame );
- SAL_DLLPRIVATE const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & GetDispatchProvider_Impl() const;
void SetActiveFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & rFrame );
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > GetActiveFrame() const;
// Reconfig
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 3f7091c..1b3d176 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -2180,11 +2180,6 @@ void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Referen
pImp->pSubBindings->SetDispatchProvider_Impl( pImp->xProv );
}
-const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & SfxBindings::GetDispatchProvider_Impl() const
-{
- return pImp->xProv;
-}
-
SystemWindow* SfxBindings::GetSystemWindow() const
{
SfxViewFrame *pFrame = pDispatcher->GetFrame();
diff --git a/unusedcode.easy b/unusedcode.easy
index 2f85f61..7086fdf 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -107,7 +107,6 @@ SdrItemBrowser::ForceParent()
SdrItemBrowser::SdrItemBrowser(SdrView&)
SfxAcceleratorConfigPage::Create(Window*, SfxItemSet const&)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
-SfxBindings::GetDispatchProvider_Impl() const
SfxBindings::GetSlot(unsigned short)
SfxBindings::GetSystemWindow() const
SfxDispatcher::IsOnTop(SfxShell const&)
commit 2a4ac6cc8179282d80532da0e97c983a2527abe3
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:21:32 2014 +0200
remove unused code SfxTemplatePanelControl::SetParagraphFamily()
Change-Id: Id2edc693bcac57ebc56db2115829f77c202d8f62
diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx
index 7373c23..25b152a 100644
--- a/include/sfx2/templdlg.hxx
+++ b/include/sfx2/templdlg.hxx
@@ -94,8 +94,6 @@ public:
virtual void StateChanged( StateChangedType nStateChange );
virtual void FreeResource (void);
- void SetParagraphFamily();
-
private:
SfxTemplateDialog_Impl* pImpl;
SfxBindings* mpBindings;
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 54d09f7..e4bcbb5 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -412,17 +412,6 @@ SfxTemplatePanelControl::~SfxTemplatePanelControl (void)
-void SfxTemplatePanelControl::SetParagraphFamily()
-{
- // first select the paragraph family
- pImpl->FamilySelect( SFX_STYLE_FAMILY_PARA );
- // then select the automatic filter
- pImpl->SetAutomaticFilter();
-}
-
-
-
-
void SfxTemplatePanelControl::DataChanged( const DataChangedEvent& _rDCEvt )
{
if ( ( DATACHANGED_SETTINGS == _rDCEvt.GetType() ) &&
diff --git a/unusedcode.easy b/unusedcode.easy
index db3b261..2f85f61 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -113,7 +113,6 @@ SfxBindings::GetSystemWindow() const
SfxDispatcher::IsOnTop(SfxShell const&)
SfxGrabBagItem::SetGrabBag(std::map<rtl::OUString, com::sun::star::uno::Any, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, com::sun::star::uno::Any> > > const&)
SfxItemPool::GetMasterPool() const
-SfxTemplatePanelControl::SetParagraphFamily()
SimpleErrorHandler::SimpleErrorHandler()
SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int)
commit d8f90e02a426b7aafa24450993e5f4b97f59b8a4
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:18:50 2014 +0200
remove unused code SvStream::WriteUCharPtr(unsigned char const*)
Change-Id: I7f341a10d2fffb8eda45478756bc221127ab72cf
diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index d04109f..e7760fd 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -333,7 +333,6 @@ public:
SvStream& WriteFloat( float nFloat );
SvStream& WriteDouble( const double& rDouble );
SvStream& WriteCharPtr( const char* pBuf );
- SvStream& WriteUCharPtr( const unsigned char* pBuf );
SvStream& WriteNumber( sal_uInt32 nUInt32 );
SvStream& WriteNumber( sal_Int32 nInt32 );
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index acd48dd..476f1a8 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -1221,12 +1221,6 @@ SvStream& SvStream::WriteCharPtr( const char* pBuf )
return *this;
}
-SvStream& SvStream::WriteUCharPtr( const unsigned char* pBuf )
-{
- Write( (char*)pBuf, strlen( (char*)pBuf ) );
- return *this;
-}
-
SvStream& SvStream::WriteStream( SvStream& rStream )
{
const sal_uInt32 cBufLen = 0x8000;
diff --git a/unusedcode.easy b/unusedcode.easy
index b6d66ae..db3b261 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -118,7 +118,6 @@ SimpleErrorHandler::SimpleErrorHandler()
SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int)
SotFactory::Find(SvGlobalName const&)
-SvStream::WriteUCharPtr(unsigned char const*)
SvViewDataEntry::SetObjectSelected(bool)
SvdProgressInfo::ReportError()
SvpSalInstance::PostedEventsInQueue()
commit a8a356024474803864bf32032c0b530dc28d2294
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:17:41 2014 +0200
remove unused code SvTreeListBox::SearchEntryText(SvTreeListEntry*)
Change-Id: I18d76de5e3280e7efb4dd75bcd5bf819064176e3
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 6d1f2ca..cc0d827 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -658,7 +658,6 @@ public:
void SetCollapsedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage );
virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const;
- OUString SearchEntryText( SvTreeListEntry* pEntry ) const;
const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ) const;
const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ) const;
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 89aa4e2..9408012 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -1855,27 +1855,6 @@ OUString SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const
return pItem->GetText();
}
-OUString SvTreeListBox::SearchEntryText( SvTreeListEntry* pEntry ) const
-{
- DBG_CHKTHIS(SvTreeListBox,0);
- DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" );
- OUString sRet;
- sal_uInt16 nCount = pEntry->ItemCount();
- sal_uInt16 nCur = 0;
- SvLBoxItem* pItem;
- while( nCur < nCount )
- {
- pItem = pEntry->GetItem( nCur );
- if (pItem->GetType() == SV_ITEM_ID_LBOXSTRING && !static_cast<const SvLBoxString*>(pItem)->GetText().isEmpty())
- {
- sRet = static_cast<const SvLBoxString*>(pItem)->GetText();
- break;
- }
- nCur++;
- }
- return sRet;
-}
-
const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) const
{
DBG_CHKTHIS(SvTreeListBox,0);
diff --git a/unusedcode.easy b/unusedcode.easy
index 69cf145..b6d66ae 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -119,7 +119,6 @@ SmFontPickList::Contains(Font const&) const
SmParser::Insert(rtl::OUString const&, int)
SotFactory::Find(SvGlobalName const&)
SvStream::WriteUCharPtr(unsigned char const*)
-SvTreeListBox::SearchEntryText(SvTreeListEntry*) const
SvViewDataEntry::SetObjectSelected(bool)
SvdProgressInfo::ReportError()
SvpSalInstance::PostedEventsInQueue()
commit f45ff6b468a22e52104fc41466e384e0548a85e6
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:14:54 2014 +0200
remove unused code basegfx::snapToNearestMultiple(double, double)
Change-Id: If708227af22e834a0aecbeca12ce99b1240443c7
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
index a3a27a7..6816fb3 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.cxx
@@ -25,29 +25,6 @@ namespace basegfx
// init static member of class fTools
double ::basegfx::fTools::mfSmallValue = 0.000000001;
- double snapToNearestMultiple(double v, const double fStep)
- {
- if(fTools::equalZero(fStep))
- {
- // with a zero step, all snaps to 0.0
- return 0.0;
- }
- else
- {
- const double fHalfStep(fStep * 0.5);
- const double fChange(fHalfStep - fmod(v + fHalfStep, fStep));
-
- if(basegfx::fTools::equal(fabs(v), fabs(fChange)))
- {
- return 0.0;
- }
- else
- {
- return v + fChange;
- }
- }
- }
-
double snapToZeroRange(double v, double fWidth)
{
if(fTools::equalZero(fWidth))
diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index 2e327df..5ce21f7 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -136,18 +136,6 @@ namespace basegfx
return v / M_PI_2 * 90.0;
}
- /** Snap v to nearest multiple of fStep, from negative and
- positive side.
-
- Examples:
-
- snapToNearestMultiple(-0.1, 0.5) = 0.0
- snapToNearestMultiple(0.1, 0.5) = 0.0
- snapToNearestMultiple(0.25, 0.5) = 0.0
- snapToNearestMultiple(0.26, 0.5) = 0.5
- */
- double snapToNearestMultiple(double v, const double fStep);
-
/** Snap v to the range [0.0 .. fWidth] using modulo
*/
double snapToZeroRange(double v, double fWidth);
diff --git a/unusedcode.easy b/unusedcode.easy
index 5de3a50..69cf145 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -277,7 +277,6 @@ apitest::XText::testInsertRemoveTextContent()
apitest::XTextContent::testAttach()
apitest::XTextContent::testGetAnchor()
apitest::XTextField::testGetPresentation()
-basegfx::snapToNearestMultiple(double, double)
basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon const&)
basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&, double const&)
basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&)
commit ffdd5d304779e7ec7cdf7d4f5dbeb24584970c6b
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 16:07:47 2014 +0200
remove unused code basegfx::snapToRange(double, double, double)
Change-Id: I72813be5f82b1a43fbb765d1b5f96f47b62920b8
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
index 1cbbe5c..a3a27a7 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.cxx
@@ -75,31 +75,6 @@ namespace basegfx
}
}
- double snapToRange(double v, double fLow, double fHigh)
- {
- if(fTools::equal(fLow, fHigh))
- {
- // with no range all snaps to range bound
- return 0.0;
- }
- else
- {
- if(fLow > fHigh)
- {
- // correct range order. Evtl. assert this (?)
- std::swap(fLow, fHigh);
- }
-
- if(v < fLow || v > fHigh)
- {
- return snapToZeroRange(v - fLow, fHigh - fLow) + fLow;
- }
- else
- {
- return v;
- }
- }
- }
} // end of namespace basegfx
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx
index 140731e..2e327df 100644
--- a/include/basegfx/numeric/ftools.hxx
+++ b/include/basegfx/numeric/ftools.hxx
@@ -152,10 +152,6 @@ namespace basegfx
*/
double snapToZeroRange(double v, double fWidth);
- /** Snap v to the range [fLow .. fHigh] using modulo
- */
- double snapToRange(double v, double fLow, double fHigh);
-
/** return fValue with the sign of fSignCarrier, thus evtl. changed
*/
inline double copySign(double fValue, double fSignCarrier)
diff --git a/unusedcode.easy b/unusedcode.easy
index dd441f8..5de3a50 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -278,7 +278,6 @@ apitest::XTextContent::testAttach()
apitest::XTextContent::testGetAnchor()
apitest::XTextField::testGetPresentation()
basegfx::snapToNearestMultiple(double, double)
-basegfx::snapToRange(double, double, double)
basegfx::tools::containsOnlyHorizontalAndVerticalEdges(basegfx::B2DPolyPolygon const&)
basegfx::tools::equal(basegfx::B2DPolygon const&, basegfx::B2DPolygon const&, double const&)
basegfx::tools::equal(basegfx::B3DPolyPolygon const&, basegfx::B3DPolyPolygon const&)
commit a77461db606859f8b29b24990094deaceed07114
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 14:03:18 2014 +0200
remove unused code framework::MenuManager::getContext()
Change-Id: I3b6d8bf6d83033b36a2e72eb5c984f5d9c47b771
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 5a33395..e0f68ae 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -69,8 +69,6 @@ class MenuManager : public ThreadHelpBase ,
void RemoveListener();
- const css::uno::Reference< css::uno::XComponentContext >& getContext();
-
static void UpdateSpecialWindowMenu( Menu* pMenu ,const css::uno::Reference< css::uno::XComponentContext >& xContext,IMutex& _rMutex);
static void FillMenuImages(
css::uno::Reference< css::frame::XFrame >& xFrame,
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 57eeb41..bbef40e 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -913,11 +913,6 @@ IMPL_LINK_NOARG(MenuManager, Highlight)
return 0;
}
-const Reference< XComponentContext >& MenuManager::getContext()
-{
- return m_xContext;
-}
-
void MenuManager::AddMenu(PopupMenu* _pPopupMenu,const OUString& _sItemCommand,sal_uInt16 _nItemId,sal_Bool _bDelete,sal_Bool _bDeleteChildren)
{
MenuManager* pSubMenuManager = new MenuManager( m_xContext, m_xFrame, _pPopupMenu, _bDelete, _bDeleteChildren );
diff --git a/unusedcode.easy b/unusedcode.easy
index b943eb2..dd441f8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -306,7 +306,6 @@ editeng::Section::Section()
formula::FormulaDlg::CheckMatrix()
formula::FormulaTokenArray::AddString(unsigned short const*)
formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long)
-framework::MenuManager::getContext()
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
oox::AttributeConversion::decodeDouble(rtl::OUString const&)
commit 6fe80c5b46ff09239c9583b6aefcc8dc25841239
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 14:01:39 2014 +0200
remove unused code framework::MenuBarManager::getComponentContext()
Change-Id: If640b2662d47593c33d0f90cdafe448383546872
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index 88ef560..77f9f5f 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -105,8 +105,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener
sal_Bool bDelete,
sal_Bool bDeleteChildren );
- const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getComponentContext();
-
virtual ~MenuBarManager();
// XInterface
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 9226539..05e9149 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1925,11 +1925,6 @@ void MenuBarManager::GetPopupController( PopupControllerCache& rPopupController
}
}
-const Reference< XComponentContext >& MenuBarManager::getComponentContext()
-{
- return m_xContext;
-}
-
void MenuBarManager::AddMenu(MenuBarManager* pSubMenuManager,const OUString& _sItemCommand,sal_uInt16 _nItemId)
{
Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
diff --git a/unusedcode.easy b/unusedcode.easy
index 75e5549..b943eb2 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -306,7 +306,6 @@ editeng::Section::Section()
formula::FormulaDlg::CheckMatrix()
formula::FormulaTokenArray::AddString(unsigned short const*)
formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned long)
-framework::MenuBarManager::getComponentContext()
framework::MenuManager::getContext()
oglcanvas::CanvasHelper::flush() const
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const
commit 6ef5009defd04273a10d1aa1a3de96eaa0470482
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 13:42:14 2014 +0200
remove unused code sdr::overlay::OverlayRectangle::setSecondPosition
Change-Id: I566b479a298d7496b1ff766bfbaf0ccde84472aa
diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx
index efbe344..36230b4 100644
--- a/include/svx/sdr/overlay/overlayrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrectangle.hxx
@@ -61,9 +61,6 @@ namespace sdr
sal_uInt32 nBlinkTime,
bool bAnimate);
- const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; }
- void setSecondPosition(const basegfx::B2DPoint&);
-
// data read access
double getTransparence() const { return mfTransparence; }
double getDiscreteGrow() const { return mfDiscreteGrow; }
diff --git a/svx/source/sdr/overlay/overlayrectangle.cxx b/svx/source/sdr/overlay/overlayrectangle.cxx
index 4df39c0..557179d 100644
--- a/svx/source/sdr/overlay/overlayrectangle.cxx
+++ b/svx/source/sdr/overlay/overlayrectangle.cxx
@@ -35,7 +35,7 @@ namespace sdr
{
drawinglayer::primitive2d::Primitive2DSequence OverlayRectangle::createOverlayObjectPrimitive2DSequence()
{
- const basegfx::B2DRange aHatchRange(getBasePosition(), getSecondPosition());
+ const basegfx::B2DRange aHatchRange(getBasePosition(), maSecondPosition);
basegfx::BColor aColor(getBaseColor().getBColor());
static double fChange(0.1); // just small optical change, do not make it annoying
@@ -94,18 +94,6 @@ namespace sdr
mnBlinkTime = impCheckBlinkTimeValueRange(mnBlinkTime);
}
- void OverlayRectangle::setSecondPosition(const basegfx::B2DPoint& rNew)
- {
- if(rNew != maSecondPosition)
- {
- // remember new value
- maSecondPosition = rNew;
-
- // register change (after change)
- objectChange();
- }
- }
-
void OverlayRectangle::Trigger(sal_uInt32 nTime)
{
if(getOverlayManager())
commit 7efa467ef31d3f053c79bc189b3dbec957747ae5
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 13:22:00 2014 +0200
remove unused code sax_fastparser::FastSerializerHelper::copyTopMarkPop()
Change-Id: If1dd0e99d83f8211c58fa3b5d1ba56a74bc2157f
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 1363fde..9f2f9aa 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -142,7 +142,6 @@ public:
void mark( ::com::sun::star::uno::Sequence< sal_Int32 > aOrder =
::com::sun::star::uno::Sequence< sal_Int32 >() );
void mergeTopMarks( MergeMarksEnum eMergeType = MERGE_MARKS_APPEND );
- void copyTopMarkPop();
/*
Now create all the overloads in a typesafe way (i.e. without varargs) by creating a number of overloads
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index a12c8ab..4005a25 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -309,14 +309,6 @@ namespace sax_fastparser {
}
}
- void FastSaxSerializer::copyTopMarkPop()
- {
- assert (!maSavedMarkStack.empty());
- maMarkStack.push(maSavedMarkStack.top());
- mergeTopMarks();
- maSavedMarkStack.pop();
- }
-
void FastSaxSerializer::writeBytes( const Sequence< ::sal_Int8 >& aData ) throw ( NotConnectedException, BufferSizeExceededException, IOException, RuntimeException )
{
if ( maMarkStack.empty() )
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index 874a25e..0f20efc 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -146,7 +146,6 @@ public:
@see mark()
*/
void mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType = sax_fastparser::MERGE_MARKS_APPEND );
- void copyTopMarkPop();
private:
::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > mxOutputStream;
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 43a3730..45f8d23 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -161,11 +161,6 @@ void FastSerializerHelper::mergeTopMarks( MergeMarksEnum eMergeType )
mpSerializer->mergeTopMarks( eMergeType );
}
-void FastSerializerHelper::copyTopMarkPop()
-{
- mpSerializer->copyTopMarkPop();
-}
-
FastAttributeList * FastSerializerHelper::createAttrList()
{
return new FastAttributeList( mxTokenHandler );
diff --git a/unusedcode.easy b/unusedcode.easy
index ce82dfe..75e5549 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -322,7 +322,6 @@ registry::tools::Options::badOption(char const*, char const*) const
registry::tools::Options::initOptions(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > >&)
registry::tools::convertToFileUrl(char const*, int)
rtl_OUString::convertFromString::test()
-sax_fastparser::FastSerializerHelper::copyTopMarkPop()
sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::produce()
sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
commit 333fdb95a384e560b201614ece56bc5369bd46da
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 13:19:55 2014 +0200
remove unused code sax_fastparser::FastSerializerHelper::copyTopMarkPush()
Change-Id: I4569e53f0423783bc5c9ee95b07d0de51b75b466
diff --git a/include/sax/fshelper.hxx b/include/sax/fshelper.hxx
index 06700c5..1363fde 100644
--- a/include/sax/fshelper.hxx
+++ b/include/sax/fshelper.hxx
@@ -142,7 +142,6 @@ public:
void mark( ::com::sun::star::uno::Sequence< sal_Int32 > aOrder =
::com::sun::star::uno::Sequence< sal_Int32 >() );
void mergeTopMarks( MergeMarksEnum eMergeType = MERGE_MARKS_APPEND );
- void copyTopMarkPush();
void copyTopMarkPop();
/*
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index a9b73ae..a12c8ab 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -309,12 +309,6 @@ namespace sax_fastparser {
}
}
- void FastSaxSerializer::copyTopMarkPush()
- {
- assert (!maMarkStack.empty());
- maSavedMarkStack.push(boost::shared_ptr< ForMerge > ( new ForMerge(*maMarkStack.top())));
- }
-
void FastSaxSerializer::copyTopMarkPop()
{
assert (!maSavedMarkStack.empty());
diff --git a/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index 95ebb14..874a25e 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -146,7 +146,6 @@ public:
@see mark()
*/
void mergeTopMarks( sax_fastparser::MergeMarksEnum eMergeType = sax_fastparser::MERGE_MARKS_APPEND );
- void copyTopMarkPush();
void copyTopMarkPop();
private:
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index c39cbea..43a3730 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -161,11 +161,6 @@ void FastSerializerHelper::mergeTopMarks( MergeMarksEnum eMergeType )
mpSerializer->mergeTopMarks( eMergeType );
}
-void FastSerializerHelper::copyTopMarkPush()
-{
- mpSerializer->copyTopMarkPush();
-}
-
void FastSerializerHelper::copyTopMarkPop()
{
mpSerializer->copyTopMarkPop();
diff --git a/unusedcode.easy b/unusedcode.easy
index 60ba74f..ce82dfe 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -323,7 +323,6 @@ registry::tools::Options::initOptions(std::vector<std::basic_string<char, std::c
registry::tools::convertToFileUrl(char const*, int)
rtl_OUString::convertFromString::test()
sax_fastparser::FastSerializerHelper::copyTopMarkPop()
-sax_fastparser::FastSerializerHelper::copyTopMarkPush()
sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::produce()
sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
commit e428a9952351a08c0d265368c5e8ad2416b003d9
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 12:37:58 2014 +0200
remove unused code utl::MediaDescriptor::PROP_DEEPDETECTION()
Change-Id: Ie80d0c00fe8725e59a6814707c9a4afcb6ac09b5
diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx
index 1cd2063..fc4864f 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -100,8 +100,6 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap
static const OUString& PROP_VIEWONLY();
static const OUString& PROP_DOCUMENTBASEURL();
- static const OUString& PROP_DEEPDETECTION();
-
//-------------------------------------------
// interface
public:
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index e934bf3..aa4128c 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -313,12 +313,6 @@ const OUString& MediaDescriptor::PROP_DOCUMENTBASEURL()
return sProp;
}
-const OUString& MediaDescriptor::PROP_DEEPDETECTION()
-{
- static const OUString aProp("DeepDetection");
- return aProp;
-}
-
MediaDescriptor::MediaDescriptor()
: SequenceAsHashMap()
{
diff --git a/unusedcode.easy b/unusedcode.easy
index 602e053..60ba74f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -356,7 +356,6 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::F
std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
svl::SharedStringPool::SharedStringPool()
svx::frame::Style::Style(editeng::SvxBorderLine const&, double, unsigned short)
-utl::MediaDescriptor::PROP_DEEPDETECTION()
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::BinaryObj> >)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >)
commit 700161cce79df7137fc4db433db6e41905d76975
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 21 12:36:28 2014 +0200
remove unused code utl::toISO8601(com::sun::star::util::Time const&)
Change-Id: I8df1934c7392ec38918be2a5b986c6ca871f9d15
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index c1e494d..cb34dbd 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -45,7 +45,6 @@ namespace utl
UNOTOOLS_DLLPUBLIC void typeConvert(const starutil::DateTime& _rDateTime, DateTime& _rOut);
UNOTOOLS_DLLPUBLIC ::rtl::OUString toISO8601(const starutil::DateTime& _rDateTime);
- UNOTOOLS_DLLPUBLIC ::rtl::OUString toISO8601(const starutil::Time& _rTime);
UNOTOOLS_DLLPUBLIC bool ISO8601parseDateTime(const ::rtl::OUString &i_rIn, starutil::DateTime& o_rDateTime);
UNOTOOLS_DLLPUBLIC bool ISO8601parseDate(const ::rtl::OUString &i_rIn, starutil::Date& o_rDate);
UNOTOOLS_DLLPUBLIC bool ISO8601parseTime(const ::rtl::OUString &i_rIn, starutil::Time& o_Time);
diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index 176769d..8283807 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -222,33 +222,6 @@ OUString toISO8601(const starutil::DateTime& rDateTime)
return rBuffer.makeStringAndClear();
}
-OUString toISO8601(const starutil::Time& rTime)
-{
- OUStringBuffer rBuffer;
- if( rTime.Hours < 10 )
- rBuffer.append('0');
- rBuffer.append((sal_Int32) rTime.Hours);
- rBuffer.append(':');
- if( rTime.Minutes < 10 )
- rBuffer.append('0');
- rBuffer.append((sal_Int32) rTime.Minutes);
- rBuffer.append(':');
- if( rTime.Seconds < 10 )
- rBuffer.append('0');
- rBuffer.append((sal_Int32) rTime.Seconds);
- if ( rTime.NanoSeconds > 0)
- {
- OSL_ENSURE(rTime.NanoSeconds < 1000000000,"NanoSeconds cannot be more than 999 999 999");
- rBuffer.append(',');
- std::ostringstream ostr;
- ostr.fill('0');
- ostr.width(9);
- ostr << rTime.NanoSeconds;
- rBuffer.append(OUString::createFromAscii(ostr.str().c_str()));
- }
- return rBuffer.makeStringAndClear();
-}
-
/** convert ISO8601 DateTime String to util::DateTime */
bool ISO8601parseDateTime(const OUString &rString, starutil::DateTime& rDateTime)
{
diff --git a/unusedcode.easy b/unusedcode.easy
index de0b159..602e053 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -357,7 +357,6 @@ std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::
svl::SharedStringPool::SharedStringPool()
svx::frame::Style::Style(editeng::SvxBorderLine const&, double, unsigned short)
utl::MediaDescriptor::PROP_DEEPDETECTION()
-utl::toISO8601(com::sun::star::util::Time const&)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::BinaryObj> >)
writerfilter::dump(writerfilter::OutputWithDepth<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >&, char const*, boost::shared_ptr<writerfilter::Reference<writerfilter::Properties> >)
More information about the Libreoffice-commits
mailing list