[Libreoffice-commits] .: svx/inc svx/Library_svxcore.mk svx/Package_inc.mk svx/source unusedcode.easy
Matus Kukan
mkukan at kemper.freedesktop.org
Tue Dec 20 13:26:27 PST 2011
svx/Library_svxcore.mk | 1
svx/Package_inc.mk | 1
svx/inc/svx/sdrcomment.hxx | 108 ---------------------------------------
svx/inc/svx/svdpage.hxx | 9 ---
svx/source/svdraw/sdrcomment.cxx | 99 -----------------------------------
unusedcode.easy | 5 -
6 files changed, 223 deletions(-)
New commits:
commit 9148757cc823efa0ac6dfe0a9a825bae47cb31fa
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Dec 20 22:23:33 2011 +0100
callcather: remove sdr::Comment
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index f7b3be7..508622f 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -305,7 +305,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\
svx/source/svdraw/clonelist \
svx/source/svdraw/gradtrns \
svx/source/svdraw/polypolygoneditor \
- svx/source/svdraw/sdrcomment \
svx/source/svdraw/sdrhittesthelper \
svx/source/svdraw/sdrmasterpagedescriptor \
svx/source/svdraw/sdrpagewindow \
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 60b576a..bd07e7b 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -378,7 +378,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx)
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx))
-$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrcomment.hxx,svx/sdrcomment.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx))
$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx))
diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx
deleted file mode 100644
index f89e9ac..0000000
--- a/svx/inc/svx/sdrcomment.hxx
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SDR_COMMENT_HXX
-#define _SDR_COMMENT_HXX
-
-#include <sal/types.h>
-#include <tools/date.hxx>
-#include <rtl/ustring.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-
-#include <vector>
-
-//////////////////////////////////////////////////////////////////////////////
-// predeclarations
-
-//////////////////////////////////////////////////////////////////////////////
-
-namespace sdr
-{
- class Comment
- {
- // counting ID
- sal_uInt32 mnID;
-
- // creation date
- Date maCreationDate;
-
- // name of creator
- ::rtl::OUString maUserName;
-
- // text content
- ::rtl::OUString maText;
-
- // position
- basegfx::B2DPoint maPosition;
-
- public:
- Comment(
- sal_uInt32 nID,
- Date aCreationDate,
- const ::rtl::OUString& rUserName,
- const ::rtl::OUString& rText,
- const basegfx::B2DPoint& rPosition);
- ~Comment();
-
- // operator for sorting the vector by mnID
- sal_Bool operator<(const Comment& rCandidate) const { return (mnID < rCandidate.mnID); }
-
- // comparison operators
- sal_Bool operator==(const Comment& rCandidate) const;
- sal_Bool operator!=(const Comment& rCandidate) const { return !(operator==(rCandidate)); }
-
- // access to ID, read only
- sal_uInt32 GetID() const { return mnID; }
-
- // access to CreationDate
- Date GetCreationDate() const { return maCreationDate; }
- void SetCreationDate(Date aNewDate);
-
- // access to UserName
- const ::rtl::OUString& GetUserName() const { return maUserName; }
- void SetUserName(const ::rtl::OUString& rNewName);
-
- // access to text
- const ::rtl::OUString& GetText() const { return maText; }
- void SetText(const ::rtl::OUString& rNewText);
-
- // access to position
- const basegfx::B2DPoint& GetPosition() const { return maPosition; }
- void SetPosition(const basegfx::B2DPoint& rNewPos);
- };
-
- // typedef for list of sdr::Comment
- typedef ::std::vector< Comment > CommentVector;
-} // end of namespace sdr
-
-//////////////////////////////////////////////////////////////////////////////
-
-#endif //_SDR_COMMENT_HXX
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 3833a67..19f9d35 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -36,7 +36,6 @@
#include <cppuhelper/weakref.hxx>
#include <svx/svdtypes.hxx>
#include <svx/svdlayer.hxx>
-#include <svx/sdrcomment.hxx>
#include <vector>
#include <svx/sdrpageuser.hxx>
#include <svx/sdr/contact/viewobjectcontactredirector.hxx>
@@ -566,14 +565,6 @@ public:
const sdr::contact::ViewObjectContact& rOriginal,
const sdr::contact::DisplayInfo& rDisplayInfo,
bool bEdit );
-
- //////////////////////////////////////////////////////////////////////////////
- // sdr::Comment interface
-private:
- sdr::CommentVector maComments;
-
-public:
- sal_uInt32 GetCommentCount() const { return maComments.size(); }
};
typedef tools::WeakReference< SdrPage > SdrPageWeakRef;
diff --git a/svx/source/svdraw/sdrcomment.cxx b/svx/source/svdraw/sdrcomment.cxx
deleted file mode 100644
index 4b323d3..0000000
--- a/svx/source/svdraw/sdrcomment.cxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include <svx/sdrcomment.hxx>
-
-//////////////////////////////////////////////////////////////////////////////
-
-namespace sdr
-{
- Comment::Comment(
- sal_uInt32 nID,
- Date aCreationDate,
- const ::rtl::OUString& rUserName,
- const ::rtl::OUString& rText,
- const basegfx::B2DPoint& rPosition)
- : mnID(nID),
- maCreationDate(aCreationDate),
- maUserName(rUserName),
- maText(rText),
- maPosition(rPosition)
- {
- }
-
- Comment::~Comment()
- {
- }
-
- sal_Bool Comment::operator==(const Comment& rCandidate) const
- {
- return (
- mnID == rCandidate.mnID
- && maCreationDate == rCandidate.maCreationDate
- && maUserName == rCandidate.maUserName
- && maText == rCandidate.maText
- && maPosition == rCandidate.maPosition);
- }
-
- void Comment::SetCreationDate(Date aNewDate)
- {
- if(aNewDate != maCreationDate)
- {
- maCreationDate = aNewDate;
- }
- }
-
- void Comment::SetUserName(const ::rtl::OUString& rNewName)
- {
- if(rNewName != maUserName)
- {
- maUserName = rNewName;
- }
- }
-
- void Comment::SetText(const ::rtl::OUString& rNewText)
- {
- if(rNewText != maText)
- {
- maText = rNewText;
- }
- }
-
- void Comment::SetPosition(const basegfx::B2DPoint& rNewPos)
- {
- if(rNewPos != maPosition)
- {
- maPosition = rNewPos;
- }
- }
-} // end of namespace sdr
-
-//////////////////////////////////////////////////////////////////////////////
-// eof
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index 06c3d85..4af564e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2023,11 +2023,6 @@ sdext::presenter::(anonymous namespace)::TransparentOverlayAnimator::Transparent
sdext::presenter::(anonymous namespace)::UnfoldInCenterAnimator::UnfoldInCenterAnimator(com::sun::star::uno::Reference<com::sun::star::drawing::framework::XResourceId> const&, rtl::Reference<sdext::presenter::PresenterController> const&, bool, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&, std::__debug::vector<boost::function<void ()>, std::allocator<boost::function<void ()> > > const&)
sdext::presenter::PresenterHorizontalScrollBar::PresenterHorizontalScrollBar(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::awt::XWindow> const&, boost::shared_ptr<sdext::presenter::PresenterPaintManager> const&, boost::function<void (double)> const&)
sdext::presenter::PresenterTextView::PresenterTextView(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::rendering::XCanvas> const&)
-sdr::Comment::Comment(unsigned int, Date, rtl::OUString const&, rtl::OUString const&, basegfx::B2DPoint const&)
-sdr::Comment::SetCreationDate(Date)
-sdr::Comment::SetPosition(basegfx::B2DPoint const&)
-sdr::Comment::SetText(rtl::OUString const&)
-sdr::Comment::SetUserName(rtl::OUString const&)
sdr::animation::Scheduler::Reset(unsigned int)
sdr::contact::ViewContactOfPageObj::GetReferencedPage() const
sdr::contact::ViewContactOfSdrMediaObj::hasPreferredSize() const
More information about the Libreoffice-commits
mailing list