[Libreoffice-commits] .: 3 commits - android/experimental android/qa canvas/source fileaccess/source solenv/gbuild unusedcode.easy
Matus Kukan
mkukan at kemper.freedesktop.org
Sun Aug 12 16:49:06 PDT 2012
android/experimental/DocumentLoader/Makefile | 1
android/experimental/LibreOffice4Android/Makefile | 1
android/qa/desktop/Makefile | 1
android/qa/sc/Makefile | 1
canvas/source/null/null_spritecanvashelper.cxx | 23 ---------------
canvas/source/null/null_spritecanvashelper.hxx | 32 ----------------------
fileaccess/source/FileAccess.cxx | 6 ++--
solenv/gbuild/extensions/pre_MergedLibsList.mk | 10 +++++-
unusedcode.easy | 4 --
9 files changed, 11 insertions(+), 68 deletions(-)
New commits:
commit d10b5d34a266f1e1793109a629804cd54f665258
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Aug 12 14:56:36 2012 +0200
fileaccess: use anonymous namespace
Change-Id: I697850a43c9942833776c60752cf4639ec255768
diff --git a/fileaccess/source/FileAccess.cxx b/fileaccess/source/FileAccess.cxx
index 710050b..d6f2b14 100644
--- a/fileaccess/source/FileAccess.cxx
+++ b/fileaccess/source/FileAccess.cxx
@@ -70,7 +70,7 @@ using namespace ::com::sun::star::container;
using ::std::vector;
-namespace io_FileAccess
+namespace
{
@@ -858,8 +858,8 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL fileacc_component_getFactory(
Reference< XSingleServiceFactory > xFactory( cppu::createSingleFactory(
reinterpret_cast< XMultiServiceFactory * >( pServiceManager ),
rtl::OUString::createFromAscii( pImplName ),
- io_FileAccess::FileAccess_CreateInstance,
- io_FileAccess::FileAccess_getSupportedServiceNames() ) );
+ FileAccess_CreateInstance,
+ FileAccess_getSupportedServiceNames() ) );
if (xFactory.is())
{
commit 5f9774ed5fccfc3971736d899b11e24a8081442d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri May 18 09:54:55 2012 +0200
merge these libraries only for android
Change-Id: Ibbb97782f3ec6aa774c4a32d8798a9729aee494f
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 279f6a4..c7901a7 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -65,7 +65,6 @@ copy-stuff:
evtattlo \
expwrap.uno \
fastsax.uno \
- fileacc \
forlo \
foruilo \
frmlo \
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index 1365407..3a49c7d 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -36,7 +36,6 @@ copy-stuff:
evtattlo \
expwrap.uno \
fastsax.uno \
- fileacc \
forlo \
foruilo \
frmlo \
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 799edc2..7ad9ac0 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -99,7 +99,6 @@ copy-stuff: buildrcs
cppcanvaslo \
embobj \
expwrap.uno \
- fileacc \
forlo \
foruilo \
fsstorage.uno \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 3b92d3b..f3e4795 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -65,7 +65,6 @@ copy-stuff:
datelo \
expwrap.uno \
fastsax.uno \
- fileacc \
forlo \
foruilo \
frmlo \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 7a05039..fe75c36 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -40,8 +40,6 @@ gb_MERGEDLIBS := \
fwe \
fwi \
fwk \
- fwl \
- fwm \
lng \
package2 \
sb \
@@ -60,6 +58,14 @@ gb_MERGEDLIBS := \
gb_MERGEDLIBS += $(if $(filter TRUE,$(ENABLE_TELEPATHY)),tubes)
+ifeq ($(OS),ANDROID)
+gb_MERGEDLIBS += \
+ fileacc \
+ fwl \
+ fwm \
+
+endif
+
endif
# vim: set noet sw=4 ts=4:
commit 23461fcf801a8217e7eeefa93c44ec18c7a73088
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Aug 12 13:26:58 2012 +0200
unusedcode: SpriteCanvasHelper's methods
Change-Id: I24021fa1495a9fb48c1cb5f107d119031a4d1e87
diff --git a/canvas/source/null/null_spritecanvashelper.cxx b/canvas/source/null/null_spritecanvashelper.cxx
index 5edd364..80ef73a 100644
--- a/canvas/source/null/null_spritecanvashelper.cxx
+++ b/canvas/source/null/null_spritecanvashelper.cxx
@@ -95,29 +95,6 @@ namespace nullcanvas
// TODO
return sal_True;
}
-
- void SpriteCanvasHelper::backgroundPaint( const ::basegfx::B2DRange& /*rUpdateRect*/ )
- {
- // TODO
- }
-
- void SpriteCanvasHelper::scrollUpdate( const ::basegfx::B2DRange& /*rMoveStart*/,
- const ::basegfx::B2DRange& /*rMoveEnd*/,
- const ::canvas::SpriteRedrawManager::UpdateArea& /*rUpdateArea*/ )
- {
- // TODO
- }
-
- void SpriteCanvasHelper::opaqueUpdate( const ::canvas::SpriteRedrawManager::UpdateArea& /*rUpdateArea*/ )
- {
- // TODO
- }
-
- void SpriteCanvasHelper::genericUpdate( const ::canvas::SpriteRedrawManager::UpdateArea& /*rUpdateArea*/ )
- {
- // TODO
- }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/null/null_spritecanvashelper.hxx b/canvas/source/null/null_spritecanvashelper.hxx
index e3f2b3a..59db03e 100644
--- a/canvas/source/null/null_spritecanvashelper.hxx
+++ b/canvas/source/null/null_spritecanvashelper.hxx
@@ -86,38 +86,6 @@ namespace nullcanvas
sal_Bool bUpdateAll,
bool& io_bSurfaceDirty );
-
- // SpriteRedrawManager functor calls
- // -------------------------------------------------
-
- /** Gets called for simple background repaints
- */
- void backgroundPaint( const ::basegfx::B2DRange& rUpdateRect );
-
- /** Gets called when area can be handled by scrolling.
-
- Called method must copy screen content from rMoveStart to
- rMoveEnd, and restore the background in the uncovered
- areas.
-
- @param rMoveStart
- Source rect of the scroll
-
- @param rMoveEnd
- Dest rect of the scroll
-
- @param rUpdateArea
- All info necessary, should rMoveStart be partially or
- fully outside the outdev
- */
- void scrollUpdate( const ::basegfx::B2DRange& rMoveStart,
- const ::basegfx::B2DRange& rMoveEnd,
- const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
-
- void opaqueUpdate( const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
-
- void genericUpdate( const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
-
private:
/// Set from the SpriteCanvas: instance coordinating sprite redraw
::canvas::SpriteRedrawManager* mpRedrawManager;
diff --git a/unusedcode.easy b/unusedcode.easy
index 2b6cd46..d647416 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -91,10 +91,6 @@ connectivity::toString(com::sun::star::uno::Any const&)
dbtools::getConnection(rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
formula::FormulaTokenIterator::First()
jfw_plugin::VendorBase::createInstance()
-nullcanvas::SpriteCanvasHelper::backgroundPaint(basegfx::B2DRange const&)
-nullcanvas::SpriteCanvasHelper::genericUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-nullcanvas::SpriteCanvasHelper::opaqueUpdate(basegfx::B2DConnectedRanges<canvas::SpriteRedrawManager::SpriteInfo>::ConnectedComponents const&)
-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&)
sd::ImagePreparer::notesToHtml(unsigned int)
More information about the Libreoffice-commits
mailing list