include/oox/helper/attributelist.hxx | 3
include/sfx2/sidebar/EnumContext.hxx | 7 -
include/svl/sharedstringpool.hxx | 1
include/svx/framelink.hxx | 2
include/svx/svdotable.hxx | 1
oox/source/helper/attributelist.cxx | 5
sc/inc/columnset.hxx | 1
sc/inc/compare.hxx | 1
sc/inc/mtvelements.hxx | 1
sc/source/core/data/columnset.cxx | 10 -
sc/source/core/data/mtvelements.cxx | 4
sc/source/core/opencl/openclwrapper.cxx | 25 ---
sc/source/core/opencl/openclwrapper.hxx | 6
sc/source/core/tool/compare.cxx | 65
----------
sc/source/filter/inc/workbookhelper.hxx | 1
sc/source/filter/oox/workbookhelper.cxx | 5
sc/source/filter/oox/worksheethelper.cxx | 31 ----
sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx | 6
sc/source/ui/inc/TableFillingAndNavigationTools.hxx | 1
sd/source/ui/framework/factories/Pane.cxx | 9 -
sd/source/ui/inc/framework/Pane.hxx | 2
sd/source/ui/presenter/PresenterCanvas.cxx | 31 ----
sd/source/ui/presenter/PresenterCanvas.hxx | 15 --
sfx2/source/sidebar/ContextList.cxx | 6
sfx2/source/sidebar/ContextList.hxx | 5
sfx2/source/sidebar/Deck.cxx | 4
sfx2/source/sidebar/Deck.hxx | 2
sfx2/source/sidebar/EnumContext.cxx | 29 ----
sfx2/source/sidebar/Paint.cxx | 9 -
sfx2/source/sidebar/Paint.hxx | 2
sfx2/source/sidebar/Panel.cxx | 4
sfx2/source/sidebar/Panel.hxx | 2
sfx2/source/sidebar/SidebarDockingWindow.cxx | 8 -
sfx2/source/sidebar/SidebarDockingWindow.hxx | 2
svl/source/misc/sharedstringpool.cxx | 1
svx/source/dialog/framelink.cxx | 7 -
svx/source/table/cell.cxx | 65
----------
svx/source/table/cell.hxx | 2
svx/source/table/svdotable.cxx | 7 -
unusedcode.easy | 24 ---
40 files changed, 14 insertions(+), 398 deletions(-)
New commits:
commit f27e5ecfba4b688af6bcdd9933735f85c59b7401
Author: Noel Grandin <n...@peralex.com>
Date: Mon Mar 3 08:55:48 2014 +0200
remove unused code oox::AttributeConversion::decodeDouble
Change-Id: I057ebcf125e068653570dabb59a8b7f4494e96db
diff --git a/include/oox/helper/attributelist.hxx
b/include/oox/helper/attributelist.hxx
index e95d824..90059fb 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -48,9 +48,6 @@ public:
'_xHHHH_' (H being a hexadecimal digit), will be decoded. */
static OUString decodeXString( const OUString& rValue );
- /** Returns the double value from the passed string. */
- static double decodeDouble( const OUString& rValue );
-
/** Returns the 32-bit signed integer value from the passed string
(decimal). */
static sal_Int32 decodeInteger( const OUString& rValue );
diff --git a/oox/source/helper/attributelist.cxx
b/oox/source/helper/attributelist.cxx
index b851ccd..0fa5abd 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -87,11 +87,6 @@ OUString AttributeConversion::decodeXString( const OUString&
rValue )
return aBuffer.makeStringAndClear();
}
-double AttributeConversion::decodeDouble( const OUString& rValue )
-{
- return rValue.toDouble();
-}
-
sal_Int32 AttributeConversion::decodeInteger( const OUString& rValue )
{
return rValue.toInt32();
diff --git a/unusedcode.easy b/unusedcode.easy
index 3790122..038e022 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -253,7 +253,6 @@ formula::SingleVectorRefToken::GetRequestedArrayLength()
const
formula::SingleVectorRefToken::SingleVectorRefToken(double const*, unsigned
long, 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::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
const&)
registry::tools::Options::Options(char const*)
registry::tools::Options::badOption(char const*, char const*) const
commit a3171e82b5d2b9cf81aaf33f8270d15c538d39cb
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 16:13:02 2014 +0200
remove unused code oox::xls::WorkbookHelper::getDocShell()
Change-Id: I53a9c8a5db20a7f458fa35eeaed13483dbc3e67c
diff --git a/sc/source/filter/inc/workbookhelper.hxx
b/sc/source/filter/inc/workbookhelper.hxx
index 1f472c3..c0d79ff 100644
--- a/sc/source/filter/inc/workbookhelper.hxx
+++ b/sc/source/filter/inc/workbookhelper.hxx
@@ -154,7 +154,6 @@ public:
ScDocument& getScDocument();
const ScDocument& getScDocument() const;
- ScDocShell& getDocShell();
ScDocumentImport& getDocImport();
ScEditEngineDefaulter& getEditEngine() const;
diff --git a/sc/source/filter/oox/workbookhelper.cxx
b/sc/source/filter/oox/workbookhelper.cxx
index 8b5b2f9..0a9c770 100644
--- a/sc/source/filter/oox/workbookhelper.cxx
+++ b/sc/source/filter/oox/workbookhelper.cxx
@@ -803,11 +803,6 @@ const ScDocument& WorkbookHelper::getScDocument() const
return mrBookGlob.getScDocument();
}
-ScDocShell& WorkbookHelper::getDocShell()
-{
- return mrBookGlob.getDocShell();
-}
-
ScDocumentImport& WorkbookHelper::getDocImport()
{
return mrBookGlob.getDocImport();
diff --git a/unusedcode.easy b/unusedcode.easy
index 65ff40a..3790122 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -255,7 +255,6 @@ 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::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
const&)
-oox::xls::WorkbookHelper::getDocShell()
registry::tools::Options::Options(char const*)
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> > > >&)
commit 7d958c9fb57048935cbe4c351d146270f1df9465
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 16:07:23 2014 +0200
remove unused code in oox::xls::WorksheetGlobals
oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
Change-Id: I573bea69c03a92584851c6ae5e8e01a5e90f8fd4
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index fb80cd6..0061e6d 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -250,11 +250,6 @@ public:
/** Returns the XCellRange interface for a row. */
Reference< XCellRange > getRow( sal_Int32 nRow ) const;
- /** Returns the XTableColumns interface for a range of columns. */
- Reference< XTableColumns > getColumns( const ValueRange& rColRange ) const;
- /** Returns the XTableRows interface for a range of rows. */
- Reference< XTableRows > getRows( const ValueRange& rRowRange ) const;
-
/** Returns the XDrawPage interface of the draw page of the current sheet.
*/
Reference< XDrawPage > getDrawPage() const;
/** Returns the size of the entire drawing page in 1/100 mm. */
@@ -564,32 +559,6 @@ Reference< XCellRange > WorksheetGlobals::getRow(
sal_Int32 nRow ) const
return xRow;
}
-Reference< XTableColumns > WorksheetGlobals::getColumns( const ValueRange&
rColRange ) const
-{
- Reference< XTableColumns > xColumns;
- sal_Int32 nLastCol = ::std::min( rColRange.mnLast, mrMaxApiPos.Column );
- if( (0 <= rColRange.mnFirst) && (rColRange.mnFirst <= nLastCol) )
- {
- Reference< XColumnRowRange > xRange( getCellRange( CellRangeAddress(
getSheetIndex(), rColRange.mnFirst, 0, nLastCol, 0 ) ), UNO_QUERY );
- if( xRange.is() )
- xColumns = xRange->getColumns();
- }
- return xColumns;
-}
-
-Reference< XTableRows > WorksheetGlobals::getRows( const ValueRange& rRowRange
) const
-{
- Reference< XTableRows > xRows;
- sal_Int32 nLastRow = ::std::min( rRowRange.mnLast, mrMaxApiPos.Row );
- if( (0 <= rRowRange.mnFirst) && (rRowRange.mnFirst <= nLastRow) )
- {
- Reference< XColumnRowRange > xRange( getCellRange( CellRangeAddress(
getSheetIndex(), 0, rRowRange.mnFirst, 0, nLastRow ) ), UNO_QUERY );
- if( xRange.is() )
- xRows = xRange->getRows();
- }
- return xRows;
-}
-
Reference< XDrawPage > WorksheetGlobals::getDrawPage() const
{
Reference< XDrawPage > xDrawPage;
diff --git a/unusedcode.easy b/unusedcode.easy
index 2976fc5..65ff40a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -256,8 +256,6 @@
oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::su
oox::AttributeConversion::decodeDouble(rtl::OUString const&)
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
const&)
oox::xls::WorkbookHelper::getDocShell()
-oox::xls::WorksheetGlobals::getColumns(oox::ValueRange const&) const
-oox::xls::WorksheetGlobals::getRows(oox::ValueRange const&) const
registry::tools::Options::Options(char const*)
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> > > >&)
commit f7d6dde5563e5ccd9bd3490e6e25cbdf51a10105
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 16:02:48 2014 +0200
remove unused code in sc::CellTextAttr
sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
Change-Id: I39f893714866f69b7928cee980cb1505c9b2be06
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 3eb5527..1e08c12 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -45,7 +45,6 @@ struct CellTextAttr
CellTextAttr();
CellTextAttr(const CellTextAttr& r);
- CellTextAttr(sal_uInt16 nTextWidth, sal_uInt8 nScriptType);
};
/// Custom element type IDs for multi_type_vector.
diff --git a/sc/source/core/data/mtvelements.cxx
b/sc/source/core/data/mtvelements.cxx
index 1110ab6..3a74b8a 100644
--- a/sc/source/core/data/mtvelements.cxx
+++ b/sc/source/core/data/mtvelements.cxx
@@ -22,10 +22,6 @@ CellTextAttr::CellTextAttr(const CellTextAttr& r) :
mnTextWidth(r.mnTextWidth),
mnScriptType(r.mnScriptType) {}
-CellTextAttr::CellTextAttr(sal_uInt16 nTextWidth, sal_uInt8 nScriptType) :
- mnTextWidth(nTextWidth),
- mnScriptType(nScriptType) {}
-
ColumnBlockPositionSet::ColumnBlockPositionSet(ScDocument& rDoc) : mrDoc(rDoc)
{}
ColumnBlockPosition* ColumnBlockPositionSet::getBlockPosition(SCTAB nTab,
SCCOL nCol)
diff --git a/unusedcode.easy b/unusedcode.easy
index 4add5aa..2976fc5 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -265,7 +265,6 @@ registry::tools::convertToFileUrl(char const*, int)
rtl_OUString::convertFromString::test()
sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::produce()
-sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
commit bdfb4f8a3e204b9fe1fe29dbc670dc100da5019e
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 15:54:04 2014 +0200
remove unused code sc::ColumnSet::has(short, short)
Change-Id: I6a31362ae2e2f37a96e7023c06b4c9af7821f925
diff --git a/sc/inc/columnset.hxx b/sc/inc/columnset.hxx
index fb56303..99c1d08 100644
--- a/sc/inc/columnset.hxx
+++ b/sc/inc/columnset.hxx
@@ -29,7 +29,6 @@ class ColumnSet
public:
void set(SCTAB nTab, SCCOL nCol);
- bool has(SCTAB nTab, SCCOL nCol) const;
void getColumns(SCTAB nTab, std::vector<SCCOL>& rCols) const;
};
diff --git a/sc/source/core/data/columnset.cxx
b/sc/source/core/data/columnset.cxx
index 2e1f3aa..62f1ac4 100644
--- a/sc/source/core/data/columnset.cxx
+++ b/sc/source/core/data/columnset.cxx
@@ -30,16 +30,6 @@ void ColumnSet::set(SCTAB nTab, SCCOL nCol)
rCols.insert(nCol);
}
-bool ColumnSet::has(SCTAB nTab, SCCOL nCol) const
-{
- TabsType::const_iterator itTab = maTabs.find(nTab);
- if (itTab == maTabs.end())
- return false;
-
- const ColsType& rCols = itTab->second;
- return rCols.count(nCol) > 0;
-}
-
void ColumnSet::getColumns(SCTAB nTab, std::vector<SCCOL>& rCols) const
{
std::vector<SCCOL> aCols;
diff --git a/unusedcode.easy b/unusedcode.easy
index 1cf802e..4add5aa 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -266,7 +266,6 @@ rtl_OUString::convertFromString::test()
sc::CLBuildKernelThread::consume()
sc::CLBuildKernelThread::produce()
sc::CellTextAttr::CellTextAttr(unsigned short, unsigned char)
-sc::ColumnSet::has(short, short) const
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
commit 2148c4e9439c61c63a2bcf4078a839c0f9d6ee8c
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 15:44:36 2014 +0200
remove unused code in sc::CompareFunc
sc::CompareFunc(double, sc::Compare::Cell const&, sc::CompareOptions*)
Change-Id: I0fc3a1a038bb051672dcb180380e25258ac7552f
diff --git a/sc/inc/compare.hxx b/sc/inc/compare.hxx
index 485f882..9f09e6b 100644
--- a/sc/inc/compare.hxx
+++ b/sc/inc/compare.hxx
@@ -66,7 +66,6 @@ private:
NULL means case sensitivity document option is to be used!
*/
double CompareFunc( const Compare::Cell& rCell1, const Compare::Cell& rCell2,
bool bIgnoreCase, CompareOptions* pOptions = NULL );
-double CompareFunc( double fCell1, const Compare::Cell& rCell2,
CompareOptions* pOptions = NULL );
double CompareFunc( const Compare::Cell& rCell1, double fCell2,
CompareOptions* pOptions = NULL );
double CompareFunc( double fCell1, double fCell2 );
diff --git a/sc/source/core/tool/compare.cxx b/sc/source/core/tool/compare.cxx
index 11936b6..8c0f1f7 100644
--- a/sc/source/core/tool/compare.cxx
+++ b/sc/source/core/tool/compare.cxx
@@ -208,71 +208,6 @@ double CompareFunc( const Compare::Cell& rCell1, const
Compare::Cell& rCell2, bo
return fRes;
}
-double CompareFunc( double fCell1, const Compare::Cell& rCell2,
CompareOptions* pOptions )
-{
- // Keep DoubleError if encountered
- // #i40539# if bEmpty is set, bVal/nVal are uninitialized
- if (!rtl::math::isFinite(fCell1))
- return fCell1;
- if (!rCell2.mbEmpty && rCell2.mbValue &&
!rtl::math::isFinite(rCell2.mfValue))
- return rCell2.mfValue;
-
- bool bStringQuery = false;
- double fRes = 0;
- if (rCell2.mbEmpty)
- {
- if (fCell1 != 0.0)
- {
- if (fCell1 < 0.0)
- fRes = -1; // -x < empty cell
- else
- fRes = 1; // x > empty cell
- }
- // else: empty cell == 0.0
- }
- else
- {
- if (rCell2.mbValue)
- {
- if (!rtl::math::approxEqual(fCell1, rCell2.mfValue))
- {
- if (fCell1 - rCell2.mfValue < 0)
- fRes = -1;
- else
- fRes = 1;
- }
- }
- else
- {
- fRes = -1; // number is less than string
- bStringQuery = true;
- }
- }
-
- if (bStringQuery && pOptions)
- {
- const ScQueryEntry& rEntry = pOptions->aQueryEntry;
- const ScQueryEntry::QueryItemsType& rItems = rEntry.GetQueryItems();
- if (!rItems.empty())
- {
- const ScQueryEntry::Item& rItem = rItems[0];
- if (rItem.meType != ScQueryEntry::ByString &&
!rItem.maString.isEmpty() &&
- (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL))
- {
- // As in ScTable::ValidQuery() match a numeric string for a
- // number query that originated from a string, e.g. in SUMIF
- // and COUNTIF. Transliteration is not needed here.
- bool bEqual = rCell2.maStr == rItem.maString;
-
- // match => fRes=0, else fRes=1
- fRes = double((rEntry.eOp == SC_NOT_EQUAL) ? bEqual : !bEqual);
- }
- }
- }
-
- return fRes;
-}
-
double CompareFunc( const Compare::Cell& rCell1, double fCell2,
CompareOptions* pOptions )
{
// Keep DoubleError if encountered
diff --git a/unusedcode.easy b/unusedcode.easy
index fcfe54c..1cf802e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -267,7 +267,6 @@ sc::CLBuildKernelThread::consume()
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*)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
commit 3d160b1f7844098fc6ef8d717a59b25069e1df91
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 15:41:21 2014 +0200
convert int flag OpenclDevice::isInited to bool
Change-Id: I3283be819e1686b70a85aa05844deaaca17db0db
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index f9acfd8..b1a8ecc 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -44,7 +44,7 @@ using namespace std;
namespace sc { namespace opencl {
GPUEnv OpenclDevice::gpuEnv;
-int OpenclDevice::isInited =0;
+bool OpenclDevice::bIsInited = false;
namespace {
@@ -310,7 +310,7 @@ bool OpenclDevice::initOpenclAttr( OpenCLEnv * env )
void OpenclDevice::releaseOpenclEnv( GPUEnv *gpuInfo )
{
- if ( !isInited )
+ if ( !bIsInited )
{
return;
}
@@ -325,7 +325,7 @@ void OpenclDevice::releaseOpenclEnv( GPUEnv *gpuInfo )
clReleaseContext( gpuEnv.mpContext );
gpuEnv.mpContext = NULL;
}
- isInited = 0;
+ bIsInited = false;
gpuInfo->mnIsUserCreated = 0;
free( gpuInfo->mpArryDevsID );
@@ -479,7 +479,7 @@ bool OpenclDevice::initOpenclRunEnv( int argc )
if ( ( argc > MAX_CLFILE_NUM ) || ( argc < 0 ) )
return true;
- if ( !isInited )
+ if ( !bIsInited )
{
registOpenclKernel();
//initialize devices, context, command_queue
@@ -506,7 +506,7 @@ bool OpenclDevice::initOpenclRunEnv( int argc )
{
SAL_INFO("sc.opencl", "USE float type");
}
- isInited = 1;
+ bIsInited = true;
}
return false;
}
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 0f3b114..1112d08 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -151,7 +151,7 @@ class OpenclDevice
{
public:
static GPUEnv gpuEnv;
- static int isInited;
+ static bool bIsInited;
static OString maCacheFolder;
static void registOpenclKernel();
commit f9c68a3c4bc73a3ff8393fd092dec33b38da7e63
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 15:39:48 2014 +0200
remove unused code in sc::opencl
sc::opencl::OpenclDevice::getOpenclState()
sc::opencl::OpenclDevice::releaseOpenclRunEnv()
sc::opencl::OpenclDevice::setOpenclState(int)
Change-Id: I762e9b8398a89bf28404772cd65c75d0fbb2dfa4
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index c73ba39..f9acfd8 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -119,11 +119,6 @@ void clearCache()
OString OpenclDevice::maCacheFolder = getCacheFolder();
-void OpenclDevice::releaseOpenclRunEnv()
-{
- releaseOpenclEnv( &gpuEnv );
-}
-
void OpenclDevice::registOpenclKernel()
{
if ( !gpuEnv.mnIsUserCreated )
@@ -681,16 +676,6 @@ bool OpenclDevice::initOpenclRunEnv( GPUEnv *gpuInfo )
return false;
}
-void OpenclDevice::setOpenclState( int state )
-{
- isInited = state;
-}
-
-int OpenclDevice::getOpenclState()
-{
- return isInited;
-}
-
namespace {
// based on crashes and hanging during kernel compilation
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 0193c48..0f3b114 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -155,7 +155,6 @@ public:
static OString maCacheFolder;
static void registOpenclKernel();
- static void releaseOpenclRunEnv();
static bool initOpenclRunEnv( GPUEnv *gpu );
static void releaseOpenclEnv( GPUEnv *gpuInfo );
static bool initOpenclRunEnv( int argc );
@@ -166,9 +165,6 @@ public:
static bool initOpenclAttr( OpenCLEnv * env );
static void setKernelEnv( KernelEnv *envInfo );
-
- static int getOpenclState();
- static void setOpenclState( int state );
};
size_t getOpenCLPlatformCount();
diff --git a/unusedcode.easy b/unusedcode.easy
index ea7ce1a..fcfe54c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -268,9 +268,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::opencl::OpenclDevice::getOpenclState()
-sc::opencl::OpenclDevice::releaseOpenclRunEnv()
-sc::opencl::OpenclDevice::setOpenclState(int)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
commit e4f9c782fb182bce947bf463459c9bb7961e7bbc
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 15:19:01 2014 +0200
remove unused code sd::framework::Pane::SetWindow(Window*)
Change-Id: Icf4b0278b88f0070a6d81d5e146598a9f087de77
diff --git a/sd/source/ui/framework/factories/Pane.cxx
b/sd/source/ui/framework/factories/Pane.cxx
index d1ae160..cb35832 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -75,15 +75,6 @@ void Pane::disposing (void)
-void Pane::SetWindow (::Window* pWindow)
-{
- OSL_TRACE("setting Pane::mpWindow to %x", pWindow);
- mpWindow = pWindow;
- mxWindow = VCLUnoHelper::GetInterface(mpWindow);
-}
-
-
-
//----- XPane -----------------------------------------------------------------
diff --git a/sd/source/ui/inc/framework/Pane.hxx
b/sd/source/ui/inc/framework/Pane.hxx
index 4710029..2b34603 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -88,8 +88,6 @@ public:
*/
virtual ::Window* GetWindow (void);
- void SetWindow (::Window* pWindow);
-
//----- XPane -------------------------------------------------------------
/** For a UNO API based implementation of a view this may the most
diff --git a/unusedcode.easy b/unusedcode.easy
index bc4fa83..ea7ce1a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -273,7 +273,6 @@ sc::opencl::OpenclDevice::releaseOpenclRunEnv()
sc::opencl::OpenclDevice::setOpenclState(int)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
-sd::framework::Pane::SetWindow(Window*)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
commit 8af4f77f03ddfb789bbadb5188c8b1a369a7514c
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 15:08:50 2014 +0200
remove unused code sd::presenter::PresenterCanvas::copyRect
Change-Id: I03a7ba177c5bc200c4da391ff98a995a0aaaf274
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx
b/sd/source/ui/presenter/PresenterCanvas.cxx
index ed25cbc..06cdbd2 100644
--- a/sd/source/ui/presenter/PresenterCanvas.cxx
+++ b/sd/source/ui/presenter/PresenterCanvas.cxx
@@ -564,37 +564,6 @@ css::uno::Reference<css::rendering::XGraphicDevice>
SAL_CALL
-//----- XBitmapCanvas ---------------------------------------------------------
-
-void SAL_CALL PresenterCanvas::copyRect(
- const css::uno::Reference<css::rendering::XBitmapCanvas>& rxSourceCanvas,
- const css::geometry::RealRectangle2D& rSourceRect,
- const css::rendering::ViewState& rSourceViewState,
- const css::rendering::RenderState& rSourceRenderState,
- const css::geometry::RealRectangle2D& rDestRect,
- const css::rendering::ViewState& rDestViewState,
- const css::rendering::RenderState& rDestRenderState)
- throw (css::lang::IllegalArgumentException,
- css::rendering::VolatileContentDestroyedException,
- css::uno::RuntimeException)
-{
- ThrowIfDisposed();
-
- Reference<rendering::XBitmapCanvas> xBitmapCanvas (mxSharedCanvas,
UNO_QUERY);
- if (xBitmapCanvas.is())
- {
- rendering::ViewState aSourceViewState (rSourceViewState);
- if (rxSourceCanvas == Reference<rendering::XCanvas>(this))
- aSourceViewState = MergeViewState(aSourceViewState);
- xBitmapCanvas->copyRect(
- rxSourceCanvas, rSourceRect, aSourceViewState, rSourceRenderState,
- rDestRect, MergeViewState(rDestViewState), rDestRenderState);
- }
-}
-
-
-
-
//----- XSpriteCanvas ---------------------------------------------------------
Reference<rendering::XAnimatedSprite> SAL_CALL
diff --git a/sd/source/ui/presenter/PresenterCanvas.hxx
b/sd/source/ui/presenter/PresenterCanvas.hxx
index 724b7a0..860972b 100644
--- a/sd/source/ui/presenter/PresenterCanvas.hxx
+++ b/sd/source/ui/presenter/PresenterCanvas.hxx
@@ -300,21 +300,6 @@ public:
throw (css::uno::RuntimeException, std::exception);
- // XBitmapCanvas
-
- void SAL_CALL copyRect(
- const css::uno::Reference< css::rendering::XBitmapCanvas >&
sourceCanvas,
- const css::geometry::RealRectangle2D& sourceRect,
- const css::rendering::ViewState& sourceViewState,
- const css::rendering::RenderState& sourceRenderState,
- const css::geometry::RealRectangle2D& destRect,
- const css::rendering::ViewState& destViewState,
- const css::rendering::RenderState& destRenderState)
- throw (css::lang::IllegalArgumentException,
- css::rendering::VolatileContentDestroyedException,
- css::uno::RuntimeException);
-
-
// XSpriteCanvas
css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL
diff --git a/unusedcode.easy b/unusedcode.easy
index b87604c..bc4fa83 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -274,7 +274,6 @@ sc::opencl::OpenclDevice::setOpenclState(int)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::framework::Pane::SetWindow(Window*)
-sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas>
const&, com::sun::star::geometry::RealRectangle2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&,
com::sun::star::geometry::RealRectangle2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&)
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
commit 3b1fefac9a8e7cd7c5c483cc896fc45ca25e6f8d
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 15:02:39 2014 +0200
remove unused code in sdr::table
sdr::table::Cell::getName()
sdr::table::SdrTableObj::getRowCount() const
Change-Id: Icd4cbe591703aedb1412f8e9b485c773ffe79551
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index b679d4a..4a8502c 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -146,7 +146,6 @@ public:
void setActiveCell( const sdr::table::CellPos& rPos );
void getActiveCellPos( sdr::table::CellPos& rPos ) const;
- sal_Int32 getRowCount() const;
sal_Int32 getColumnCount() const;
void getCellBounds( const sdr::table::CellPos& rPos, ::Rectangle&
rCellRect );
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 26db3df..af3da32 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -1749,71 +1749,6 @@ void SAL_CALL Cell::disposing( const EventObject&
/*Source*/ ) throw (RuntimeExc
dispose();
}
-static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow )
-{
- OUStringBuffer aBuf;
-
- if (nCol < 26*26)
- {
- if (nCol < 26)
- aBuf.append( static_cast<sal_Unicode>( 'A' +
- static_cast<sal_uInt16>(nCol)));
- else
- {
- aBuf.append( static_cast<sal_Unicode>( 'A' +
- (static_cast<sal_uInt16>(nCol) / 26) - 1));
- aBuf.append( static_cast<sal_Unicode>( 'A' +
- (static_cast<sal_uInt16>(nCol) % 26)));
- }
- }
- else
- {
- OUString aStr;
- while (nCol >= 26)
- {
- sal_Int32 nC = nCol % 26;
- aStr += OUString( static_cast<sal_Unicode>( 'A' +
- static_cast<sal_uInt16>(nC)) );
- nCol = nCol - nC;
- nCol = nCol / 26 - 1;
- }
- aStr += OUString ( static_cast<sal_Unicode>( 'A' +
- static_cast<sal_uInt16>(nCol)) );
- aBuf.append(comphelper::string::reverseString(aStr));
- }
- aBuf.append( OUString::number(nRow+1) );
- return aBuf.makeStringAndClear();
-}
-
-OUString Cell::getName()
-{
- // todo: optimize!
- OUString sName;
- if( mxTable.is() ) try
- {
- Reference< XCell > xThis( static_cast< XCell* >( this ) );
-
- sal_Int32 nRowCount = mxTable->getRowCount();
- sal_Int32 nColCount = mxTable->getColumnCount();
- for( sal_Int32 nRow = 0; nRow < nRowCount; nRow++ )
- {
- for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
- {
- Reference< XCell > xCell( mxTable->getCellByPosition( nCol,
nRow ) );
- if( xCell == xThis )
- {
- return getCellName( nCol, nRow );
- }
- }
- }
- }
- catch( Exception& )
- {
- }
-
- return sName;
-}
-
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index d398363..eb7b7f6 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -204,8 +204,6 @@ public:
SVX_DLLPRIVATE void notifyModified();
- OUString getName();
-
protected:
SVX_DLLPRIVATE virtual const SfxItemSet& GetObjectItemSet();
SVX_DLLPRIVATE virtual void SetObjectItem(const SfxPoolItem& rItem);
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index a603afe..1d4dc8a 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1505,13 +1505,6 @@ const CellRef& SdrTableObj::getActiveCell() const
-sal_Int32 SdrTableObj::getRowCount() const
-{
- return mpImpl ? mpImpl->getRowCount() : 0;
-}
-
-
-
sal_Int32 SdrTableObj::getColumnCount() const
{
return mpImpl ? mpImpl->getColumnCount() : 0;
diff --git a/unusedcode.easy b/unusedcode.easy
index c4cbfa8..b87604c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -275,8 +275,6 @@ sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::framework::Pane::SetWindow(Window*)
sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas>
const&, com::sun::star::geometry::RealRectangle2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&,
com::sun::star::geometry::RealRectangle2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&)
-sdr::table::Cell::getName()
-sdr::table::SdrTableObj::getRowCount() const
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
commit 7b2c8b97715f17f2ddb534089389e961aa9d7fe1
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 14:15:01 2014 +0200
remove unused code in sfx2::sidebar
sfx2::sidebar::ContextList::IsEmpty()
sfx2::sidebar::Deck::PrintWindowTree(std::vector<sfx2::sidebar::Panel*> >
const&)
sfx2::sidebar::EnumContext::EvaluateMatch(sfx2::sidebar::EnumContext
const&) const
sfx2::sidebar::EnumContext::GetContext() const
sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
sfx2::sidebar::Panel::PrintWindowTree()
sfx2::sidebar::SidebarDockingWindow::GetChildWindow()
Change-Id: I285567320677a831b2b786f4f73b000eed39987b
diff --git a/include/sfx2/sidebar/EnumContext.hxx
b/include/sfx2/sidebar/EnumContext.hxx
index 2eff3cf..4cd58bd 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.hxx
@@ -123,7 +123,6 @@ public:
Application GetApplication_DI (void) const;
const ::rtl::OUString& GetContextName (void) const;
- Context GetContext (void) const;
bool operator == (const EnumContext aOther);
bool operator != (const EnumContext aOther);
@@ -136,12 +135,6 @@ public:
const static sal_Int32 NoMatch;
const static sal_Int32 OptimalMatch;
- /** Return the numeric value that describes how good the match
- between two contexts is.
- Smaller values represent better matches.
- */
- sal_Int32 EvaluateMatch (const EnumContext& rOther) const;
-
static Application GetApplicationEnum (const ::rtl::OUString&
rsApplicationName);
static const ::rtl::OUString& GetApplicationName (const Application
eApplication);
diff --git a/sfx2/source/sidebar/ContextList.cxx
b/sfx2/source/sidebar/ContextList.cxx
index 8d39015..e1dd711 100644
--- a/sfx2/source/sidebar/ContextList.cxx
+++ b/sfx2/source/sidebar/ContextList.cxx
@@ -104,12 +104,6 @@ void ContextList::AddContextDescription (
-bool ContextList::IsEmpty (void)
-{
- return maEntries.empty();
-}
-
-
} } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/ContextList.hxx
b/sfx2/source/sidebar/ContextList.hxx
index 5c5c4d9..26b63ca 100644
--- a/sfx2/source/sidebar/ContextList.hxx
+++ b/sfx2/source/sidebar/ContextList.hxx
@@ -56,11 +56,6 @@ public:
const bool bIsInitiallyVisible,
const ::rtl::OUString& rsMenuCommand);
- /** Returns <TRUE/> when no call to AddContextDescription() was made
before.
- */
- bool IsEmpty (void);
-
-
private:
::std::vector<Entry> maEntries;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 0df23ae..8eaf470 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -374,14 +374,14 @@ void Deck::PrintWindowTree (void)
-
+#ifdef DEBUG
void Deck::PrintWindowTree (const ::std::vector<Panel*>& rPanels)
{
(void)rPanels;
PrintWindowTree();
}
-
+#endif
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index fb382a5..63c014f 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -70,7 +70,9 @@ public:
virtual bool Notify (NotifyEvent& rEvent);
void PrintWindowTree (void);
+#ifdef DEBUG
void PrintWindowTree (const ::std::vector<Panel*>& rPanels);
+#endif
static void PrintWindowSubTree (Window* pRoot, int nIndentation);
sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
diff --git a/sfx2/source/sidebar/EnumContext.cxx
b/sfx2/source/sidebar/EnumContext.cxx
index 07ea96c..94e62d8 100644
--- a/sfx2/source/sidebar/EnumContext.cxx
+++ b/sfx2/source/sidebar/EnumContext.cxx
@@ -119,14 +119,6 @@ const ::rtl::OUString& EnumContext::GetContextName (void)
const
-EnumContext::Context EnumContext::GetContext (void) const
-{
- return meContext;
-}
-
-
-
-
bool EnumContext::operator== (const EnumContext aOther)
{
return meApplication==aOther.meApplication
@@ -289,27 +281,6 @@ const ::rtl::OUString& EnumContext::GetContextName (const
Context eContext)
}
-
-
-sal_Int32 EnumContext::EvaluateMatch (
- const EnumContext& rOther) const
-{
- const bool bApplicationNameIsAny (rOther.meApplication == Application_Any);
- if (rOther.meApplication==meApplication || bApplicationNameIsAny)
- {
- // Application name matches.
- const bool bContextNameIsAny (rOther.meContext == Context_Any);
- if (rOther.meContext==meContext || bContextNameIsAny)
- {
- // Context name matches.
- return (bApplicationNameIsAny ? 1 : 0)
- + (bContextNameIsAny ? 2 : 0);
- }
- }
- return NoMatch;
-}
-
-
} } // end of namespace sfx2::sidebar
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/sidebar/Paint.cxx b/sfx2/source/sidebar/Paint.cxx
index d2819bc..ac9082c 100644
--- a/sfx2/source/sidebar/Paint.cxx
+++ b/sfx2/source/sidebar/Paint.cxx
@@ -67,15 +67,6 @@ Paint Paint::Create (const cssu::Any& rValue)
-void Paint::Set (const Paint& rOther)
-{
- meType = rOther.meType;
- maValue = rOther.maValue;
-}
-
-
-
-
Paint::Type Paint::GetType (void) const
{
return meType;
diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx
index 4849a8b..623b2cf 100644
--- a/sfx2/source/sidebar/Paint.hxx
+++ b/sfx2/source/sidebar/Paint.hxx
@@ -59,8 +59,6 @@ public:
// Create a Paint object for the given gradient.
explicit Paint (const Gradient& rGradient);
- void Set (const ::sfx2::sidebar::Paint& rOther);
-
Type GetType (void) const;
const Color& GetColor (void) const;
const Gradient& GetGradient (void) const;
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 848bb4b..9a9fd85 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -234,9 +234,9 @@ Reference<ui::XSidebarPanel> Panel::GetPanelComponent
(void) const
+#ifdef DEBUG
void Panel::PrintWindowTree (void)
{
-#ifdef DEBUG
Window* pElementWindow = VCLUnoHelper::GetWindow(GetElementWindow());
if (pElementWindow != NULL)
{
@@ -245,8 +245,8 @@ void Panel::PrintWindowTree (void)
}
else
OSL_TRACE(" panel is empty");
-#endif
}
+#endif
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index b88f872..cd3e635 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -68,7 +68,9 @@ public:
virtual void DataChanged (const DataChangedEvent& rEvent);
virtual void Activate (void);
+#ifdef DEBUG
void PrintWindowTree (void);
+#endif
private:
const ::rtl::OUString msPanelId;
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.cxx
b/sfx2/source/sidebar/SidebarDockingWindow.cxx
index a8c0441..259123d 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.cxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.cxx
@@ -79,14 +79,6 @@ void SidebarDockingWindow::GetFocus()
-SfxChildWindow* SidebarDockingWindow::GetChildWindow (void)
-{
- return GetChildWindow_Impl();
-}
-
-
-
-
bool SidebarDockingWindow::Close (void)
{
if (mpSidebarController.is())
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx
b/sfx2/source/sidebar/SidebarDockingWindow.hxx
index 5a1aea8..8a0dfa4 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -42,8 +42,6 @@ public:
virtual bool Close (void);
- SfxChildWindow* GetChildWindow (void);
-
protected:
// Window overridables
virtual void GetFocus (void);
diff --git a/unusedcode.easy b/unusedcode.easy
index 9829e4b..c4cbfa8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -277,13 +277,6 @@ sd::framework::Pane::SetWindow(Window*)
sd::presenter::PresenterCanvas::copyRect(com::sun::star::uno::Reference<com::sun::star::rendering::XBitmapCanvas>
const&, com::sun::star::geometry::RealRectangle2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&,
com::sun::star::geometry::RealRectangle2D const&,
com::sun::star::rendering::ViewState const&,
com::sun::star::rendering::RenderState const&)
sdr::table::Cell::getName()
sdr::table::SdrTableObj::getRowCount() const
-sfx2::sidebar::ContextList::IsEmpty()
-sfx2::sidebar::Deck::PrintWindowTree(std::vector<sfx2::sidebar::Panel*,
std::allocator<sfx2::sidebar::Panel*> > const&)
-sfx2::sidebar::EnumContext::EvaluateMatch(sfx2::sidebar::EnumContext const&)
const
-sfx2::sidebar::EnumContext::GetContext() const
-sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
-sfx2::sidebar::Panel::PrintWindowTree()
-sfx2::sidebar::SidebarDockingWindow::GetChildWindow()
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const,
(anonymous namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString,
std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>,
std::_Select1st<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> >, std::less<rtl::OUString>,
std::allocator<std::pair<rtl::OUString const, (anonymous
namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
commit e395801fd2c303ab5b7a182d102ea6c833369c2b
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 13:32:41 2014 +0200
remove unused code svl::SharedStringPool::SharedStringPool()
Change-Id: I497cb89d0b204b9de9c31f86837664d107e55033
diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx
index cf1319f..e926f29 100644
--- a/include/svl/sharedstringpool.hxx
+++ b/include/svl/sharedstringpool.hxx
@@ -39,7 +39,6 @@ class SVL_DLLPUBLIC SharedStringPool
public:
- SharedStringPool();
SharedStringPool( const CharClass* pCharClass );
/**
diff --git a/svl/source/misc/sharedstringpool.cxx
b/svl/source/misc/sharedstringpool.cxx
index 1e85da5..ef4ee0f 100644
--- a/svl/source/misc/sharedstringpool.cxx
+++ b/svl/source/misc/sharedstringpool.cxx
@@ -12,7 +12,6 @@
namespace svl {
-SharedStringPool::SharedStringPool() : mpCharClass(NULL) {}
SharedStringPool::SharedStringPool( const CharClass* pCharClass ) :
mpCharClass(pCharClass) {}
SharedString SharedStringPool::intern( const OUString& rStr )
diff --git a/unusedcode.easy b/unusedcode.easy
index b9cad57..9829e4b 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -288,5 +288,4 @@ std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const,
(anonymous namespace
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>,
std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> >
>::reserve(unsigned long)
-svl::SharedStringPool::SharedStringPool()
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
commit 39f67c41a741e6107b9c26c43d0e8ad227ad0c9e
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 11:33:26 2014 +0200
remove unused code svx::frame::Style::Style constructor
svx::frame::Style::Style(editeng::SvxBorderLine const&,
double, unsigned short)
Change-Id: I6fd4bf107d325f714fef8417b2c2072a9f2e4066
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index c4121f3..7295189 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -114,8 +114,6 @@ public:
/** Constructs a frame style with passed color and line widths. */
explicit Style( const Color& rColorPrim, const Color& rColorSecn, const
Color& rColorGap, bool bUseGapColor,
double nP, double nD, double nS, editeng::SvxBorderStyle
nType );
- /** Constructs a frame style from the passed SvxBorderLine struct. */
- explicit Style( const editeng::SvxBorderLine& rBorder, double fScale =
1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
/** Constructs a frame style from the passed SvxBorderLine struct. Clears
the style, if pBorder is 0. */
explicit Style( const editeng::SvxBorderLine* pBorder, double fScale =
1.0, sal_uInt16 nMaxWidth = SAL_MAX_UINT16 );
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 3804795..e30155e 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -1150,13 +1150,6 @@ Style::Style( const Color& rColorPrim, const Color&
rColorSecn, const Color& rCo
Set( rColorPrim, rColorSecn, rColorGap, bUseGapColor, nP, nD, nS );
}
-Style::Style( const editeng::SvxBorderLine& rBorder, double fScale, sal_uInt16
nMaxWidth ) :
- meRefMode(REFMODE_CENTERED),
- mfScale(fScale)
-{
- Set( rBorder, fScale, nMaxWidth );
-}
-
Style::Style( const editeng::SvxBorderLine* pBorder, double fScale, sal_uInt16
nMaxWidth ) :
meRefMode(REFMODE_CENTERED),
mfScale(fScale)
diff --git a/unusedcode.easy b/unusedcode.easy
index 285915c..b9cad57 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -289,5 +289,4 @@
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::Formu
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
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)
vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
commit 97a7015daa10d56c24a1a2cca9955a09931e2d96
Author: Noel Grandin <n...@peralex.com>
Date: Fri Feb 28 08:52:48 2014 +0200
remove unused code AddressWalker::pop()
Change-Id: Ia4ecb3f846cf6adfedb05a452fd8705c735022ad
diff --git a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
index c4ff915..3eb6e13 100644
--- a/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
+++ b/sc/source/ui/StatisticsDialogs/TableFillingAndNavigationTools.cxx
@@ -146,12 +146,6 @@ void AddressWalker::push(SCCOL aRelativeCol, SCROW
aRelativeRow, SCTAB aRelative
mAddressStack.push_back(mCurrentAddress);
}
-void AddressWalker::pop()
-{
- mCurrentAddress = mAddressStack.back();
- mAddressStack.pop_back();
-}
-
AddressWalkerWriter::AddressWalkerWriter(ScAddress aInitialAddress,
ScDocShell* pDocShell, ScDocument* pDocument,
formula::FormulaGrammar::Grammar eGrammar ) :
AddressWalker(aInitialAddress, true),
diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
index 88f7c3f..2f133c0 100644
--- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
+++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx
@@ -70,7 +70,6 @@ public:
void nextColumn();
void nextRow();
void push(SCCOL aRelativeCol = 0, SCROW aRelativeRow = 0, SCTAB
aRelativeTab = 0);
- void pop();
};
class AddressWalkerWriter : public AddressWalker
diff --git a/unusedcode.easy b/unusedcode.easy
index 8043786..285915c 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,3 @@
-AddressWalker::pop()
BigInt::BigInt(unsigned int)
CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&)
Chart2ExportTest::testFdo74115WallGradientFill()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
