.gitignore | 3 -
comphelper/inc/comphelper/SelectionMultiplex.hxx | 5 -
comphelper/source/misc/SelectionMultiplex.cxx | 10 ---
sc/source/filter/inc/sheetdatabuffer.hxx | 45 -----------------
sc/source/filter/oox/sheetdatabuffer.cxx | 58 -----------------------
sfx2/Library_sfx.mk | 15 -----
unusedcode.easy | 3 -
7 files changed, 2 insertions(+), 137 deletions(-)
New commits:
commit e9e3bd0659e761b5b9409d61ae831afc59b983cf
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Jul 16 00:23:44 2012 +0200
do not hide .patch files
to hide more, try git config --global core.excludesfile
Change-Id: I1da4131b943a962797a1f389554139e87fe074bc
diff --git a/.gitignore b/.gitignore
index 45d72d0..c1aef58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,6 +130,3 @@ test/user-template/user/psprint/pspfontcache
# Somepeople love debugging
gdbtrace.log
valgrind.log
-
-#patches
-*.patch
commit 31b05fe9ffdc043211a6bd7216a809ab500b9691
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Mon Jul 16 00:20:25 2012 +0200
unusedcode: drop CellBlock and one small method
Change-Id: I7cad80ea59b4527193a35ea1b7cfdd56e07a0efe
diff --git a/comphelper/inc/comphelper/SelectionMultiplex.hxx
b/comphelper/inc/comphelper/SelectionMultiplex.hxx
index 390b3ff..56e8375 100644
--- a/comphelper/inc/comphelper/SelectionMultiplex.hxx
+++ b/comphelper/inc/comphelper/SelectionMultiplex.hxx
@@ -56,11 +56,6 @@ namespace comphelper
virtual void _disposing(const ::com::sun::star::lang::EventObject&
_rSource) throw( ::com::sun::star::uno::RuntimeException);
protected:
- /** If the derivee also owns the mutex which we know as reference,
then call this within your
- derivee's dtor.
- */
- void disposeAdapter();
-
// pseudo-private. Making it private now could break compatibility
void setAdapter( OSelectionChangeMultiplexer* _pAdapter );
};
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx
b/comphelper/source/misc/SelectionMultiplex.cxx
index ca267e7..aa3092d 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.cxx
@@ -47,16 +47,6 @@ void OSelectionChangeListener::_disposing(const
EventObject&) throw( RuntimeExce
}
//------------------------------------------------------------------
-void OSelectionChangeListener::disposeAdapter()
-{
- if ( m_pAdapter )
- m_pAdapter->dispose();
-
- // will automatically set a new adapter
- OSL_ENSURE( !m_pAdapter, "OSelectionChangeListener::disposeAdapter: what
did dispose do?" );
-}
-
-//------------------------------------------------------------------
void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer*
pAdapter)
{
if (m_pAdapter)
diff --git a/sc/source/filter/inc/sheetdatabuffer.hxx
b/sc/source/filter/inc/sheetdatabuffer.hxx
index 898d039..7c4e32e 100644
--- a/sc/source/filter/inc/sheetdatabuffer.hxx
+++ b/sc/source/filter/inc/sheetdatabuffer.hxx
@@ -90,48 +90,6 @@ struct DataTableModel
// ============================================================================
-/** Stores position and contents of a range of cells for optimized import. */
-class CellBlock : public WorksheetHelper
-{
-public:
- explicit CellBlock( const WorksheetHelper& rHelper, const
ValueRange& rColSpan, sal_Int32 nRow );
-
- /** Writes all buffered cells into the Calc sheet. */
- void finalizeImport();
-
-private:
- /** Fills unused cells before passed index with empty strings. */
- void fillUnusedCells( sal_Int32 nIndex );
-
-private:
- /** Stores position and string data of a rich-string cell. */
- struct RichStringCell
- {
- ::com::sun::star::table::CellAddress
- maCellAddr; /// The address of the
rich-string cell.
- RichStringRef mxString; /// The string with rich
formatting.
- const Font* mpFirstPortionFont; /// Font information from cell
for first text portion.
-
- explicit RichStringCell(
- const ::com::sun::star::table::CellAddress&
rCellAddr,
- const RichStringRef& rxString,
- const Font* pFirstPortionFont );
- };
- typedef ::std::list< RichStringCell > RichStringCellList;
-
- ::com::sun::star::table::CellRangeAddress
- maRange; /// Cell range covered by this
cell block.
- RichStringCellList maRichStrings; /// Cached rich-string cells.
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any > >
- maCellArray; /// The array of cells of this
cell block.
- ::com::sun::star::uno::Any*
- mpCurrCellRow; /// Pointer to first cell of
current row (last row in maCellArray).
- const sal_Int32 mnRowLength; /// Number of cells covered by row
of this cell block.
- sal_Int32 mnFirstFreeIndex; /// Relative index of first unused
cell in current row.
-};
-
-// ============================================================================
-
/** Manages all cell blocks currently in use. */
class CellBlockBuffer : public WorksheetHelper
{
@@ -146,11 +104,8 @@ public:
private:
typedef ::std::map< sal_Int32, ValueRangeVector > ColSpanVectorMap;
- typedef RefMap< sal_Int32, CellBlock > CellBlockMap;
ColSpanVectorMap maColSpans; /// Buffereed column spans,
mapped by row index.
- CellBlockMap maCellBlocks; /// All open cell blocks,
mapped by last (!) column of the block span.
- CellBlockMap::iterator maCellBlockIt; /// Pointer to cell block
currently in use.
sal_Int32 mnCurrRow; /// Current row index used for
buffered cell import.
};
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx
b/sc/source/filter/oox/sheetdatabuffer.cxx
index 0ce3594..a608c00 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -120,67 +120,10 @@ DataTableModel::DataTableModel() :
// ============================================================================
-namespace {
-
-const sal_Int32 CELLBLOCK_MAXROWS = 16; /// Number of rows in a cell block.
-
-} // namespace
-
-CellBlock::CellBlock( const WorksheetHelper& rHelper, const ValueRange&
rColSpan, sal_Int32 nRow ) :
- WorksheetHelper( rHelper ),
- maRange( rHelper.getSheetIndex(), rColSpan.mnFirst, nRow, rColSpan.mnLast,
nRow ),
- mnRowLength( rColSpan.mnLast - rColSpan.mnFirst + 1 ),
- mnFirstFreeIndex( 0 )
-{
- maCellArray.realloc( 1 );
- maCellArray[ 0 ].realloc( mnRowLength );
- mpCurrCellRow = maCellArray[ 0 ].getArray();
-}
-
-void CellBlock::finalizeImport()
-{
- // fill last cells in last row with empty strings (placeholder for empty
cells)
- fillUnusedCells( mnRowLength );
- // insert all buffered cells into the Calc sheet
- try
- {
- Reference< XCellRangeData > xRangeData( getCellRange( maRange ),
UNO_QUERY_THROW );
- xRangeData->setDataArray( maCellArray );
- }
- catch( Exception& )
- {
- }
- // insert uncacheable cells separately
- for( RichStringCellList::const_iterator aIt = maRichStrings.begin(), aEnd
= maRichStrings.end(); aIt != aEnd; ++aIt )
- putRichString( aIt->maCellAddr, *aIt->mxString,
aIt->mpFirstPortionFont );
-}
-
-// private --------------------------------------------------------------------
-
-CellBlock::RichStringCell::RichStringCell( const CellAddress& rCellAddr, const
RichStringRef& rxString, const Font* pFirstPortionFont ) :
- maCellAddr( rCellAddr ),
- mxString( rxString ),
- mpFirstPortionFont( pFirstPortionFont )
-{
-}
-
-void CellBlock::fillUnusedCells( sal_Int32 nIndex )
-{
- if( mnFirstFreeIndex < nIndex )
- {
- Any* pCellEnd = mpCurrCellRow + nIndex;
- for( Any* pCell = mpCurrCellRow + mnFirstFreeIndex; pCell < pCellEnd;
++pCell )
- *pCell <<= OUString();
- }
-}
-
-// ============================================================================
-
CellBlockBuffer::CellBlockBuffer( const WorksheetHelper& rHelper ) :
WorksheetHelper( rHelper ),
mnCurrRow( -1 )
{
- maCellBlockIt = maCellBlocks.end();
}
void CellBlockBuffer::setColSpans( sal_Int32 nRow, const ValueRangeSet&
rColSpans )
@@ -193,7 +136,6 @@ void CellBlockBuffer::setColSpans( sal_Int32 nRow, const
ValueRangeSet& rColSpan
void CellBlockBuffer::finalizeImport()
{
- maCellBlocks.forEachMem( &CellBlock::finalizeImport );
}
// ============================================================================
diff --git a/unusedcode.easy b/unusedcode.easy
index 7e7b5ad..a56d38b 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -299,7 +299,6 @@ cairocanvas::SpriteDeviceHelper::getSurface()
cairocanvas::TextLayout::draw(_cairo*)
canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule>
const&)
cmis::Content::exchangeIdentity(com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier>
const&)
-comphelper::OSelectionChangeListener::disposeAdapter()
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges>
const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString
const&) const
comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::shared_ptr<comphelper::ConfigurationChanges>
const&, rtl::OUString const&, com::sun::star::uno::Any const&) const
@@ -321,8 +320,6 @@
nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas:
nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&,
basegfx::B2DRange const&,
basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents
const&)
oox::drawingml::TextParagraphProperties::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper
const&)
-oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&,
oox::ValueRange const&, int)
-oox::xls::CellBlock::RichStringCell::RichStringCell(com::sun::star::table::CellAddress
const&, boost::shared_ptr<oox::xls::RichString> const&, oox::xls::Font const*)
sd::LeftDrawPaneShell::RegisterInterface(SfxModule*)
sd::LeftImpressPaneShell::RegisterInterface(SfxModule*)
sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
commit a5ae5d95f4e2ca1591126937cb650c871894dc64
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Sun Jul 15 11:49:45 2012 +0200
PRECOMPILED_HEADERS not defined
Change-Id: I9292f45585243ef0244b75df030421111e1ca0ae
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index a7689dc..96d79df 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -210,6 +210,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/doc/printhelper \
sfx2/source/doc/querytemplate \
sfx2/source/doc/docundomanager \
+ sfx2/source/doc/sfxacldetect \
sfx2/source/doc/sfxbasemodel \
sfx2/source/doc/sfxmodelfactory \
sfx2/source/doc/syspath \
@@ -283,13 +284,9 @@ endif
ifeq ($(OS),WNT)
-# workaround: disable PCH for these objects to avoid redeclaration
-# errors - needs to be fixed in module tools
-$(eval $(call gb_Library_add_cxxobjects,sfx,\
+$(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/appl/shutdowniconw32 \
- sfx2/source/doc/sfxacldetect \
sfx2/source/doc/syspathw32 \
- , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS)
-UPRECOMPILED_HEADERS \
))
$(eval $(call gb_Library_use_libraries,sfx,\
@@ -300,14 +297,6 @@ $(eval $(call gb_Library_use_libraries,sfx,\
uuid \
))
-else
-
-$(eval $(call gb_Library_add_cxxobjects,sfx,\
- sfx2/source/appl/shutdowniconw32 \
- sfx2/source/doc/sfxacldetect \
- , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILEROPTFLAGS) \
-))
-
endif
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
