[Libreoffice-commits] .: 2 commits - binfilter/bf_sfx2 binfilter/bf_svtools
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 16 01:04:45 PDT 2011
binfilter/bf_sfx2/source/appl/makefile.mk | 6 +-
binfilter/bf_sfx2/source/appl/sfx2_sfxdll.cxx | 5 -
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx | 58 ---------------------
binfilter/bf_svtools/source/misc/svt_urihelper.cxx | 57 --------------------
4 files changed, 6 insertions(+), 120 deletions(-)
New commits:
commit 962309913835cdb0db58037edf4b0c99b95f993d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 08:53:31 2011 +0100
callcatcher: unused code
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
index 77d49f6..0ee6ff5 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx
@@ -337,64 +337,6 @@ static const char pDocInfoHeader[] = "SfxDocumentInfo";
/*N*/ return 8;
/*N*/ }
-//=========================================================================
-
-/*N*/ typedef SfxPSProperty_Impl *SfxPSPropertyPtr_Impl;
-/*N*/ SV_DECL_PTRARR_DEL(SfxPSPropertyArr_Impl, SfxPSPropertyPtr_Impl, 10, 10)
-/*N*/ SV_IMPL_PTRARR(SfxPSPropertyArr_Impl, SfxPSPropertyPtr_Impl);
-
-/*N*/ struct SfxPSSection_Impl
-/*N*/ {
-/*N*/ SvGlobalName aId;
-/*N*/ SfxPSPropertyArr_Impl aProperties;
-/*N*/ ULONG Save(SvStream &) {return 1;}
-/*N*/ };
-
-//=========================================================================
-
-/*N*/ class SfxPS_Impl
-/*N*/ {
-/*N*/ SfxPSSection_Impl aSection;
-/*N*/ USHORT GetPos( UINT32 nId );
-/*N*/
-/*N*/ public:
-/*N*/
-/*N*/ void SetSectionName(const SvGlobalName& aIdP);
-/*N*/ void AddProperty( SfxPSProperty_Impl* pProp);
-/*N*/
-/*N*/ ULONG Save(SvStream &) {return 1;}
-/*N*/ };
-
-
-/*N*/ USHORT SfxPS_Impl::GetPos( UINT32 nId )
-/*N*/ {
-/*N*/ SfxPSPropertyArr_Impl& rProperties = aSection.aProperties;
-/*N*/ USHORT nCount = rProperties.Count();
-/*N*/ for( USHORT n = 0 ; n < nCount; n++ )
-/*N*/ if( rProperties.GetObject( n )->GetId() == nId )
-/*N*/ return n;
-/*N*/ return USHRT_MAX;
-/*N*/ }
-
-
-/*N*/ void SfxPS_Impl::AddProperty( SfxPSProperty_Impl* pProp)
-/*N*/ {
-/*N*/ USHORT nPos = GetPos( pProp->GetId() );
-/*N*/ if( nPos != USHRT_MAX )
-/*N*/ {
-/*?*/ delete aSection.aProperties[ nPos ];
-/*?*/ aSection.aProperties.Remove( nPos );
-/*N*/ }
-/*N*/ aSection.aProperties.Insert(pProp,0);
-/*N*/ }
-
-//-------------------------------------------------------------------------
-
-/*N*/ void SfxPS_Impl::SetSectionName(const SvGlobalName& aIdP)
-/*N*/ {
-/*N*/ aSection.aId = aIdP;
-/*N*/ }
-
//-------------------------------------------------------------------------
/*N*/ inline SvStream& Skip(SvStream &rStream, USHORT nCount)
diff --git a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
index ab4e8f5..0ba6f92 100644
--- a/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_urihelper.cxx
@@ -192,63 +192,6 @@ Link GetMaybeFileHdl()
return MaybeFileHdl::get();
}
-namespace {
-
-bool isAbsoluteHierarchicalUriReference(
- css::uno::Reference< css::uri::XUriReference > const & uriReference)
-{
- return uriReference.is() && uriReference->isAbsolute()
- && uriReference->isHierarchical() && !uriReference->hasRelativePath();
-}
-
-// To improve performance, assume that if for any prefix URL of a given
-// hierarchical URL either a UCB content cannot be created, or the UCB content
-// does not support the getCasePreservingURL command, then this will hold for
-// any other prefix URL of the given URL, too:
-enum Result { Success, GeneralFailure, SpecificFailure };
-
-Result normalizePrefix(
- css::uno::Reference< css::ucb::XContentProvider > const & broker,
- rtl::OUString const & uri, rtl::OUString * normalized)
-{
- OSL_ASSERT(broker.is() && normalized != 0);
- css::uno::Reference< css::ucb::XContent > content;
- try {
- content = broker->queryContent(
- css::uno::Reference< css::ucb::XContentIdentifierFactory >(
- broker, css::uno::UNO_QUERY_THROW)->createContentIdentifier(
- uri));
- } catch (css::ucb::IllegalIdentifierException &) {}
- if (!content.is()) {
- return GeneralFailure;
- }
- try {
- #if OSL_DEBUG_LEVEL > 0
- bool ok =
- #endif
- (css::uno::Reference< css::ucb::XCommandProcessor >(
- content, css::uno::UNO_QUERY_THROW)->execute(
- css::ucb::Command(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "getCasePreservingURL")),
- -1, css::uno::Any()),
- 0,
- css::uno::Reference< css::ucb::XCommandEnvironment >())
- >>= *normalized);
- OSL_ASSERT(ok);
- } catch (css::uno::RuntimeException &) {
- throw;
- } catch (css::ucb::UnsupportedCommandException &) {
- return GeneralFailure;
- } catch (css::uno::Exception &) {
- return SpecificFailure;
- }
- return Success;
-}
-
-}
-
//============================================================================
//
// FindFirstURLInText
commit 4a699382a571f8090bc1102c0a4dfeb1b0afdd21
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 15 22:18:15 2011 +0100
only needed under windows (if even that)
diff --git a/binfilter/bf_sfx2/source/appl/makefile.mk b/binfilter/bf_sfx2/source/appl/makefile.mk
index 22e044b..fa3e0eb 100644
--- a/binfilter/bf_sfx2/source/appl/makefile.mk
+++ b/binfilter/bf_sfx2/source/appl/makefile.mk
@@ -62,13 +62,17 @@ SLOFILES = \
$(SLO)$/sfx2_app.obj \
$(SLO)$/sfx2_appbas.obj \
$(SLO)$/sfx2_appdde.obj \
- $(SLO)$/sfx2_sfxdll.obj \
$(SLO)$/sfx2_module.obj \
$(SLO)$/sfx2_dlgcont.obj \
$(SLO)$/sfx2_namecont.obj \
$(SLO)$/sfx2_scriptcont.obj \
$(SLO)$/sfx2_imestatuswindow.obj
+.IF "$(GUI)"=="WNT"
+SLOFILES += \
+ $(SLO)$/sfx2_sfxdll.obj
+.ENDIF
+
EXCEPTIONSFILES=\
$(SLO)$/sfx2_appopen.obj \
$(SLO)$/sfx2_appmain.obj \
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_sfxdll.cxx b/binfilter/bf_sfx2/source/appl/sfx2_sfxdll.cxx
index ffb2cda..a48fc31 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_sfxdll.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_sfxdll.cxx
@@ -28,13 +28,11 @@
#ifdef WIN
#include <svwin.h>
-#endif
#ifdef _MSC_VER
#pragma hdrstop
#endif
-#ifdef WIN
namespace binfilter {
// Statische DLL-Verwaltungs-Variablen
@@ -66,8 +64,7 @@ static HINSTANCE hDLLInst = 0;
//==========================================================================
}
-#endif
-
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list