idl/inc/slot.hxx | 4 +---
idl/source/objects/object.cxx | 2 +-
idl/source/objects/slot.cxx | 23 ++++-------------------
include/sfx2/msg.hxx | 12 ++++--------
sd/source/ui/dlg/PaneShells.cxx | 4 ++--
sfx2/source/control/shell.cxx | 1 -
sfx2/source/sidebar/Deck.cxx | 5 ++---
svx/source/toolbars/extrusionbar.cxx | 2 +-
svx/source/toolbars/fontworkbar.cxx | 2 +-
9 files changed, 16 insertions(+), 39 deletions(-)
New commits:
commit 3ddae219e4be882704ffd917e80c1d8b22c5d48b
Author: Noel Grandin <n...@peralex.com>
Date: Sun Sep 21 15:46:10 2014 +0200
remove unused fields pName and pMethodName in SfxSlot class
Change-Id: Icca5a0dee296fae1abeb78ea8ffa2f9e934bb111
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index 220c478..65ede6d 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -72,8 +72,7 @@ class SvMetaSlot : public SvMetaAttribute
sal_uInt16 nCount, const OString& rSlotId,
SvSlotElementList &rList,
size_t nStart,
- const OString& rPrefix,
- SvIdlDataBase & rBase, SvStream & rOutStm );
+ SvIdlDataBase & rBase, SvStream & rOutStm );
virtual void Write( SvIdlDataBase & rBase,
SvStream & rOutStm, sal_uInt16 nTab,
WriteType, WriteAttribute = 0 ) SAL_OVERRIDE;
@@ -244,7 +243,6 @@ public:
sal_uInt16 nCount,
SvSlotElementList&,
size_t nStart,
- const OString&,
SvIdlDataBase & rBase,
SvStream & rOutStm );
sal_uInt16 WriteSlotParamArray( SvIdlDataBase & rBase,
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index fa3224f..6609031 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -452,7 +452,7 @@ sal_uInt16 SvMetaClass::WriteSlots( const OString&
rShellName,
SvSlotElement * pEle = rSlotList[ i ];
SvMetaSlot * pAttr = pEle->xSlot;
nSCount = nSCount + pAttr->WriteSlotMap( rShellName, nCount + nSCount,
- rSlotList, i, pEle->aPrefix, rBase,
+ rSlotList, i, rBase,
rOutStm );
}
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 6b844011..755bd9a 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1145,7 +1145,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName,
sal_uInt16 nCount,
const OString& rSlotId,
SvSlotElementList& rSlotList,
size_t nStart,
- const OString& rPrefix,
SvIdlDataBase & rBase, SvStream & rOutStm )
{
if ( !GetExport() && !GetHidden() )
@@ -1379,25 +1378,12 @@ void SvMetaSlot::WriteSlot( const OString& rShellName,
sal_uInt16 nCount,
sal_uLong nSCount = pType->GetAttrCount();
rOutStm
.WriteCharPtr( OString::number(nSCount).getStr() )
- .WriteCharPtr( "/*Count*/" );
+ .WriteCharPtr( "/*Count*/," );
}
else
- rOutStm.WriteChar( '0' );
+ rOutStm.WriteCharPtr( "0," );
- // name for recording
- if ( GetExport() )
- {
- rOutStm.WriteCharPtr( ",\"" );
- if (!rPrefix.isEmpty())
- rOutStm.WriteCharPtr( rPrefix.getStr() );
- rOutStm.WriteChar( '.' );
- if ( !IsVariable() || !GetType() ||
- GetType()->GetBaseType()->GetType() != TYPE_STRUCT )
- rOutStm.WriteCharPtr( GetMangleName( false ).getStr() );
- rOutStm.WriteCharPtr( "\"," );
- }
- else
- rOutStm.WriteCharPtr( ", 0, " );
+ rOutStm.WriteCharPtr( " " );
// Method/Property flags
if( IsMethod() )
@@ -1463,7 +1449,6 @@ sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase
& rBase, SvStream & rO
sal_uInt16 SvMetaSlot::WriteSlotMap( const OString& rShellName, sal_uInt16
nCount,
SvSlotElementList& rSlotList,
size_t nStart,
- const OString& rPrefix,
SvIdlDataBase & rBase,
SvStream & rOutStm )
{
@@ -1483,7 +1468,7 @@ sal_uInt16 SvMetaSlot::WriteSlotMap( const OString&
rShellName, sal_uInt16 nCoun
nSCount = (sal_uInt16)pType->GetAttrCount();
}
- WriteSlot( rShellName, nCount, slotId, rSlotList, nStart, rPrefix, rBase,
rOutStm );
+ WriteSlot( rShellName, nCount, slotId, rSlotList, nStart, rBase, rOutStm );
return nSCount;
}
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index 60cfdd0..120005e 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.hxx
@@ -174,7 +174,7 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
ExecMethodPtr, \
StateMethodPtr, \
(const SfxType*) &a##ItemClass##_Impl, \
- Name, Name, 0, 0, \
+ 0, 0, \
&a##aShellClass##Args_Impl[nArg0], nArgs, 0, Name \
}
@@ -184,16 +184,15 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
ExecMethodPtr, \
StateMethodPtr, \
(const SfxType*) &a##ItemClass##_Impl, \
- 0, 0, 0, 0, 0, 0, 0 \
+ 0, 0, 0, 0, 0 \
}
-#define SFX_NEW_SLOT_ARG( aShellClass, id, hid, GroupId, pLinked, pNext,
ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs,
Name, Prop, UnoName ) \
+#define SFX_NEW_SLOT_ARG( aShellClass, id, hid, GroupId, pLinked, pNext,
ExecMethodPtr, StateMethodPtr, Flags, DisableFlags, ItemClass, nArg0, nArgs,
Prop, UnoName ) \
{ id, GroupId, hid, Flags | Prop, \
USHRT_MAX, 0, \
ExecMethodPtr, \
StateMethodPtr, \
(const SfxType*) &a##ItemClass##_Impl, \
- Name, Name, \
pLinked, pNext, \
&a##aShellClass##Args_Impl[nArg0], nArgs, DisableFlags,
UnoName \
}
@@ -204,7 +203,6 @@ SFX_DECL_TYPE(18); // for SvxSearchItem
0, \
0, \
(const SfxType*) &aSfxBoolItem_Impl, \
- 0, 0, \
pMaster, \
pNext, \
0, 0, DisableFlags, UnoName \
@@ -240,9 +238,7 @@ public:
SfxExecFunc fnExec; // Function to be excecuted
SfxStateFunc fnState; // Function for Status
- const SfxType* pType; // SfxPoolItem-Type (Status)
- const char* pName; // Name of the Slots
- const char* pMethodName; // Name of the Method if different
+ const SfxType* pType; // SfxPoolItem-Type (Status)
const SfxSlot* pLinkedSlot; // Master-Slot for Enum value
const SfxSlot* pNextSlot; // with the same Status-Method
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 5e1e212..48fd31a 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -33,7 +33,7 @@ namespace sd {
SFX_SLOTMAP(LeftImpressPaneShell)
{
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell,
SdResId(STR_LEFT_IMPRESS_PANE_SHELL))
@@ -59,7 +59,7 @@ LeftImpressPaneShell::~LeftImpressPaneShell (void)
SFX_SLOTMAP(LeftDrawPaneShell)
{
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell,
SdResId(STR_LEFT_DRAW_PANE_SHELL))
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index 983f36e..f722a2c 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -585,7 +585,6 @@ void SfxShell::SetVerbs(const com::sun::star::uno::Sequence
< com::sun::star::em
pNewSlot->fnExec = SFX_STUB_PTR(SfxShell,VerbExec);
pNewSlot->fnState = SFX_STUB_PTR(SfxShell,VerbState);
pNewSlot->pType = 0; // HACK(SFX_TYPE(SfxVoidItem)) ???
- pNewSlot->pName = strdup (OUStringToOString( aVerbs[n].VerbName,
RTL_TEXTENCODING_UTF8 ).getStr());
pNewSlot->pLinkedSlot = 0;
pNewSlot->nArgDefCount = 0;
pNewSlot->pFirstArgDef = 0;
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index f08173a..20fdb19 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -291,7 +291,7 @@ void Deck::ShowPanel (const Panel& rPanel)
-const OUString& GetWindowClassification (const Window* pWindow)
+const OUString GetWindowClassification (const Window* pWindow)
{
const OUString& rsName (pWindow->GetText());
if (!rsName.isEmpty())
@@ -300,8 +300,7 @@ const OUString& GetWindowClassification (const Window*
pWindow)
}
else
{
- static const OUString aWindow ("window");
- return aWindow;
+ return OUString("window");
}
}
diff --git a/svx/source/toolbars/extrusionbar.cxx
b/svx/source/toolbars/extrusionbar.cxx
index c80ccbf..08c52a0 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -52,7 +52,7 @@ using namespace ::com::sun::star::uno;
// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
SFX_SLOTMAP(ExtrusionBar)
{
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell, SVX_RES(RID_SVX_EXTRUSION_BAR))
diff --git a/svx/source/toolbars/fontworkbar.cxx
b/svx/source/toolbars/fontworkbar.cxx
index aae587a..6877779 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -169,7 +169,7 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView,
SfxItemSet& rSet )
// tragen wir etwas ein, was hier (hoffentlich) nie vorkommt).
SFX_SLOTMAP(FontworkBar)
{
- { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
SFX_IMPL_INTERFACE(FontworkBar, SfxShell, SVX_RES(RID_SVX_FONTWORK_BAR))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
