desktop/source/app/cmdlineargs.hxx | 2 desktop/source/app/desktopresid.hxx | 2 desktop/source/deployment/gui/dp_gui.h | 2 desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 - desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 2 desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 6 +- desktop/source/deployment/gui/dp_gui_shared.hxx | 2 desktop/source/deployment/gui/dp_gui_updatedata.hxx | 2 desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 2 desktop/source/deployment/manager/dp_commandenvironments.hxx | 6 +- desktop/source/deployment/manager/dp_extensionmanager.hxx | 2 desktop/source/deployment/manager/dp_informationprovider.cxx | 2 desktop/source/deployment/manager/dp_manager.cxx | 2 desktop/source/deployment/manager/dp_managerfac.cxx | 2 desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 2 desktop/source/lib/init.cxx | 2 desktop/source/migration/services/oo3extensionmigration.hxx | 2 desktop/source/offacc/acceptor.hxx | 2 desktop/source/pkgchk/unopkg/unopkg_app.cxx | 4 - desktop/source/pkgchk/unopkg/unopkg_shared.h | 2 desktop/source/splash/splash.cxx | 2 desktop/source/splash/unxsplash.hxx | 2 desktop/test/deployment/active/active_native.cxx | 4 - desktop/test/deployment/passive/passive_native.cxx | 4 - sw/qa/extras/ww8export/data/fdo66304-1.odt |binary sw/qa/extras/ww8export/ww8export.cxx | 5 ++ sw/source/core/doc/DocumentContentOperationsManager.cxx | 25 +++++++++++ 27 files changed, 62 insertions(+), 32 deletions(-)
New commits: commit acdf113baf04263a03d574eac9a8c09f98598b7a Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jun 24 15:57:03 2015 +0100 crashtesting: fix asserts on exporting fdo66304-1.odt to doc Change-Id: Ia08207143d27f88d09bd45e64ba7c3c12cd2c1a1 diff --git a/sw/qa/extras/ww8export/data/fdo66304-1.odt b/sw/qa/extras/ww8export/data/fdo66304-1.odt new file mode 100644 index 0000000..c3fb9bc Binary files /dev/null and b/sw/qa/extras/ww8export/data/fdo66304-1.odt differ diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx index 2347fdc..e1626cd 100644 --- a/sw/qa/extras/ww8export/ww8export.cxx +++ b/sw/qa/extras/ww8export/ww8export.cxx @@ -529,6 +529,11 @@ DECLARE_WW8EXPORT_TEST(testCommentExport, "comment-export.odt") } } +DECLARE_WW8EXPORT_TEST(testMoveRange, "fdo66304-1.odt") +{ + //the save must survive without asserting +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 4f7b0bd..f3ef4c2 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -1961,8 +1961,33 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos, const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create()); pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true ); + SwTextNode * pOrigNode = pTNd; + assert(*aSavePam.GetPoint() == *aSavePam.GetMark() && + *aSavePam.GetPoint() == rPos); + assert(aSavePam.GetPoint()->nContent.GetIdxReg() == pOrigNode); + assert(aSavePam.GetPoint()->nNode == rPos.nNode.GetIndex()); + assert(rPos.nNode.GetIndex() == pOrigNode->GetIndex()); + pTNd = pTNd->SplitContentNode( rPos )->GetTextNode(); + //A new node was inserted before the orig pTNd and the content up to + //rPos moved into it. The old node is returned with the remainder + //of the content in it. + // + //aSavePam was created with rPos, it continues to point to the + //old node, but with the *original* content index into the node. + //Seeing as all the orignode content before that index has + //been removed, the new index into the original node should now be set + //to 0 and the content index of rPos should also be adapted to the + //truncated node + assert(*aSavePam.GetPoint() == *aSavePam.GetMark() && + *aSavePam.GetPoint() == rPos); + assert(aSavePam.GetPoint()->nContent.GetIdxReg() == pOrigNode); + assert(aSavePam.GetPoint()->nNode == rPos.nNode.GetIndex()); + assert(rPos.nNode.GetIndex() == pOrigNode->GetIndex()); + aSavePam.GetPoint()->nContent.Assign(pOrigNode, 0); + rPos = *aSavePam.GetMark() = *aSavePam.GetPoint(); + if( !pContentStore->Empty() ) pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true ); commit df5ec49bcaa57aa0a137db45d7c0766733f7e508 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Jun 24 17:35:37 2015 +0100 cppcheck: noExplicitConstructor Change-Id: I80cd2975f17bb7fa57fa669873ef1dd8f3595a11 diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 7b8c0da..fe8ea8b 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -51,7 +51,7 @@ class CommandLineArgs: private boost::noncopyable }; CommandLineArgs(); - CommandLineArgs( Supplier& supplier ); + explicit CommandLineArgs( Supplier& supplier ); boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; } diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx index d07df7e..4311421 100644 --- a/desktop/source/app/desktopresid.hxx +++ b/desktop/source/app/desktopresid.hxx @@ -28,7 +28,7 @@ namespace desktop class DesktopResId : public ResId { public: - DesktopResId( sal_uInt16 nId ); + explicit DesktopResId( sal_uInt16 nId ); }; } diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 0de1148..b99099f 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -68,7 +68,7 @@ enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE }; class SelectedPackage: public salhelper::SimpleReferenceObject { public: SelectedPackage() {} - SelectedPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> &xPackage) + explicit SelectedPackage( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> &xPackage) : m_xPackage( xPackage ) {} diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 2bea724..86adb02 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -136,8 +136,8 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl DECL_DLLPRIVATE_LINK( HandleRemoveBtn, void * ); public: - ExtBoxWithBtns_Impl(vcl::Window* pParent); - virtual ~ExtBoxWithBtns_Impl(); + explicit ExtBoxWithBtns_Impl(vcl::Window* pParent); + virtual ~ExtBoxWithBtns_Impl(); virtual void dispose() SAL_OVERRIDE; void InitFromDialog(ExtMgrDialog *pParentDialog); diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 35b6246..3ff477c 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -47,7 +47,7 @@ struct FindWeakRef { const uno::Reference<deployment::XPackage> m_extension; - FindWeakRef( uno::Reference<deployment::XPackage> const & ext): m_extension(ext) {} + explicit FindWeakRef( uno::Reference<deployment::XPackage> const & ext): m_extension(ext) {} bool operator () (uno::WeakReference< deployment::XPackage > const & ref); }; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 6a027c4..0d5ca8f 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -96,8 +96,8 @@ class ExtensionRemovedListener : public ::cppu::WeakImplHelper1<css::lang::XEven public: - ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; } - virtual ~ExtensionRemovedListener(); + explicit ExtensionRemovedListener( ExtensionBox_Impl *pParent ) { m_pParent = pParent; } + virtual ~ExtensionRemovedListener(); // XEventListener @@ -173,7 +173,7 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox void Init(); public: - ExtensionBox_Impl(vcl::Window* pParent); + explicit ExtensionBox_Impl(vcl::Window* pParent); virtual ~ExtensionBox_Impl(); virtual void dispose() SAL_OVERRIDE; diff --git a/desktop/source/deployment/gui/dp_gui_shared.hxx b/desktop/source/deployment/gui/dp_gui_shared.hxx index 8d926c8..bd175cb 100644 --- a/desktop/source/deployment/gui/dp_gui_shared.hxx +++ b/desktop/source/deployment/gui/dp_gui_shared.hxx @@ -36,7 +36,7 @@ struct DeploymentGuiResMgr : class DpGuiResId : public ResId { public: - DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {} + explicit DpGuiResId( sal_uInt16 nId ):ResId( nId, *DeploymentGuiResMgr::get() ) {} }; #define DPGUI_RESSTR(i) DpGuiResId(i).toString() diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index c8ae7ab..ac12cc0 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -38,7 +38,7 @@ namespace dp_gui { struct UpdateData { - UpdateData( ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & aExt): + explicit UpdateData( ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & aExt): bIsShared(false), aInstalledPackage(aExt), aUpdateSource(NULL), m_nID(0), m_bIgnored(false){}; //When entries added to the listbox then there can be one for the user update and one diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 18fa9de..76851b4 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -115,7 +115,7 @@ private: sal_uInt16 getItemCount() const; private: - CheckListBox(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION; + explicit CheckListBox(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION; void operator =(UpdateDialog::CheckListBox &) SAL_DELETED_FUNCTION; virtual void MouseButtonDown(MouseEvent const & event) SAL_OVERRIDE; diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index d51d161..b45c28d 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -44,7 +44,7 @@ protected: public: virtual ~BaseCommandEnv(); BaseCommandEnv(); - BaseCommandEnv( + explicit BaseCommandEnv( css::uno::Reference< css::task::XInteractionHandler> const & handler); // XCommandEnvironment @@ -70,7 +70,7 @@ class TmpRepositoryCommandEnv : public BaseCommandEnv { public: TmpRepositoryCommandEnv(); - TmpRepositoryCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler); + explicit TmpRepositoryCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler); // XInteractionHandler virtual void SAL_CALL handle( @@ -111,7 +111,7 @@ class NoLicenseCommandEnv : public BaseCommandEnv public: NoLicenseCommandEnv(){}; - NoLicenseCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler); + explicit NoLicenseCommandEnv(css::uno::Reference< css::task::XInteractionHandler> const & handler); // XInteractionHandler virtual void SAL_CALL handle( diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 47a3e96..1c2cea9 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -44,7 +44,7 @@ class ExtensionManager : private ::dp_misc::MutexHolder, public ::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager > { public: - ExtensionManager( css::uno::Reference< css::uno::XComponentContext >const& xContext); + explicit ExtensionManager( css::uno::Reference< css::uno::XComponentContext >const& xContext); virtual ~ExtensionManager(); static css::uno::Sequence< OUString > getServiceNames(); diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index be26372..b550f09 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -63,7 +63,7 @@ class PackageInformationProvider : { public: - PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext); + explicit PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext); virtual ~PackageInformationProvider(); // XPackageInformationProvider diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 0610d0e..c7a4429 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -78,7 +78,7 @@ namespace dp_manager { struct MatchTempDir { OUString m_str; - MatchTempDir( OUString const & str ) : m_str( str ) {} + explicit MatchTempDir( OUString const & str ) : m_str( str ) {} bool operator () ( ActivePackages::Entries::value_type const & v ) const { return v.second.temporaryName.equalsIgnoreAsciiCase( m_str ); } diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 49238f9..06a5acd 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -56,7 +56,7 @@ protected: public: virtual ~PackageManagerFactoryImpl(); - PackageManagerFactoryImpl( + explicit PackageManagerFactoryImpl( Reference<XComponentContext> const & xComponentContext ); // XPackageManagerFactory diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 292d0bf..dab93e3 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -148,7 +148,7 @@ class FileDoesNotExistFilter public: virtual ~FileDoesNotExistFilter(); - FileDoesNotExistFilter( + explicit FileDoesNotExistFilter( const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv); bool exist() { return m_bExist;} diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index c043e04..ee47cd8 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -229,7 +229,7 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument uno::Reference<css::lang::XComponent> mxComponent; shared_ptr< LibreOfficeKitDocumentClass > m_pDocumentClass; - LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent) : + explicit LibLODocument_Impl(const uno::Reference <css::lang::XComponent> &xComponent) : mxComponent( xComponent ) { if (!(m_pDocumentClass = gDocumentClass.lock())) diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 33b0809..ad04d83 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -87,7 +87,7 @@ namespace migration void migrateExtension( const OUString& sSourceDir ); public: - OO3ExtensionMigration(::com::sun::star::uno::Reference< + explicit OO3ExtensionMigration(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & ctx); virtual ~OO3ExtensionMigration(); diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index a7c35ae..2881bf9 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -71,7 +71,7 @@ private: bool m_bDying; public: - Acceptor( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit Acceptor( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); virtual ~Acceptor(); void run(); diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index dc79adc..cb37894 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -56,7 +56,7 @@ namespace { struct ExtensionName { OUString m_str; - ExtensionName( OUString const & str ) : m_str( str ) {} + explicit ExtensionName( OUString const & str ) : m_str( str ) {} bool operator () ( Reference<deployment::XPackage> const & e ) const { if (m_str.equals(dp_misc::getIdentifier(e)) @@ -127,7 +127,7 @@ class DialogClosedListenerImpl : osl::Condition & m_rDialogClosedCondition; public: - DialogClosedListenerImpl( osl::Condition & rDialogClosedCondition ) + explicit DialogClosedListenerImpl( osl::Condition & rDialogClosedCondition ) : m_rDialogClosedCondition( rDialogClosedCondition ) {} // XEventListener (base of XDialogClosedListener) diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index 26a047a..5c25fbc 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -49,7 +49,7 @@ struct OptionInfo struct LockFileException : public css::uno::Exception { - LockFileException(OUString const & sMessage) : + explicit LockFileException(OUString const & sMessage) : css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {} }; diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index b00c632..8de8c29 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -54,7 +54,7 @@ class SplashScreenWindow : public IntroWindow public: SplashScreen *pSpl; ScopedVclPtr<VirtualDevice> _vdev; - SplashScreenWindow(SplashScreen *); + explicit SplashScreenWindow(SplashScreen *); virtual ~SplashScreenWindow() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; // workwindow diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index 901e327..e712334 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -48,7 +48,7 @@ private: FILE *m_pOutFd; public: - UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx ); + explicit UnxSplashScreen( const css::uno::Reference< css::uno::XComponentContext >& xCtx ); // XStatusIndicator virtual void SAL_CALL start( const OUString& aText, sal_Int32 nRange ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index c88e191..06da72a 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -74,7 +74,7 @@ public: static_getSupportedServiceNames(); private: - Provider( + explicit Provider( css::uno::Reference< css::uno::XComponentContext > const & context): context_(context) { assert(context.is()); } @@ -166,7 +166,7 @@ public: { return css::uno::Sequence< rtl::OUString >(); } private: - Dispatch( + explicit Dispatch( css::uno::Reference< css::uno::XComponentContext > const & context): context_(context) { assert(context.is()); } diff --git a/desktop/test/deployment/passive/passive_native.cxx b/desktop/test/deployment/passive/passive_native.cxx index b7325f6..70b11cc 100644 --- a/desktop/test/deployment/passive/passive_native.cxx +++ b/desktop/test/deployment/passive/passive_native.cxx @@ -71,7 +71,7 @@ public: static_getSupportedServiceNames(); private: - Provider( + explicit Provider( css::uno::Reference< css::uno::XComponentContext > const & context): context_(context) { assert(context.is()); } @@ -163,7 +163,7 @@ public: { return css::uno::Sequence< rtl::OUString >(); } private: - Dispatch( + explicit Dispatch( css::uno::Reference< css::uno::XComponentContext > const & context): context_(context) { assert(context.is()); }
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits