sfx2/Library_sfx.mk | 1 sfx2/source/appl/sfxpicklist.cxx | 11 ++------- sfx2/source/bastyp/misc.cxx | 47 --------------------------------------- sfx2/source/inc/sfxtypes.hxx | 11 --------- 4 files changed, 3 insertions(+), 67 deletions(-)
New commits: commit 7cbeac07d21413443889e6ee777a428782e746ae Author: Thomas Arnhold <[email protected]> Date: Mon Feb 25 04:16:08 2013 +0100 Remove useless SfxStringEncode and SfxStringDecode They return empty strings. SearchAndReplace is a stray declaration from historic misc.cxx. Change-Id: Ia7aa970a8ca200bd7bdc5ed688a8f00d092c9561 diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index f8024b1..13617c5 100644 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -123,7 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\ sfx2/source/bastyp/helper \ sfx2/source/bastyp/mieclip \ sfx2/source/bastyp/minarray \ - sfx2/source/bastyp/misc \ sfx2/source/bastyp/progress \ sfx2/source/bastyp/sfxhtml \ sfx2/source/bastyp/sfxresid \ diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 6597d34..8bb2ffc 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -194,7 +194,7 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell* pDocSh ) aURL.GetURLNoPass( INetURLObject::NO_DECODE ), aFilter, aTitle, - SfxStringEncode( aURL.GetPass() ) ); + OUString() ); if ( aURL.GetProtocol() == INET_PROT_FILE ) Application::AddToRecentDocumentList( aURL.GetURLNoPass( INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : ::rtl::OUString() ); @@ -237,7 +237,6 @@ void SfxPickList::CreatePickListEntries() ::rtl::OUString sURL; ::rtl::OUString sFilter; ::rtl::OUString sTitle; - ::rtl::OUString sPassword; sal_uInt32 nPropertyCount = seqPropertySet.getLength(); for( sal_uInt32 nProperty=0; nProperty<nPropertyCount; ++nProperty ) @@ -254,14 +253,10 @@ void SfxPickList::CreatePickListEntries() { seqPropertySet[nProperty].Value >>= sTitle; } - else if( seqPropertySet[nProperty].Name == HISTORY_PROPERTYNAME_PASSWORD ) - { - seqPropertySet[nProperty].Value >>= sPassword; - } } aURL.SetSmartURL( sURL ); - aURL.SetPass( SfxStringDecode( sPassword ) ); + aURL.SetPass( OUString() ); PickListEntry *pPick = new PickListEntry( aURL.GetMainURL( INetURLObject::NO_DECODE ), sFilter, sTitle ); m_aPicklistVector.push_back( pPick ); @@ -407,7 +402,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) aURL.GetURLNoPass( INetURLObject::NO_DECODE ), aFilter, aTitle, - SfxStringEncode( aURL.GetPass() ) ); + OUString() ); } break; diff --git a/sfx2/source/bastyp/misc.cxx b/sfx2/source/bastyp/misc.cxx deleted file mode 100644 index 2019592..0000000 --- a/sfx2/source/bastyp/misc.cxx +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - - -#include "sfxtypes.hxx" - -//-------------------------------------------------------------------- - -#if defined(DBG_UTIL) && defined(WNT) -unsigned SfxStack::nLevel = 0; -#endif - -//-------------------------------------------------------------------- - -String SfxStringEncode( const String &rSource, const char * ) -{ - String aRet; - String aCoded(rSource); - return aRet; -} - -//-------------------------------------------------------------------- - -String SfxStringDecode( const String &, const char * ) -{ - String aRet; - return aRet; -} - - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 1ecb275..73429c8 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -111,17 +111,6 @@ public: //------------------------------------------------------------------------ -String SearchAndReplace( const String &rSource, - const String &rToReplace, - const String &rReplacement ); - -#define SFX_PASSWORD_CODE "_:;*\x9A?()/&[&" -String SfxStringEncode( const String &rSource, - const char *pKey = SFX_PASSWORD_CODE ); -String SfxStringDecode( const String &rSource, - const char *pKey = SFX_PASSWORD_CODE ); - - struct StringList_Impl : private Resource { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
