sd/source/ui/sidebar/MasterPageDescriptor.hxx | 8 ++++----
sd/source/ui/sidebar/PanelFactory.hxx | 2 +-
sd/source/ui/sidebar/PreviewValueSet.hxx | 2 +-
sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx | 2 +-
sd/source/ui/slideshow/slideshowimpl.cxx | 11 -----------
sw/source/core/text/frmform.cxx | 13 -------------
6 files changed, 7 insertions(+), 31 deletions(-)
New commits:
commit a0fca97eda10778be076c411dfd513e2a38937ae
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue May 5 08:11:08 2015 +0100
drop useless temp debugging strings
Change-Id: Iee9c1bd37664188e4dc10b929eb72b6370001417
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 7ad55d7..aa18669 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -1873,19 +1873,6 @@ bool SwTxtFrm::FormatQuick( bool bForceQuickFormat )
OSL_ENSURE( ! IsVertical() || ! IsSwapped(),
"SwTxtFrm::FormatQuick with swapped frame" );
-#if OSL_DEBUG_LEVEL > 1
- const OUString aXXX = GetTxtNode()->GetTxt();
- const SwTwips nDbgY = Frm().Top();
- (void)nDbgY;
- // nStopAt allows CV to alter it
- static sal_uInt16 nStopAt = 0;
- if( nStopAt == GetFrmId() )
- {
- int i = GetFrmId();
- (void)i;
- }
-#endif
-
if( IsEmpty() && FormatEmpty() )
return true;
commit f74ac7c486fd8f0a19a2a76b2b2fcbf45a84b4e4
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon May 4 20:57:01 2015 +0100
cppcheck: unreadVariable
since
Start slideshow with the next visible slide
commit 45e4a5ef5347f7e2fe90a0d411e3749f24008c3a
Author: Katarina Behrens <bu...@bubli.org>
Date: Sat Mar 23 20:32:40 2013 +0100
Change-Id: Ib04aac2b223a38dbf46ee8cea3194e116e435eb6
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx
b/sd/source/ui/slideshow/slideshowimpl.cxx
index 28c4a82..d7c2c6d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -941,17 +941,6 @@ bool SlideshowImpl::startShow( PresentationSettingsEx*
pPresSettings )
{
maPresSettings.mbAll = false;
}
- else
- {
- bStartWithActualSlide = false;
- }
- }
- }
- else
- {
- if( !pStartPage || pStartPage->GetPageKind() != PK_STANDARD )
- {
- bStartWithActualSlide = false;
}
}
commit a0791aa295a12439952140a3ac76d42ae2f05886
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon May 4 20:52:50 2015 +0100
cppcheck: noExplicitConstructor
Change-Id: I07aaf57291239e30b1600bd1061821b4759b8a0b
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 7636cf6..a002203 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -204,21 +204,21 @@ public:
class URLComparator { public:
OUString msURL;
- URLComparator (const OUString& sURL);
+ explicit URLComparator (const OUString& sURL);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
class StyleNameComparator { public:
OUString msStyleName;
- StyleNameComparator (const OUString& sStyleName);
+ explicit StyleNameComparator (const OUString& sStyleName);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
class PageObjectComparator { public:
const SdPage* mpMasterPage;
- PageObjectComparator (const SdPage* pPageObject);
+ explicit PageObjectComparator (const SdPage* pPageObject);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
};
class AllComparator { public:
- AllComparator(const SharedMasterPageDescriptor& rDescriptor);
+ explicit AllComparator(const SharedMasterPageDescriptor& rDescriptor);
bool operator() (const SharedMasterPageDescriptor& rDescriptor);
private:
SharedMasterPageDescriptor mpDescriptor;
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx
b/sd/source/ui/sidebar/PanelFactory.hxx
index 6188e30..654fd9d 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -57,7 +57,7 @@ public:
const css::uno::Reference<css::lang::XMultiServiceFactory>& rxFactory);
static css::uno::Sequence<rtl::OUString> SAL_CALL
getSupportedServiceNames();
- PanelFactory (const css::uno::Reference<css::uno::XComponentContext>&
rxContext);
+ explicit PanelFactory (const
css::uno::Reference<css::uno::XComponentContext>& rxContext);
virtual ~PanelFactory();
virtual void SAL_CALL disposing() SAL_OVERRIDE;
diff --git a/sd/source/ui/sidebar/PreviewValueSet.hxx
b/sd/source/ui/sidebar/PreviewValueSet.hxx
index c8629f6..b48c840 100644
--- a/sd/source/ui/sidebar/PreviewValueSet.hxx
+++ b/sd/source/ui/sidebar/PreviewValueSet.hxx
@@ -30,7 +30,7 @@ class PreviewValueSet
: public ValueSet
{
public:
- PreviewValueSet (vcl::Window* pParent);
+ explicit PreviewValueSet (vcl::Window* pParent);
virtual ~PreviewValueSet();
void SetRightMouseClickHandler (const Link<>& rLink);
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
index f4d1809..c4da8a3 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.hxx
@@ -69,7 +69,7 @@ private:
class TokenComparator
{
public:
- TokenComparator(::sd::sidebar::MasterPageContainer::Token aToken)
+ explicit TokenComparator(::sd::sidebar::MasterPageContainer::Token
aToken)
: maToken(aToken) {}
bool operator () (const Descriptor& rDescriptor)
{ return maToken==rDescriptor.maToken; }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
