[Libreoffice-commits] .: 9 commits - dbaccess/Module_dbaccess.mk oox/source slideshow/source svx/prj sw/prj tail_build/prj
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Oct 25 03:59:35 PDT 2011
dbaccess/Module_dbaccess.mk | 4 ++--
oox/source/drawingml/diagram/diagramlayoutatoms.hxx | 13 +++++++++++++
oox/source/export/drawingml.cxx | 3 ++-
oox/source/helper/propertymap.cxx | 4 ++--
oox/source/ole/olehelper.cxx | 1 +
oox/source/ppt/slidetimingcontext.cxx | 2 --
oox/source/xls/commentsbuffer.cxx | 2 --
oox/source/xls/sheetdatabuffer.cxx | 5 +++++
slideshow/source/engine/slideshowimpl.cxx | 2 +-
svx/prj/build.lst | 2 +-
sw/prj/build.lst | 2 +-
tail_build/prj/build.lst | 2 +-
12 files changed, 29 insertions(+), 13 deletions(-)
New commits:
commit 40360820036a5d6a3359d1b5ec748a47a7edd85f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 13:50:37 2011 +0300
WaE: unreachable code and unreferenced formal parameter
diff --git a/oox/source/xls/sheetdatabuffer.cxx b/oox/source/xls/sheetdatabuffer.cxx
index 54fd7b3..0839b9d 100644
--- a/oox/source/xls/sheetdatabuffer.cxx
+++ b/oox/source/xls/sheetdatabuffer.cxx
@@ -239,9 +239,13 @@ void CellBlockBuffer::setColSpans( sal_Int32 nRow, const ValueRangeSet& rColSpan
CellBlock* CellBlockBuffer::getCellBlock( const CellAddress& rCellAddr )
{
+ (void) rCellAddr; // Avoid WaE: unreferenced formal parameter, drop this line
+ // if the below "temporarily disabled" early return is removed
+
// Temporarily disabled. TODO: Fix this.
return NULL;
+#if 0 // Avoid WaE: unreachable code. Don't remove this ifdeffed out block, see above
OSL_ENSURE( rCellAddr.Row >= mnCurrRow, "CellBlockBuffer::getCellBlock - passed row out of order" );
// prepare cell blocks, if row changes
if( rCellAddr.Row != mnCurrRow )
@@ -312,6 +316,7 @@ CellBlock* CellBlockBuffer::getCellBlock( const CellAddress& rCellAddr )
// no valid cell block found
return 0;
+#endif // See start of method
}
void CellBlockBuffer::finalizeImport()
commit e3ec70c557d90fd504284c23036e6475b9f0b7c7
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 13:40:51 2011 +0300
WaE: unreachable code
diff --git a/oox/source/xls/commentsbuffer.cxx b/oox/source/xls/commentsbuffer.cxx
index 06a77df..c8a8d7d 100644
--- a/oox/source/xls/commentsbuffer.cxx
+++ b/oox/source/xls/commentsbuffer.cxx
@@ -78,7 +78,6 @@ static sal_Int32 lcl_ToHorizAlign( sal_Int32 nAlign )
default:
return SDRTEXTHORZADJUST_BLOCK;
}
- return SDRTEXTHORZADJUST_LEFT;
}
static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
@@ -94,7 +93,6 @@ static sal_Int32 lcl_ToVertAlign( sal_Int32 nAlign )
default:
return SDRTEXTVERTADJUST_BLOCK;
}
- return SDRTEXTVERTADJUST_TOP;
}
// ============================================================================
commit 8f8e25250dd575a2bce57fd9a67ed447a79dce52
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 13:39:46 2011 +0300
WaE: unreachable code
diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx
index 31738a5..40b33f3 100644
--- a/oox/source/ppt/slidetimingcontext.cxx
+++ b/oox/source/ppt/slidetimingcontext.cxx
@@ -78,8 +78,6 @@ SlideTimingContext::~SlideTimingContext() throw()
default:
return this;
}
-
- return this;
}
} }
commit f7f18708cc7ce344460d49f9d89db28c7eca51a6
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 13:38:57 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 1ac4a5d..34b17bd 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -483,6 +483,7 @@ class OleFormCtrlExportHelper
::rtl::OUString maGUID;
public:
OleFormCtrlExportHelper( const Reference< XComponentContext >& rxCtx, const Reference< XModel >& xDocModel, const Reference< XControlModel >& xModel );
+ virtual ~OleFormCtrlExportHelper() { }
virtual ::rtl::OUString getGUID()
{
rtl::OUString sResult;
commit 2cfd5509f99b057a380da2f9c0c5713ba218545a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 13:36:56 2011 +0300
WaE: unreferenced local variable
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index ae2e495..1877dc7 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -447,7 +447,7 @@ void PropertyMap::dump( Reference< XPropertySet > rXPropSet )
try {
lclDumpAnyValue (rXPropSet->getPropertyValue( props [i].Name ));
- } catch (const Exception& e) {
+ } catch (const Exception&) {
fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name));
}
}
@@ -800,7 +800,7 @@ void PropertyMap::dumpCode( Reference< XPropertySet > rXPropSet )
fprintf (stderr,"aPropertyMap [PROP_%s] <<= %s;\n", name.getStr(), var);
printLevel (level);
fprintf (stderr, "}\n");
- } catch (const Exception& e) {
+ } catch (const Exception&) {
fprintf (stderr,"unable to get '%s' value\n", USS(props [i].Name));
}
}
commit c4033b268d5d95feab92e4a81f9433cfe9d209ae
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 13:35:24 2011 +0300
WaE: assignment within conditional expression
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 7cf8d98..aae031d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -951,7 +951,8 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
}
}
- if( ( sFieldType = GetFieldType( rRun, bIsField ) ) ) {
+ sFieldType = GetFieldType( rRun, bIsField );
+ if( ( sFieldType != NULL ) ) {
OStringBuffer sUUID(39);
GetUUID( sUUID );
commit 9bf8654b563110d7df2488f7c7114ef42e502903
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 13:33:32 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index f065920..57b481c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -85,6 +85,8 @@ typedef boost::shared_ptr< LayoutAtom > LayoutAtomPtr;
class LayoutAtom
{
public:
+ virtual ~LayoutAtom() { }
+
/** visitor acceptance
*/
virtual void accept( LayoutAtomVisitor& ) = 0;
@@ -115,6 +117,8 @@ public:
mnRefType(-1), mnRefPointType(-1), mfFactor(1.0), mfValue(0.0), mnOperator(0)
{}
+ virtual ~ConstraintAtom() { }
+
virtual void accept( LayoutAtomVisitor& );
void setFor( sal_Int32 nToken )
@@ -161,6 +165,8 @@ class AlgAtom
public:
AlgAtom() : mnType(0), maMap() {}
+ virtual ~AlgAtom() { }
+
typedef std::map<sal_Int32,sal_Int32> ParamMap;
virtual void accept( LayoutAtomVisitor& );
@@ -185,6 +191,8 @@ class ForEachAtom
public:
explicit ForEachAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes);
+ virtual ~ForEachAtom() { }
+
IteratorAttr & iterator()
{ return maIter; }
virtual void accept( LayoutAtomVisitor& );
@@ -201,6 +209,8 @@ class ConditionAtom
{
public:
explicit ConditionAtom(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& xAttributes);
+ virtual ~ConditionAtom()
+ { }
bool test();
virtual void accept( LayoutAtomVisitor& );
IteratorAttr & iterator()
@@ -226,6 +236,8 @@ class ChooseAtom
: public LayoutAtom
{
public:
+ virtual ~ChooseAtom()
+ { }
virtual void accept( LayoutAtomVisitor& );
};
@@ -249,6 +261,7 @@ public:
typedef boost::array< ::com::sun::star::uno::Any, 9 > VarMap;
LayoutNode() : mnChildOrder(0) {}
+ virtual ~LayoutNode() { }
virtual void accept( LayoutAtomVisitor& );
VarMap & variables()
{ return mVariables; }
commit bb1132604721046c619d9918643f369dfa0706a4
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 12:31:41 2011 +0300
WaE: type name first seen using 'struct' now seen using 'class'
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index e43b20f..d85d538 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -360,7 +360,7 @@ protected:
private:
struct SeparateListenerImpl; friend struct SeparateListenerImpl;
- struct PrefetchPropertiesFunc; friend struct PrefetchPropertiesFunc;
+ class PrefetchPropertiesFunc; friend class PrefetchPropertiesFunc;
/// Stop currently running show.
void stopShow();
commit 9b4212f14b11993222f933f59a93359ebc44c708
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Tue Oct 25 12:18:16 2011 +0300
Build dbaccess and connectivity only for DESKTOP platforms for now
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 73b3e58..74dc987 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Module_Module,dbaccess))
-$(eval $(call gb_Module_add_targets,dbaccess,\
+$(if $(filter DESKTOP,$(BUILD_TYPE)),$(eval $(call gb_Module_add_targets,dbaccess,\
AllLangResTarget_adabasui \
AllLangResTarget_dba \
AllLangResTarget_dbmm \
@@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
Library_sdbt \
Package_inc \
Package_uiconfig \
-))
+)))
$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
JunitTest_dbaccess_complex \
diff --git a/svx/prj/build.lst b/svx/prj/build.lst
index 34ca30e..85d4b04 100644
--- a/svx/prj/build.lst
+++ b/svx/prj/build.lst
@@ -1,2 +1,2 @@
-sx svx : sfx2 TRANSLATIONS:translations oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
+sx svx : sfx2 TRANSLATIONS:translations oovbaapi DESKTOP:connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL
sx svx\prj nmake - all sx_prj NULL
diff --git a/sw/prj/build.lst b/sw/prj/build.lst
index 75c602e..07537d6 100644
--- a/sw/prj/build.lst
+++ b/sw/prj/build.lst
@@ -1,2 +1,2 @@
-sw sw : filter TRANSLATIONS:translations connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit dbaccess comphelper LIBXSLT:libxslt test NULL
+sw sw : filter TRANSLATIONS:translations DESKTOP:connectivity writerperfect vbahelper svx stoc writerfilter unoxml fileaccess package forms toolkit DESKTOP:dbaccess comphelper LIBXSLT:libxslt test NULL
sw sw\prj nmake - all sw_prj NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 16df54b..53e4b44 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost l10ntools LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper DESKTOP:connectivity cppcanvas cppu cppuhelper fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
More information about the Libreoffice-commits
mailing list