diff options
author | Caolán McNamara <caolanm@redhat.com> | 2010-11-26 16:02:58 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-26 21:47:44 +0000 |
commit | e3ab4e81a41be84f4ab6fb93e0d13e82700c2e6d (patch) | |
tree | 3b08853076ea6143583755bc7aa293c2dddc9819 | |
parent | c871b6fe337feb78648f13e5b8cbfd1537067f4d (diff) |
these streaming operators are unused by anything
-rw-r--r-- | sfx2/inc/sfx2/macrconf.hxx | 3 | ||||
-rw-r--r-- | sfx2/source/control/macrconf.cxx | 77 |
2 files changed, 0 insertions, 80 deletions
diff --git a/sfx2/inc/sfx2/macrconf.hxx b/sfx2/inc/sfx2/macrconf.hxx index a262cfc624..fcbabbd10e 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 a377c40bbb..ad085183c3 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(); |