[Libreoffice-commits] .: 8 commits - sfx2/inc sfx2/source svx/source ucb/source xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 26 13:49:45 PST 2010
sfx2/inc/sfx2/app.hxx | 3
sfx2/inc/sfx2/macrconf.hxx | 11 --
sfx2/inc/sfx2/macropg.hxx | 151 ----------------------------
sfx2/source/appl/appbas.cxx | 115 ---------------------
sfx2/source/control/macrconf.cxx | 77 --------------
sfx2/source/control/unoctitm.cxx | 22 ----
sfx2/source/inc/tplcomp.hxx | 3
svx/source/unodraw/UnoNameItemTable.cxx | 4
ucb/source/ucp/webdav/DAVResourceAccess.cxx | 2
xmloff/source/core/nmspmap.cxx | 4
xmloff/source/style/prhdlfac.cxx | 2
11 files changed, 8 insertions(+), 386 deletions(-)
New commits:
commit 7e62166baa8e4ae744b6c7746933af26f9705bd4
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 21:41:47 2010 +0000
cppcheck: use prefix variant
diff --git a/xmloff/source/style/prhdlfac.cxx b/xmloff/source/style/prhdlfac.cxx
index 425cb26..a0c8cb0 100644
--- a/xmloff/source/style/prhdlfac.cxx
+++ b/xmloff/source/style/prhdlfac.cxx
@@ -113,7 +113,7 @@ SvXMLEnumMapEntry __READONLY_DATA aXML_WritingDirection_Enum[] =
//
XMLPropertyHandlerFactory::~XMLPropertyHandlerFactory()
{
- for( CacheMap::iterator pPos = maHandlerCache.begin(); pPos != maHandlerCache.end(); pPos++ )
+ for( CacheMap::iterator pPos = maHandlerCache.begin(); pPos != maHandlerCache.end(); ++pPos )
delete pPos->second;
}
commit 84bc8e01ae6252f07b641ecc96b510faed21cfe7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 21:38:23 2010 +0000
cppcheck: use prefix variant
diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 3e09660..e453494 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -81,7 +81,7 @@ SvXMLNamespaceMap::~SvXMLNamespaceMap()
while ( aIter != aEnd )
{
const OUString *pString = (*aIter).first.second;
- aIter++;
+ ++aIter;
delete pString;
}
}
@@ -171,7 +171,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByName( const OUString& rName ) const
nKey = (*aIter).second->nKey;
break;
}
- aIter++;
+ ++aIter;
}
return nKey;
}
commit 90564ef4cd96aae32f70eb842c1adc7b39bffd4e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 21:32:28 2010 +0000
cppcheck: use prefix variant
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index 498c7fb..0024eb7 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -1162,7 +1162,7 @@ sal_Bool DAVResourceAccess::detectRedirectCycle(
if ( aUri == (*it) )
return sal_True;
- it++;
+ ++it;
}
return sal_False;
commit 79558e262223da9a93ff83085b491bce30ed9533
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 21:31:10 2010 +0000
cppcheck: use prefix variant
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index f053554..1b5009e 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -160,7 +160,7 @@ void SAL_CALL SvxUnoNameItemTable::removeByName( const OUString& aApiName )
maItemSetVector.erase( aIter );
return;
}
- aIter++;
+ ++aIter;
}
if( !hasByName( Name ) )
@@ -195,7 +195,7 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons
(*aIter)->Put( *pNewItem );
return;
}
- aIter++;
+ ++aIter;
}
// if it is not in our own sets, modify the pool!
commit 739f2525d8e6ec79083b6ce94e3b2929c4b4fabf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 19:52:52 2010 +0000
sfx2 macropg.hxx unused anywhere
diff --git a/sfx2/inc/sfx2/macropg.hxx b/sfx2/inc/sfx2/macropg.hxx
deleted file mode 100644
index 5f518e2..0000000
--- a/sfx2/inc/sfx2/macropg.hxx
+++ /dev/null
@@ -1,151 +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 _MACROPG_HXX
-#define _MACROPG_HXX
-
-#include "sal/config.h"
-#include "sfx2/dllapi.h"
-
-#include <sfx2/basedlgs.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svl/macitem.hxx>
-#include <vcl/lstbox.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-
-class _SfxMacroTabPage;
-class SvStringsDtor;
-class SvTabListBox;
-class Edit;
-class String;
-class SfxObjectShell;
-
-typedef SvStringsDtor* (*FNGetRangeHdl)( _SfxMacroTabPage*, const String& rLanguage );
-typedef SvStringsDtor* (*FNGetMacrosOfRangeHdl)( _SfxMacroTabPage*, const String& rLanguage, const String& rRange );
-
-class SfxConfigGroupListBox_Impl;
-class SfxConfigFunctionListBox_Impl;
-
-class _HeaderTabListBox;
-class _SfxMacroTabPage_Impl;
-
-class SFX2_DLLPUBLIC _SfxMacroTabPage : public SfxTabPage
-{
- SvxMacroTableDtor aTbl;
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, SvTabListBox * );
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox * );
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, SelectMacro_Impl, ListBox * );
-
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, DoubleClickHdl_Impl, Control* );
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, AssignDeleteHdl_Impl, PushButton * );
-
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, ChangeScriptHdl_Impl, RadioButton * );
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, GetFocus_Impl, Edit* );
- DECL_DLLPRIVATE_STATIC_LINK( _SfxMacroTabPage, TimeOut_Impl, Timer* );
-protected:
- _SfxMacroTabPage_Impl* mpImpl;
-
- _SfxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
-
- void InitAndSetHandler();
- void FillEvents();
- void FillMacroList();
- void EnableButtons( const String& rLanguage );
-
-public:
-
- virtual ~_SfxMacroTabPage();
-
- void AddEvent( const String & rEventName, USHORT nEventId );
-
- const SvxMacroTableDtor& GetMacroTbl() const;
- void SetMacroTbl( const SvxMacroTableDtor& rTbl );
- void ClearMacroTbl();
-
- virtual void ScriptChanged( const String& rLanguage );
-
- // zum setzen / abfragen der Links
- void SetGetRangeLink( FNGetRangeHdl pFn );
- FNGetRangeHdl GetGetRangeLink() const;
- void SetGetMacrosOfRangeLink( FNGetMacrosOfRangeHdl pFn );
- FNGetMacrosOfRangeHdl GetGetMacrosOfRangeLink() const;
-
- // --------- Erben aus der Basis -------------
- virtual BOOL FillItemSet( SfxItemSet& rSet );
- virtual void Reset( const SfxItemSet& rSet );
-
- void SetReadOnly( BOOL bSet );
- BOOL IsReadOnly() const;
- void SelectEvent( const String& rEventName, USHORT nEventId );
-};
-
-inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
-{
- return aTbl;
-}
-
-inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
-{
- aTbl = rTbl;
-}
-
-inline void _SfxMacroTabPage::ClearMacroTbl()
-{
- aTbl.DelDtor();
-}
-
-class SFX2_DLLPUBLIC SfxMacroTabPage : public _SfxMacroTabPage
-{
-public:
- SfxMacroTabPage(
- Window* pParent,
- const ResId& rId,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
- const SfxItemSet& rSet
- );
-
- // --------- Erben aus der Basis -------------
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
-};
-
-class SFX2_DLLPUBLIC SfxMacroAssignDlg : public SfxSingleTabDialog
-{
-public:
- SfxMacroAssignDlg(
- Window* pParent,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame,
- SfxItemSet& rSet );
- SfxMacroAssignDlg(
- Window* pParent,
- const SfxObjectShell* _pShell,
- SfxItemSet& rSet );
- virtual ~SfxMacroAssignDlg();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit cd97e1313d7b88d95ce247885c942d7c6d81d99c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 19:50:55 2010 +0000
RegisterBasicConstants doesn't do anything, remove it
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 3390c2f..09d9a42 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -239,9 +239,6 @@ public:
void EnterBasicCall();
bool IsInBasicCall() const;
void LeaveBasicCall();
- void RegisterBasicConstants( const char *pPrefix,
- const SfxConstant *pConsts,
- USHORT nCount );
// misc.
BOOL GetOptions(SfxItemSet &);
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index fcbabbd..7514d4c 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -99,10 +99,6 @@ public:
String GetURL() const;
};
-//ASDBG obsolete >= 582
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > ;
-//ASDBG class ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ;
-
class SFX2_DLLPUBLIC SfxMacroConfig
{
friend class SfxEventConfiguration;
@@ -123,9 +119,6 @@ public:
static sal_Bool IsBasic( SbxObject*, const String&, BasicManager* );
static ErrCode Call( SbxObject*, const String&, BasicManager*,
SbxArray *pArgs=NULL, SbxValue *pRet=NULL );
-//ASDBG obsolete >= 582
-//ASDBG static void CallStarScript( const ::com::sun::star::uno::Reference< ::com::sun::star::script::XEngine > & rxEngine, const String & rCode,
-//ASDBG const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & rSource, void *pArgs, void *pRet );
static SbMethod* GetMethod_Impl( const String&, BasicManager* );
sal_uInt16 GetSlotId(SfxMacroInfoPtr);
diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx
index 28cc7f8..4ea0053 100644
--- a/sfx2/source/appl/appbas.cxx
+++ b/sfx2/source/appl/appbas.cxx
@@ -101,79 +101,8 @@ using namespace ::com::sun::star::script;
using ::basic::BasicManagerRepository;
-// #ifndef STR_VERSION_ID
-// #define STR_VERSION_ID 1
-// #endif
-// #ifndef STR_VERSION_TYPE
-// #define STR_VERSION_TYPE 1
-// #endif
-
-//=========================================================================
-/*ASDBG
-const SfxConstant __FAR_DATA aConstants[] =
-{
- SFX_USHORT_CONSTANT( "AlignBottom", ALIGN_BOTTOM ),
- SFX_USHORT_CONSTANT( "AlignTop", ALIGN_TOP ),
- SFX_USHORT_CONSTANT( "CharSetANSI", CHARSET_ANSI ),
- SFX_USHORT_CONSTANT( "CharSetDontKnow", CHARSET_DONTKNOW ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC437", CHARSET_IBMPC_437 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC850", CHARSET_IBMPC_850 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC860", CHARSET_IBMPC_860 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC861", CHARSET_IBMPC_861 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC863", CHARSET_IBMPC_863 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC865", CHARSET_IBMPC_865 ),
- SFX_USHORT_CONSTANT( "CharSetIBMPC", CHARSET_IBMPC ),
- SFX_USHORT_CONSTANT( "CharSetMac", CHARSET_MAC ),
- SFX_USHORT_CONSTANT( "CharSetSymbol", CHARSET_SYMBOL ),
- SFX_USHORT_CONSTANT( "CharSetSystem", RTL_TEXTENCODING_UTF8 ),
- SFX_USHORT_CONSTANT( "FamilyDecorative", FAMILY_DECORATIVE ),
- SFX_USHORT_CONSTANT( "FamilyDontknow", FAMILY_DONTKNOW ),
- SFX_USHORT_CONSTANT( "FamilyModern", FAMILY_MODERN ),
- SFX_USHORT_CONSTANT( "FamilyRoman", FAMILY_ROMAN ),
- SFX_USHORT_CONSTANT( "FamilyScript", FAMILY_SCRIPT ),
- SFX_USHORT_CONSTANT( "FamilySwiss", FAMILY_SWISS ),
- SFX_USHORT_CONSTANT( "FamilySystem", FAMILY_SYSTEM ),
- SFX_USHORT_CONSTANT( "GradientAxial", GRADIENT_AXIAL ),
- SFX_USHORT_CONSTANT( "GradientElliptical", GRADIENT_ELLIPTICAL ),
- SFX_USHORT_CONSTANT( "GradientLinear", GRADIENT_LINEAR ),
- SFX_USHORT_CONSTANT( "GradientRadial", GRADIENT_RADIAL ),
- SFX_USHORT_CONSTANT( "GradientRect", GRADIENT_RECT ),
- SFX_USHORT_CONSTANT( "GradientSquare", GRADIENT_SQUARE ),
- SFX_USHORT_CONSTANT( "ItalicNone", ITALIC_NONE ),
- SFX_USHORT_CONSTANT( "ItalicOblique", ITALIC_OBLIQUE ),
- SFX_USHORT_CONSTANT( "StrikeThroughDouble", STRIKEOUT_DOUBLE ),
- SFX_USHORT_CONSTANT( "StrikeThroughNone", STRIKEOUT_NONE ),
- SFX_USHORT_CONSTANT( "StrikeThroughSingle", STRIKEOUT_SINGLE ),
- SFX_USHORT_CONSTANT( "UnderlineDotted", UNDERLINE_DOTTED ),
- SFX_USHORT_CONSTANT( "UnderlineDouble", UNDERLINE_DOUBLE ),
- SFX_USHORT_CONSTANT( "UnderlineNone", UNDERLINE_NONE ),
- SFX_USHORT_CONSTANT( "UnderlineSingle", UNDERLINE_SINGLE ),
- SFX_USHORT_CONSTANT( "UnitFoot", FUNIT_FOOT ),
- SFX_USHORT_CONSTANT( "UnitInch", FUNIT_INCH ),
- SFX_USHORT_CONSTANT( "UnitMile", FUNIT_MILE ),
- SFX_USHORT_CONSTANT( "UnitPercent", FUNIT_PERCENT ),
- SFX_USHORT_CONSTANT( "UnitPoint", FUNIT_POINT ),
- SFX_USHORT_CONSTANT( "UnitTwip", FUNIT_TWIP ),
- SFX_USHORT_CONSTANT( "Unit_cm", FUNIT_CM ),
- SFX_USHORT_CONSTANT( "Unit_m", FUNIT_M ),
- SFX_USHORT_CONSTANT( "Unit_mm", FUNIT_MM ),
- SFX_USHORT_CONSTANT( "WeightBlack", WEIGHT_BLACK ),
- SFX_USHORT_CONSTANT( "WeightBold", WEIGHT_BOLD ),
- SFX_USHORT_CONSTANT( "WeightDontKnow", WEIGHT_DONTKNOW ),
- SFX_USHORT_CONSTANT( "WeightLight", WEIGHT_LIGHT ),
- SFX_USHORT_CONSTANT( "WeightMedium", WEIGHT_MEDIUM ),
- SFX_USHORT_CONSTANT( "WeightNormal", WEIGHT_NORMAL ),
- SFX_USHORT_CONSTANT( "WeightSemibold", WEIGHT_SEMIBOLD ),
- SFX_USHORT_CONSTANT( "WeightSemilight", WEIGHT_SEMILIGHT ),
- SFX_USHORT_CONSTANT( "WeightThin", WEIGHT_THIN ),
- SFX_USHORT_CONSTANT( "WeightUltrabold", WEIGHT_ULTRABOLD ),
- SFX_USHORT_CONSTANT( "WeightUltralight", WEIGHT_ULTRALIGHT )
-};
-*/
-//========================================================================
-
//------------------------------------------------------------------------
-String lcl_GetVersionString(ResMgr* /*pAppData_ImplResMgr*/)
+String lcl_GetVersionString()
{
::rtl::OUString aDefault;
String aVersion( utl::Bootstrap::getBuildIdData( aDefault ));
@@ -204,46 +133,6 @@ sal_uInt16 SfxApplication::SaveBasicAndDialogContainer() const
//--------------------------------------------------------------------
-void SfxApplication::RegisterBasicConstants
-(
- const char*, // Prefix vor Konstanten-Namen
- const SfxConstant*, // Array von <SfxConstant> Instanzen
- sal_uInt16 // Anahl der Kontanten in pConsts
-)
-
-/* [Beschreibung]
-
- Diese Methode meldet Konstanten beim BASIC an. Sie sollte on-demand
- (in GetSbxObject() der Applikation) gerufen werden. Das Array mu\s
- alphabetisch nach den Namen sortiert sein!
-
- Durch den Prefix kann Speicher gespart und das Suchen beschleunigt
- werden. Im StarOffice soll der Prefix "so" verwendet werden.
-
-
- [Beispiel]
-
- const SfxConstant __FAR_DATA aConstants[] =
- {
- SFX_BOOL_CONSTANT( "False", sal_False ),
- SFX_BOOL_CONSTANT( "True", sal_True ),
- };
-
- ...
- SFX_APP()->RegisterBasicConstants( 0, aConstants, 2 );
- ...
-
-*/
-
-{
-// DBG_ASSERT( pAppData_Impl->pBasicMgr, "no basic available" );
-
-// pAppData_Impl->pBasicMgr->GetLib(0)->Insert(
-// new SfxConstants_Impl( pPrefix, pConsts, nCount ) );
-}
-
-//--------------------------------------------------------------------
-
SbxVariable* MakeVariable( StarBASIC *pBas, SbxObject *pObject,
const char *pName, sal_uInt32 nSID, SbxDataType eType, SbxClassType eClassType )
{
@@ -503,7 +392,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet )
case SID_BUILD_VERSION:
{
- String aVersion = lcl_GetVersionString(pAppData_Impl->pLabelResMgr);
+ String aVersion = lcl_GetVersionString();
rSet.Put( SfxUInt32Item( SID_BUILD_VERSION, (sal_uInt32) aVersion.ToInt32() ) );
break;
}
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 10716ab..8ca5f20 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -340,28 +340,6 @@ sal_Int64 SAL_CALL SfxOfficeDispatch::getSomething( const ::com::sun::star::uno:
return 0;
}
-/* ASDBG
-void* SfxOfficeDispatch::getImplementation(Reflection *p)
-{
- if( p == ::getCppuType((const SfxOfficeDispatch*)0) )
- return this;
- else
- return ::cppu::OWeakObject::getImplementation(p);
-
-}
-
-Reflection* ::getCppuType((const SfxOfficeDispatch*)0)
-{
- static StandardClassReflection aRefl(
- 0,
- createStandardClass(
- "SfxOfficeDispatch", ::cppu::OWeakObject::get::cppu::OWeakObjectIdlClass(),
- 1,
- ::getCppuType((const ::com::sun::star::frame::XDispatch*)0) ) );
- return &aRefl;
-}
-*/
-
SfxOfficeDispatch::SfxOfficeDispatch( SfxBindings& rBindings, SfxDispatcher* pDispat, const SfxSlot* pSlot, const ::com::sun::star::util::URL& rURL )
{
// nOfficeDispatchCount++;
diff --git a/sfx2/source/inc/tplcomp.hxx b/sfx2/source/inc/tplcomp.hxx
index a4c8e68..df486fc 100644
--- a/sfx2/source/inc/tplcomp.hxx
+++ b/sfx2/source/inc/tplcomp.hxx
@@ -30,9 +30,6 @@
#define _TPLCOMP_HXX
#include <osl/mutex.hxx>
-//ASDBG #include <usr/uno.hxx>
-//ASDBG #include <usr/iterhlp.hxx>
-//ASDBG #include <usr/services.hxx>
#include <com/sun/star/chaos/XCommandExecutor.hpp>
#include <com/sun/star/chaos/XStatusCallback.hpp>
#include <com/sun/star/chaos/UnknownCommandException.hpp>
commit e3ab4e81a41be84f4ab6fb93e0d13e82700c2e6d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 16:02:58 2010 +0000
these streaming operators are unused by anything
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index a262cfc..fcbabbd 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -56,8 +56,6 @@ class SFX2_DLLPUBLIC SfxMacroInfo
{
friend class SfxMacroConfig;
friend class SfxEventConfiguration;
-friend SvStream& operator >> (SvStream& rStream, SfxMacroInfo& rInfo);
-friend SvStream& operator << (SvStream& rStream, const SfxMacroInfo& rInfo);
String* pHelpText;
sal_uInt16 nRefCnt;
@@ -77,7 +75,6 @@ public:
const String& rModuleName, const String& rMethodName);
~SfxMacroInfo();
sal_Bool operator==(const SfxMacroInfo& rOther) const;
- int Load (SvStream&);
String GetMacroName() const;
String GetQualifiedName() const;
String GetFullQualifiedName() const;
diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx
index a377c40..ad08518 100644
--- a/sfx2/source/control/macrconf.cxx
+++ b/sfx2/source/control/macrconf.cxx
@@ -403,83 +403,6 @@ void SfxMacroInfo::SetHelpText( const String& rName )
*pHelpText = rName;
}
-//==========================================================================
-
-SvStream& operator >> (SvStream& rStream, SfxMacroInfo& rInfo)
-{
- sal_uInt16 nAppBasic, nFileVersion;
- String aDocName;
-
- rStream >> nFileVersion;
- if ( nVersion < nCompatVersion )
- {
- // In der 1.Version ohne Versionskennung
- nAppBasic = nVersion;
- nFileVersion = 1;
- rStream.ReadByteString(aDocName,RTL_TEXTENCODING_UTF8);
- rStream.ReadByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
- rStream.ReadByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
- rStream.ReadByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
- }
- else
- {
- String aInput;
- rStream >> nAppBasic;
- rStream.ReadByteString(aDocName,RTL_TEXTENCODING_UTF8); // Vorsicht: kann bei AppName Unsinn sein!
- rStream.ReadByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
- rStream.ReadByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
- rStream.ReadByteString(aInput,RTL_TEXTENCODING_UTF8);
-
- if ( nFileVersion == nCompatVersion )
- rInfo.aMethodName = aInput;
- else
- {
- sal_uInt16 nCount = aInput.GetTokenCount('.');
- rInfo.aMethodName = aInput.GetToken( nCount-1, '.' );
- if ( nCount > 1 )
- rInfo.aModuleName = aInput.GetToken( nCount-2, '.' );
- if ( nCount > 2 )
- rInfo.aLibName = aInput.GetToken( 0, '.' );
- }
- }
-
- rInfo.bAppBasic = (sal_Bool) nAppBasic;
- return rStream;
-}
-
-int SfxMacroInfo::Load( SvStream& rStream )
-{
- rStream >> (*this);
- nSlotId = SFX_APP()->GetMacroConfig()->GetSlotId(this);
- return 0;
-}
-
-//==========================================================================
-
-SvStream& operator << (SvStream& rStream, const SfxMacroInfo& rInfo)
-{
- if ( rInfo.bAppBasic )
- {
- rStream << nVersion
- << (sal_uInt16) rInfo.bAppBasic;
- rStream.WriteByteString(rInfo.GetBasicName(),RTL_TEXTENCODING_UTF8);
- rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
- rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
- rStream.WriteByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
- }
- else
- {
- rStream << nVersion
- << (sal_uInt16) rInfo.bAppBasic;
- rStream.WriteByteString(SFX_APP()->GetName(),RTL_TEXTENCODING_UTF8);
- rStream.WriteByteString(rInfo.aLibName,RTL_TEXTENCODING_UTF8);
- rStream.WriteByteString(rInfo.aModuleName,RTL_TEXTENCODING_UTF8);
- rStream.WriteByteString(rInfo.aMethodName,RTL_TEXTENCODING_UTF8);
- }
-
- return rStream;
-}
-
sal_Bool SfxMacroInfo::Compare( const SvxMacro& rMacro ) const
{
String aName = rMacro.GetLibName();
commit c871b6fe337feb78648f13e5b8cbfd1537067f4d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 26 15:42:43 2010 +0000
~SfxMacroInfo::Store declared, but never defined
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx
index 00b996a..a262cfc 100644
--- a/sfx2/inc/sfx2/macrconf.hxx
+++ b/sfx2/inc/sfx2/macrconf.hxx
@@ -78,7 +78,6 @@ public:
~SfxMacroInfo();
sal_Bool operator==(const SfxMacroInfo& rOther) const;
int Load (SvStream&);
- int Store (SvStream&);
String GetMacroName() const;
String GetQualifiedName() const;
String GetFullQualifiedName() const;
More information about the Libreoffice-commits
mailing list