[Libreoffice-commits] .: 9 commits - sd/Library_sd.mk sd/source solenv/gbuild solenv/inc starmath/source
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Oct 26 05:28:31 PDT 2011
sd/Library_sd.mk | 5 +----
sd/source/core/sdpage2.cxx | 6 +++---
sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 3 +++
sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 4 ++++
sd/source/ui/view/viewshel.cxx | 4 ++--
solenv/gbuild/platform/windows.mk | 2 ++
solenv/inc/wntmsc.mk | 2 +-
starmath/source/mathmlimport.cxx | 2 +-
starmath/source/ooxml.cxx | 12 +++++++-----
starmath/source/view.cxx | 2 +-
10 files changed, 25 insertions(+), 17 deletions(-)
New commits:
commit 70db161e697c1a222695053d95ad58ff8821168b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 15:14:46 2011 +0300
WaE: C++ exception handler used, but unwind semantics are not enabled
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 96e6e69..51db250 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -173,6 +173,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/app/sdmod1 \
sd/source/ui/app/sdmod2 \
sd/source/ui/app/sdpopup \
+ sd/source/ui/app/sdresid \
sd/source/ui/app/sdxfer \
sd/source/ui/app/tbxww \
sd/source/ui/app/tmplctrl \
@@ -494,10 +495,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/view/zoomlist \
))
-$(eval $(call gb_Library_add_noexception_objects,sd,\
- sd/source/ui/app/sdresid \
-))
-
ifeq ($(strip $(GUI)),WNT)
$(eval $(call gb_Library_add_cxxobjects,sd,\
sd/source/ui/app/optsitem \
commit 19ced247c6ad3351e8808c783e99fd19d9e5a473
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 15:12:45 2011 +0300
WaE: unreferenced local variable
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index bb13578..9ca0789 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -1151,7 +1151,7 @@ void ViewShell::ImpSidUndo(sal_Bool, SfxRequest& rReq)
pUndoManager->Undo();
}
}
- catch( const Exception& e )
+ catch( const Exception& )
{
// no need to handle. By definition, the UndoManager handled this by clearing the
// Undo/Redo stacks
@@ -1200,7 +1200,7 @@ void ViewShell::ImpSidRedo(sal_Bool, SfxRequest& rReq)
pUndoManager->Redo();
}
}
- catch( const Exception& e )
+ catch( const Exception& )
{
// no need to handle. By definition, the UndoManager handled this by clearing the
// Undo/Redo stacks
commit cfb050dfb18e2b8ede912b70a55778beb42458b3
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 15:10:41 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index 242aa9a..58e0f34 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -55,6 +55,10 @@ public:
{
}
+ virtual ~LayerInvalidator ( )
+ {
+ }
+
virtual void Invalidate (const Rectangle& rInvalidationBox)
{
mpLayeredDevice->Invalidate(rInvalidationBox, mnLayer);
commit 00677707d3f7b3775d267f11474a04430c2d2c3e
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 15:08:42 2011 +0300
WaE: class has virtual functions, but destructor is not virtual
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index a60fd91..8977032 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -70,6 +70,7 @@ public:
BackgroundTheme(
const ::boost::shared_ptr<Theme>& rpTheme,
const ::std::vector<SharedButton>& rButtons);
+ virtual ~BackgroundTheme() { }
/** Set the preview bounding box, the maximal area in which to display
buttons. A call to this method triggers a call to Layout().
*/
@@ -106,6 +107,7 @@ namespace {
RectangleBackgroundTheme(
const ::boost::shared_ptr<Theme>& rpTheme,
const ::std::vector<SharedButton>& rButtons);
+ virtual ~RectangleBackgroundTheme() { }
virtual BitmapEx CreateBackground (
const OutputDevice& rTemplateDevice,
const bool bIsButtonDown) const;
@@ -127,6 +129,7 @@ namespace {
BitmapBackgroundTheme(
const ::boost::shared_ptr<Theme>& rpTheme,
const ::std::vector<SharedButton>& rButtons);
+ virtual ~BitmapBackgroundTheme() { }
virtual BitmapEx CreateBackground (
const OutputDevice& rTemplateDevice,
const bool bIsButtonDown) const;
commit 69746a5e96a17875adc9854506148f38ba6d0d4f
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 15:05:27 2011 +0300
WaE: reinterpret_cast used between related classes
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index e5576bc..96c31fd 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -217,8 +217,8 @@ void SdPage::SetPresentationLayout(const String& rLayoutName,
while (iterOut != aOutlineStyles.end())
{
- pSheet = reinterpret_cast<SfxStyleSheet*>(*iterOut);
- pOldSheet = reinterpret_cast<SfxStyleSheet*>(*iterOldOut);
+ pSheet = static_cast<SfxStyleSheet*>(*iterOut);
+ pOldSheet = static_cast<SfxStyleSheet*>(*iterOldOut);
if (pSheet != pOldSheet)
{
@@ -290,7 +290,7 @@ void SdPage::EndListenOutlineText()
std::vector<SfxStyleSheetBase*>::iterator iter;
for (iter = aOutlineStyles.begin(); iter != aOutlineStyles.end(); ++iter)
{
- pSheet = reinterpret_cast<SfxStyleSheet*>(*iter);
+ pSheet = static_cast<SfxStyleSheet*>(*iter);
pOutlineTextObj->EndListening(*pSheet);
}
}
commit c07c94e4875e321f4f2503e0ba8c816d7f32b5f7
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 14:59:17 2011 +0300
WaE: possible change in behavior, change in UDT return calling convention
Ignore also MSVC warning C4686. From
http://msdn.microsoft.com/en-us/library/ae77984s%28v=VS.90%29.aspx it
seems that this is just a warning that the compiler behaviour has
changed, but that change was already in MSVC 2003. So it should be
irrelevant to us.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index eee6bad..896eb0d 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -121,6 +121,7 @@ gb_CFLAGS := \
-wd4640 \
-wd4668 \
-wd4675 \
+ -wd4686 \
-wd4692 \
-wd4706 \
-wd4710 \
@@ -175,6 +176,7 @@ gb_CXXFLAGS := \
-wd4640 \
-wd4668 \
-wd4675 \
+ -wd4686 \
-wd4692 \
-wd4706 \
-wd4710 \
diff --git a/solenv/inc/wntmsc.mk b/solenv/inc/wntmsc.mk
index 3680ce9..3c4bbf8 100644
--- a/solenv/inc/wntmsc.mk
+++ b/solenv/inc/wntmsc.mk
@@ -196,7 +196,7 @@ CFLAGSOUTOBJ=-Fo
CFLAGSWARNCXX=-Wall -wd4061 -wd4127 -wd4191 -wd4217 -wd4242 -wd4244 -wd4245 -wd4250 -wd4251 -wd4275 \
-wd4290 -wd4294 -wd4355 -wd4511 -wd4512 -wd4514 -wd4555 -wd4611 -wd4625 -wd4626 \
- -wd4640 -wd4675 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
+ -wd4640 -wd4675 -wd4686 -wd4706 -wd4710 -wd4711 -wd4786 -wd4800 -wd4820 -wd4503 -wd4619 \
-wd4365 -wd4668 -wd4738 -wd4826 -wd4350 -wd4505 -wd4692 -wd4189 -wd4005 \
-wd4180
CFLAGSWARNCC=$(CFLAGSWARNCXX) -wd4255
commit c6a24a5e74ed849b3255e276bfdaaf61a06f275a
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 14:07:40 2011 +0300
WaE: unsafe mix of type 'bool' and type 'sal_Bool' in operation
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index ffd5413..0dec05a 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -826,7 +826,7 @@ void SmCmdBoxWindow::StateChanged( StateChangedType nStateChange )
Resize(); // avoid SmEditWindow not being painted correctly
// set initial position of window in floating mode
- if (true == IsFloatingMode())
+ if (IsFloatingMode())
AdjustPosition(); //! don't change pos in docking-mode !
aInitialFocusTimer.Start();
commit 8eb0a79b94f7155e30b98efc5a88fba248639564
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 14:07:04 2011 +0300
WaE: unreferenced local variable
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index f354785..a00fa3b 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2984,7 +2984,7 @@ void SmXMLImport::SetConfigurationSettings(const Sequence<PropertyValue>& aConfP
(void) e;
// dealing with read-only properties here. Nothing to do...
}
- catch( Exception& e)
+ catch( Exception& )
{
OSL_FAIL( "SmXMLImport::SetConfigurationSettings: Exception!" );
}
commit 849651d01b8271a33de2a3e06eadf22b52383cc9
Author: Tor Lillqvist <tlillqvist at suse.com>
Date: Wed Oct 26 14:05:48 2011 +0300
WaE: switch statement contains 'default' but no 'case' labels
diff --git a/starmath/source/ooxml.cxx b/starmath/source/ooxml.cxx
index f083ca7..0ae67c6 100644
--- a/starmath/source/ooxml.cxx
+++ b/starmath/source/ooxml.cxx
@@ -329,12 +329,14 @@ void SmOoxml::HandleUnaryOperation( const SmUnHorNode* pNode, int nLevel )
{
// update HandleMath() when adding new items
// fprintf(stderr,"UNARY %d\n", pNode->GetToken().eType );
- switch( pNode->GetToken().eType )
- {
- default:
+
+// Avoid MSVC warning C4065: switch statement contains 'default' but no 'case' labels
+// switch( pNode->GetToken().eType )
+// {
+// default:
HandleAllSubNodes( pNode, nLevel );
- break;
- }
+// break;
+// }
}
void SmOoxml::HandleBinaryOperation( const SmBinHorNode* pNode, int nLevel )
More information about the Libreoffice-commits
mailing list