basctl/Library_basctl.mk | 1
basctl/source/basicide/bastypes.cxx | 48 -------------
basctl/source/basicide/sbxitem.cxx | 126 ++++++++++++++++++++++++++++++++++++
basctl/source/inc/sbxitem.hxx | 31 ++++----
4 files changed, 142 insertions(+), 64 deletions(-)
New commits:
commit 93e3a86977cb8a2d60db7cf3489564c95d18ee80
Author: August Sodora <aug...@gmail.com>
Date: Wed Nov 30 21:35:07 2011 -0500
Refactor sbxitem
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 521a577..45403ec 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/moduldlg \
basctl/source/basicide/objdlg \
basctl/source/basicide/register \
+ basctl/source/basicide/sbxitem \
basctl/source/basicide/scriptdocument \
basctl/source/basicide/tbxctl \
basctl/source/basicide/unomodel \
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index b1a6709..7c79bec 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -26,14 +26,10 @@
*
************************************************************************/
-
#include <vcl/msgbox.hxx>
-#include <vector>
-#include <algorithm>
#include <ide_pch.hxx>
-
#include <basic/sbx.hxx>
#include <helpid.hrc>
#include <basidesh.hrc>
@@ -886,50 +882,6 @@ LibInfoItem* LibInfos::GetInfo( const LibInfoKey& rKey )
return pItem;
}
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, BasicIDEType nType )
- :SfxPoolItem( nWhich_ )
- ,m_aDocument(rDocument)
- ,m_aLibName(aLibName)
- ,m_aName(aName)
- ,m_nType(nType)
-{
-}
-
-SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, const ::rtl::OUString&
aMethodName, BasicIDEType nType )
- :SfxPoolItem( nWhich_ )
- ,m_aDocument(rDocument)
- ,m_aLibName(aLibName)
- ,m_aName(aName)
- ,m_aMethodName(aMethodName)
- ,m_nType(nType)
-{
-}
-
-SbxItem::SbxItem(const SbxItem& rCopy)
- :SfxPoolItem( rCopy )
- ,m_aDocument( rCopy.m_aDocument )
-{
- m_aLibName = rCopy.m_aLibName;
- m_aName = rCopy.m_aName;
- m_aMethodName = rCopy.m_aMethodName;
- m_nType = rCopy.m_nType;
-}
-
-int SbxItem::operator==( const SfxPoolItem& rCmp) const
-{
- DBG_ASSERT( rCmp.ISA( SbxItem ), "==: Kein SbxItem!" );
- return ( SfxPoolItem::operator==( rCmp ) && ( m_aDocument == ((const
SbxItem&)rCmp).m_aDocument )
- && ( m_aLibName == ((const
SbxItem&)rCmp).m_aLibName )
- && ( m_aName == ((const
SbxItem&)rCmp).m_aName )
- && ( m_aMethodName == ((const
SbxItem&)rCmp).m_aMethodName )
- && ( m_nType == ((const
SbxItem&)rCmp).m_nType ) );
-}
-
-SfxPoolItem *SbxItem::Clone( SfxItemPool* ) const
-{
- return new SbxItem(*this);
-}
-
sal_Bool QueryDel( const String& rName, const ResId& rId, Window* pParent )
{
String aQuery( rId );
diff --git a/basctl/source/basicide/sbxitem.cxx
b/basctl/source/basicide/sbxitem.cxx
new file mode 100644
index 0000000..e1837c6
--- /dev/null
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -0,0 +1,126 @@
+/* -*- 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 "sbxitem.hxx"
+
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, BasicIDEType nType)
+ :SfxPoolItem( nWhich_ )
+ ,m_aDocument(rDocument)
+ ,m_aLibName(aLibName)
+ ,m_aName(aName)
+ ,m_nType(nType)
+{
+}
+
+SbxItem::SbxItem(sal_uInt16 nWhich_, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, const ::rtl::OUString&
aMethodName, BasicIDEType nType)
+ :SfxPoolItem( nWhich_ )
+ ,m_aDocument(rDocument)
+ ,m_aLibName(aLibName)
+ ,m_aName(aName)
+ ,m_aMethodName(aMethodName)
+ ,m_nType(nType)
+{
+}
+
+SbxItem::SbxItem(const SbxItem& rCopy)
+ :SfxPoolItem(rCopy)
+ ,m_aDocument(rCopy.m_aDocument)
+ ,m_aLibName(rCopy.m_aLibName)
+ ,m_aName(rCopy.m_aName)
+ ,m_aMethodName(rCopy.m_aMethodName)
+ ,m_nType(rCopy.m_nType)
+{
+}
+
+SfxPoolItem *SbxItem::Clone(SfxItemPool*) const
+{
+ return new SbxItem(*this);
+}
+
+int SbxItem::operator==(const SfxPoolItem& rCmp) const
+{
+ DBG_ASSERT( rCmp.ISA( SbxItem ), "==: Kein SbxItem!" );
+ return (SfxPoolItem::operator==(rCmp) &&
+ m_aDocument == ((const SbxItem&)rCmp).m_aDocument &&
+ m_aLibName == ((const SbxItem&)rCmp).m_aLibName &&
+ m_aName == ((const SbxItem&)rCmp).m_aName &&
+ m_aMethodName == ((const SbxItem&)rCmp).m_aMethodName &&
+ m_nType == ((const SbxItem&)rCmp).m_nType);
+}
+
+const ScriptDocument& SbxItem::GetDocument() const
+{
+ return m_aDocument;
+}
+
+void SbxItem::SetDocument(const ScriptDocument& rDocument)
+{
+ m_aDocument = rDocument;
+}
+
+const ::rtl::OUString& SbxItem::GetLibName() const
+{
+ return m_aLibName;
+}
+
+void SbxItem::SetLibName(const ::rtl::OUString& aLibName)
+{
+ m_aLibName = aLibName;
+}
+
+const ::rtl::OUString& SbxItem::GetName() const
+{
+ return m_aName;
+}
+
+void SbxItem::SetName(const ::rtl::OUString& aName)
+{
+ m_aName = aName;
+}
+
+const ::rtl::OUString& SbxItem::GetMethodName() const
+{
+ return m_aMethodName;
+}
+
+void SbxItem::SetMethodName(const ::rtl::OUString& aMethodName)
+{
+ m_aMethodName = aMethodName;
+}
+
+BasicIDEType SbxItem::GetType() const
+{
+ return m_nType;
+}
+
+void SbxItem::SetType(BasicIDEType nType)
+{
+ m_nType = nType;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index effd879..2f90535 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -51,28 +51,27 @@ class SbxItem : public SfxPoolItem
public:
TYPEINFO();
- SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, BasicIDEType nType );
- SbxItem( sal_uInt16 nWhich, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, const ::rtl::OUString&
aMethodName, BasicIDEType nType );
- SbxItem( const SbxItem& );
+ SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, BasicIDEType nType);
+ SbxItem(sal_uInt16 nWhich, const ScriptDocument& rDocument, const
::rtl::OUString& aLibName, const ::rtl::OUString& aName, const ::rtl::OUString&
aMethodName, BasicIDEType nType);
+ SbxItem(const SbxItem&);
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual int operator==( const SfxPoolItem& ) const;
+ virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const;
+ virtual int operator==(const SfxPoolItem&) const;
- const ScriptDocument&
- GetDocument() const { return m_aDocument; }
- void SetDocument( const ScriptDocument& rDocument ) {
m_aDocument = rDocument; }
+ const ScriptDocument& GetDocument() const;
+ void SetDocument(const ScriptDocument& rDocument);
- const ::rtl::OUString& GetLibName() const { return m_aLibName; }
- void SetLibName( const ::rtl::OUString& aLibName ) {
m_aLibName = aLibName; }
+ const ::rtl::OUString& GetLibName() const;
+ void SetLibName(const ::rtl::OUString& aLibName);
- const ::rtl::OUString& GetName() const { return m_aName; }
- void SetName( const ::rtl::OUString& aName ) { m_aName
= aName; }
+ const ::rtl::OUString& GetName() const;
+ void SetName(const ::rtl::OUString& aName);
- const ::rtl::OUString& GetMethodName() const { return m_aMethodName; }
- void SetMethodName( const ::rtl::OUString& aMethodName
) { m_aMethodName = aMethodName; }
+ const ::rtl::OUString& GetMethodName() const;
+ void SetMethodName(const ::rtl::OUString& aMethodName);
- BasicIDEType GetType() const { return m_nType; }
- void SetType( BasicIDEType nType ) { m_nType = nType; }
+ BasicIDEType GetType() const;
+ void SetType(BasicIDEType nType);
};
#endif
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
