summaryrefslogtreecommitdiff
path: root/shell/source
diff options
context:
space:
mode:
Diffstat (limited to 'shell/source')
-rw-r--r--shell/source/all/xml_parser.cxx14
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.cxx3
-rw-r--r--shell/source/backends/gconfbe/gconfbackend.hxx5
-rw-r--r--shell/source/backends/kdebe/kdebecdef.cxx40
-rw-r--r--shell/source/backends/kdebe/kdecommonlayer.cxx20
-rw-r--r--shell/source/backends/kdebe/kdeinetlayer.hxx16
-rw-r--r--shell/source/backends/kdebe/kdepathslayer.cxx16
-rw-r--r--shell/source/backends/kdebe/kdevcllayer.cxx16
-rw-r--r--shell/source/backends/localebe/localebackend.cxx6
-rw-r--r--shell/source/tools/lngconvex/lngconvex.cxx13
-rw-r--r--shell/source/unix/sysshell/recently_used_file.cxx6
-rw-r--r--shell/source/unix/sysshell/recently_used_file.hxx3
-rw-r--r--shell/source/unix/sysshell/recently_used_file_handler.cxx20
13 files changed, 64 insertions, 114 deletions
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 5dcb351682..6236b1db27 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -90,14 +90,6 @@ xml_parser::xml_parser(const XML_Char* EncodingName) :
}
//###################################################
-xml_parser::xml_parser(const XML_Char* EncodingName, XML_Char /*NamespaceSeparator*/) :
- document_handler_(0),
- xml_parser_(XML_ParserCreate(EncodingName))
-{
- init();
-}
-
-//###################################################
xml_parser::~xml_parser()
{
XML_ParserFree(xml_parser_);
@@ -224,9 +216,3 @@ i_xml_parser_event_handler* xml_parser::get_document_handler() const
{
return document_handler_;
}
-
-//###################################################
-void xml_parser::set_encoding(const XML_Char* Encoding)
-{
- XML_SetEncoding(xml_parser_, Encoding);
-}
diff --git a/shell/source/backends/gconfbe/gconfbackend.cxx b/shell/source/backends/gconfbe/gconfbackend.cxx
index d5ae5915b2..4918eeadba 100644
--- a/shell/source/backends/gconfbe/gconfbackend.cxx
+++ b/shell/source/backends/gconfbe/gconfbackend.cxx
@@ -763,7 +763,6 @@ keyChangedCallback(GConfClient* aClient,
aGconfBe->notifyListeners(aGconfKey);
}
-#endif
//------------------------------------------------------------------------------
@@ -827,7 +826,7 @@ void GconfBackend::notifyListeners(const rtl::OUString& /*aGconfKey*/)
}
*/
}
-
+#endif
//------------------------------------------------------------------------------
void SAL_CALL GconfBackend::addChangesListener(
diff --git a/shell/source/backends/gconfbe/gconfbackend.hxx b/shell/source/backends/gconfbe/gconfbackend.hxx
index 2177eb99b6..e469fe10a4 100644
--- a/shell/source/backends/gconfbe/gconfbackend.hxx
+++ b/shell/source/backends/gconfbe/gconfbackend.hxx
@@ -174,10 +174,11 @@ class GconfBackend : public BackendBase {
const uno::Reference<backend::XBackendChangesListener>& xListener,
const rtl::OUString& aComponent)
throw (::com::sun::star::uno::RuntimeException);
-
+// currently not used
+#if 0
//Notify all listener of component change
void notifyListeners(const rtl::OUString& aGconfKey);
-
+#endif
protected:
/**
Service constructor from a service factory.
diff --git a/shell/source/backends/kdebe/kdebecdef.cxx b/shell/source/backends/kdebe/kdebecdef.cxx
index 026bffa7c1..c4995e6e81 100644
--- a/shell/source/backends/kdebe/kdebecdef.cxx
+++ b/shell/source/backends/kdebe/kdebecdef.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -37,7 +37,7 @@
#include <cppuhelper/implementationentry.hxx>
#endif
#include <com/sun/star/uno/XComponentContext.hpp>
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
#include "uno/current_context.hxx"
@@ -52,28 +52,28 @@ static uno::Reference<uno::XInterface> SAL_CALL createKDEBackend(const uno::Refe
{
try {
uno::Reference< uno::XCurrentContext > xCurrentContext(uno::getCurrentContext());
-
+
if (xCurrentContext.is())
{
uno::Any aValue = xCurrentContext->getValueByName(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "system.desktop-environment" ) ) );
-
+
rtl::OUString aDesktopEnvironment;
if ( (aValue >>= aDesktopEnvironment) && (aDesktopEnvironment.equalsAscii("KDE")) && (KApplication::kApplication() != NULL) )
return * KDEBackend::createInstance(xContext);
}
-
- return uno::Reference<uno::XInterface>();
-
+
+ return uno::Reference<uno::XInterface>();
+
} catch (uno::RuntimeException e) {
- return uno::Reference<uno::XInterface>();
- }
-
+ return uno::Reference<uno::XInterface>();
+ }
+
}
//==============================================================================
-static const cppu::ImplementationEntry kImplementations_entries[] =
+static const cppu::ImplementationEntry kImplementations_entries[] =
{
{
createKDEBackend,
@@ -97,7 +97,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
extern "C" sal_Bool SAL_CALL component_writeInfo(void *,
void *pRegistryKey) {
-
+
using namespace ::com::sun::star::registry;
if (pRegistryKey)
{
@@ -106,25 +106,25 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *,
uno::Reference< XRegistryKey > xImplKey = static_cast< XRegistryKey* >( pRegistryKey )->createKey(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + KDEBackend::getBackendName()
);
-
+
// Register associated service names
- uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey(
+ uno::Reference< XRegistryKey > xServicesKey = xImplKey->createKey(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES") )
);
-
+
uno::Sequence<rtl::OUString> sServiceNames = KDEBackend::getBackendServiceNames();
for (sal_Int32 i = 0 ; i < sServiceNames.getLength() ; ++ i)
xServicesKey->createKey(sServiceNames[i]);
return sal_True;
}
-
+
catch( InvalidRegistryException& )
- {
- OSL_ENSURE(sal_False, "InvalidRegistryException caught");
+ {
+ OSL_ENSURE(sal_False, "InvalidRegistryException caught");
}
}
-
+
return sal_False;
}
@@ -133,7 +133,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(void *,
extern "C" void *component_getFactory(const sal_Char *aImplementationName,
void *aServiceManager,
void *aRegistryKey) {
-
+
return cppu::component_getFactoryHelper(
aImplementationName,
aServiceManager,
diff --git a/shell/source/backends/kdebe/kdecommonlayer.cxx b/shell/source/backends/kdebe/kdecommonlayer.cxx
index d770c87013..44592e8933 100644
--- a/shell/source/backends/kdebe/kdecommonlayer.cxx
+++ b/shell/source/backends/kdebe/kdecommonlayer.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
#include "kdecommonlayer.hxx"
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
@@ -48,7 +48,7 @@ KDECommonLayer::KDECommonLayer(const uno::Reference<uno::XComponentContext>& xCo
rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.backend.LayerDescriber"));
- typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
+ typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
if( xServiceManager.is() )
{
@@ -63,8 +63,8 @@ KDECommonLayer::KDECommonLayer(const uno::Reference<uno::XComponentContext>& xCo
//------------------------------------------------------------------------------
-void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
- throw ( backend::MalformedDataException, lang::NullPointerException,
+void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
+ throw ( backend::MalformedDataException, lang::NullPointerException,
lang::WrappedTargetException, uno::RuntimeException)
{
if( ! m_xLayerContentDescriber.is() )
@@ -73,7 +73,7 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand
"Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
) ), static_cast < backend::XLayer * > (this) );
}
-
+
uno::Sequence<backend::PropertyInfo> aPropInfoList(3);
sal_Int32 nProperties = 0;
@@ -91,7 +91,7 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand
aPropInfoList[nProperties].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/ExternalMailer/Program") );
- aPropInfoList[nProperties].Type = rtl::OUString(
+ aPropInfoList[nProperties].Type = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "string" ) );
aPropInfoList[nProperties].Protected = sal_False;
aPropInfoList[nProperties++].Value = uno::makeAny( sClientProgram );
@@ -109,14 +109,14 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand
aPropInfoList[nProperties].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontName") );
- aPropInfoList[nProperties].Type = rtl::OUString(
+ aPropInfoList[nProperties].Type = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "string" ) );
aPropInfoList[nProperties].Protected = sal_False;
aPropInfoList[nProperties++].Value = uno::makeAny( sFontName );
aPropInfoList[nProperties].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common/Font/SourceViewFont/FontHeight") );
- aPropInfoList[nProperties].Type = rtl::OUString(
+ aPropInfoList[nProperties].Type = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "short" ) );
aPropInfoList[nProperties].Protected = sal_False;
aPropInfoList[nProperties++].Value = uno::makeAny( nFontHeight );
@@ -130,7 +130,7 @@ void SAL_CALL KDECommonLayer::readData( const uno::Reference<backend::XLayerHand
//------------------------------------------------------------------------------
-rtl::OUString SAL_CALL KDECommonLayer::getTimestamp(void)
+rtl::OUString SAL_CALL KDECommonLayer::getTimestamp(void)
throw (uno::RuntimeException)
{
// Return the value as timestamp to avoid regenerating the binary cache
diff --git a/shell/source/backends/kdebe/kdeinetlayer.hxx b/shell/source/backends/kdebe/kdeinetlayer.hxx
index f6066c39a7..1a7427b1cb 100644
--- a/shell/source/backends/kdebe/kdeinetlayer.hxx
+++ b/shell/source/backends/kdebe/kdeinetlayer.hxx
@@ -10,7 +10,7 @@
#endif
#include <com/sun/star/util/XTimeStamped.hpp>
#include <cppuhelper/implbase2.hxx>
-#include <vcl/kde_headers.h>
+#include <kde_headers.h>
namespace css = com::sun::star ;
namespace uno = css::uno ;
@@ -22,7 +22,7 @@ namespace util = css::util ;
Implementation of the XLayer interface for the KDE values mapped into
the org.openoffice.Inet configuration component.
*/
-class KDEInetLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped>
+class KDEInetLayer : public cppu::WeakImplHelper2<backend::XLayer, util::XTimeStamped>
{
public :
/**
@@ -35,21 +35,21 @@ public :
// XLayer
virtual void SAL_CALL readData(
- const uno::Reference<backend::XLayerHandler>& xHandler)
+ const uno::Reference<backend::XLayerHandler>& xHandler)
throw ( backend::MalformedDataException,
- lang::NullPointerException,
- lang::WrappedTargetException,
+ lang::NullPointerException,
+ lang::WrappedTargetException,
uno::RuntimeException) ;
-
+
// XTimeStamped
- virtual rtl::OUString SAL_CALL getTimestamp(void)
+ virtual rtl::OUString SAL_CALL getTimestamp(void)
throw (uno::RuntimeException);
protected:
/** Destructor */
~KDEInetLayer(void) {}
-
+
private :
uno::Reference<backend::XLayerContentDescriber> m_xLayerContentDescriber ;
diff --git a/shell/source/backends/kdebe/kdepathslayer.cxx b/shell/source/backends/kdebe/kdepathslayer.cxx
index dd622f1bc0..c60a7fff04 100644
--- a/shell/source/backends/kdebe/kdepathslayer.cxx
+++ b/shell/source/backends/kdebe/kdepathslayer.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
#include "kdepathslayer.hxx"
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
#include <com/sun/star/configuration/backend/PropertyInfo.hpp>
#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERCONTENTDESCIBER_HPP_
#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
@@ -50,7 +50,7 @@ KDEPathsLayer::KDEPathsLayer(const uno::Reference<uno::XComponentContext>& xCont
rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.backend.LayerDescriber"));
- typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
+ typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
if( xServiceManager.is() )
{
@@ -65,8 +65,8 @@ KDEPathsLayer::KDEPathsLayer(const uno::Reference<uno::XComponentContext>& xCont
//------------------------------------------------------------------------------
-void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
- throw ( backend::MalformedDataException, lang::NullPointerException,
+void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
+ throw ( backend::MalformedDataException, lang::NullPointerException,
lang::WrappedTargetException, uno::RuntimeException)
{
if( ! m_xLayerContentDescriber.is() )
@@ -75,7 +75,7 @@ void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandl
"Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
) ), static_cast < backend::XLayer * > (this) );
}
-
+
uno::Sequence<backend::PropertyInfo> aPropInfoList(1);
sal_Int32 nProperties = 0;
@@ -89,7 +89,7 @@ void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandl
aPropInfoList[nProperties].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Paths/Variables/Work") );
- aPropInfoList[nProperties].Type = rtl::OUString(
+ aPropInfoList[nProperties].Type = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "string" ) );
aPropInfoList[nProperties].Protected = sal_False;
aPropInfoList[nProperties++].Value = uno::makeAny( sDocumentsURL );
@@ -103,7 +103,7 @@ void SAL_CALL KDEPathsLayer::readData( const uno::Reference<backend::XLayerHandl
//------------------------------------------------------------------------------
-rtl::OUString SAL_CALL KDEPathsLayer::getTimestamp(void)
+rtl::OUString SAL_CALL KDEPathsLayer::getTimestamp(void)
throw (uno::RuntimeException)
{
// Return the value as timestamp to avoid regenerating the binary cache
diff --git a/shell/source/backends/kdebe/kdevcllayer.cxx b/shell/source/backends/kdebe/kdevcllayer.cxx
index e2373e08a2..f6c5368acf 100644
--- a/shell/source/backends/kdebe/kdevcllayer.cxx
+++ b/shell/source/backends/kdebe/kdevcllayer.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@
#include <com/sun/star/configuration/backend/XLayerContentDescriber.hpp>
#endif
#include <com/sun/star/uno/Sequence.hxx>
-#include <vcl/kde_headers.h>
+#include "kde_headers.h"
//==============================================================================
@@ -46,7 +46,7 @@ KDEVCLLayer::KDEVCLLayer(const uno::Reference<uno::XComponentContext>& xContext)
rtl::OUString const k_sLayerDescriberService(RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.comp.configuration.backend.LayerDescriber"));
- typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
+ typedef uno::Reference<backend::XLayerContentDescriber> LayerDescriber;
uno::Reference< lang::XMultiComponentFactory > xServiceManager = xContext->getServiceManager();
if( xServiceManager.is() )
{
@@ -61,8 +61,8 @@ KDEVCLLayer::KDEVCLLayer(const uno::Reference<uno::XComponentContext>& xContext)
//------------------------------------------------------------------------------
-void SAL_CALL KDEVCLLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
- throw ( backend::MalformedDataException, lang::NullPointerException,
+void SAL_CALL KDEVCLLayer::readData( const uno::Reference<backend::XLayerHandler>& xHandler)
+ throw ( backend::MalformedDataException, lang::NullPointerException,
lang::WrappedTargetException, uno::RuntimeException)
{
if( ! m_xLayerContentDescriber.is() )
@@ -71,7 +71,7 @@ void SAL_CALL KDEVCLLayer::readData( const uno::Reference<backend::XLayerHandler
"Could not create com.sun.star.configuration.backend.LayerContentDescriber Service"
) ), static_cast < backend::XLayer * > (this) );
}
-
+
uno::Sequence<backend::PropertyInfo> aPropInfoList(1);
/*
@@ -93,7 +93,7 @@ void SAL_CALL KDEVCLLayer::readData( const uno::Reference<backend::XLayerHandler
aPropInfoList[0].Name = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.VCL/Settings/Accessibility/EnableATToolSupport") );
- aPropInfoList[0].Type = rtl::OUString(
+ aPropInfoList[0].Type = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "string" ) );
aPropInfoList[0].Protected = sal_False;
aPropInfoList[0].Value = uno::makeAny( rtl::OUString::valueOf( ATToolSupport ) );
@@ -103,7 +103,7 @@ void SAL_CALL KDEVCLLayer::readData( const uno::Reference<backend::XLayerHandler
//------------------------------------------------------------------------------
-rtl::OUString SAL_CALL KDEVCLLayer::getTimestamp(void)
+rtl::OUString SAL_CALL KDEVCLLayer::getTimestamp(void)
throw (uno::RuntimeException)
{
// Return the value as timestamp to avoid regenerating the binary cache
diff --git a/shell/source/backends/localebe/localebackend.cxx b/shell/source/backends/localebe/localebackend.cxx
index 56094892f0..80d6240ae8 100644
--- a/shell/source/backends/localebe/localebackend.cxx
+++ b/shell/source/backends/localebe/localebackend.cxx
@@ -39,7 +39,7 @@
#include <stdio.h>
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
#include <rtl/ustrbuf.hxx>
#include <locale.h>
@@ -256,7 +256,7 @@ LocaleBackend* LocaleBackend::createInstance(
rtl::OUString LocaleBackend::getLocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
return ImplGetLocale(LC_CTYPE);
#elif defined (MACOSX)
return ImplGetLocale("AppleLocale");
@@ -269,7 +269,7 @@ rtl::OUString LocaleBackend::getLocale(void)
rtl::OUString LocaleBackend::getUILocale(void)
{
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
+#if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || defined(FREEBSD) || defined(OS2)
return ImplGetLocale(LC_MESSAGES);
#elif defined(MACOSX)
return ImplGetLocale("AppleLanguages");
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 927e626a48..bc15796b25 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -31,12 +31,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_shell.hxx"
-#if OSL_DEBUG_LEVEL == 0
-#ifndef NDEBUG
-#define NDEBUG
-#endif
-#endif
-
#include <tools/presys.h>
#if defined _MSC_VER
#pragma warning(push, 1)
@@ -60,7 +54,6 @@
#include <iostream>
#include <fstream>
-#include <assert.h>
#include <map>
#include <sstream>
#include <iterator>
@@ -283,7 +276,7 @@ public:
void substitute(std::string& Text)
{
replacement_table_t* prt = get_replacement_table(active_iso_lang_.make_std_string());
- assert(prt);
+ OSL_ASSERT(prt);
replacement_table_t::iterator iter = prt->find(Text);
if (iter != prt->end())
Text = iter->second;
@@ -293,7 +286,7 @@ public:
const std::string& Placeholder, const std::string& Substitute)
{
replacement_table_t* prt = get_replacement_table(active_iso_lang_.make_std_string());
- assert(prt);
+ OSL_ASSERT(prt);
prt->insert(std::make_pair(Placeholder, Substitute));
}
@@ -333,7 +326,7 @@ void add_group_entries(
const ByteString& GroupName,
Substitutor& Substitutor)
{
- assert(aConfig.HasGroup(GroupName));
+ OSL_ASSERT(aConfig.HasGroup(GroupName));
aConfig.SetGroup(GroupName);
size_t key_count = aConfig.GetKeyCount();
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index 9763ea8417..37a4ca7e2a 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -115,12 +115,6 @@ void recently_used_file::reset() const
}
//------------------------------------------------
-void recently_used_file::flush()
-{
- fflush(file_);
-}
-
-//------------------------------------------------
void recently_used_file::truncate(off_t length)
{
ftruncate(fileno(file_), length);
diff --git a/shell/source/unix/sysshell/recently_used_file.hxx b/shell/source/unix/sysshell/recently_used_file.hxx
index 596f047d83..8fe8477bb2 100644
--- a/shell/source/unix/sysshell/recently_used_file.hxx
+++ b/shell/source/unix/sysshell/recently_used_file.hxx
@@ -54,9 +54,6 @@ public:
void truncate(off_t length = 0);
//----------------------------
- void flush();
-
- //----------------------------
size_t read(
char* buffer,
size_t size) const;
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index d468a507a3..14ba26a773 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -49,18 +49,6 @@
#include <string.h>
namespace /* private */ {
-
- const rtl::OUString ENVV_UPDATE_RECENTLY_USED =
- rtl::OUString::createFromAscii("ENABLE_UPDATE_RECENTLY_USED");
-
- //########################################
- inline rtl::OString get_file_extension(const rtl::OString& file_url)
- {
- sal_Int32 index = file_url.lastIndexOf('.');
- OSL_ENSURE((index != -1) && ((index + 1) < file_url.getLength()), "Invalid file url");
- return file_url.copy(index + 1);
- }
-
//########################################
typedef std::vector<string_t> string_container_t;
@@ -475,14 +463,6 @@ namespace /* private */ {
greater_recently_used_item());
}
- //##############################
- bool update_recently_used_enabled()
- {
- rtl::OUString tmp;
- osl_getEnvironment(ENVV_UPDATE_RECENTLY_USED.pData, &tmp.pData);
- return (tmp.getLength() > 0);
- }
-
//------------------------------------------------
struct cleanup_guard
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 22:13:29 +0000