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.cxx2
-rw-r--r--shell/source/backends/kdebe/kdecommonlayer.cxx2
-rwxr-xr-x[-rw-r--r--]shell/source/backends/kdebe/kdeinetlayer.hxx2
-rw-r--r--shell/source/backends/kdebe/kdepathslayer.cxx2
-rw-r--r--shell/source/backends/kdebe/kdevcllayer.cxx2
-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
12 files changed, 12 insertions, 62 deletions
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 1c898afde0a2..046397f64b8b 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 504c3bba9232..3c5b5eb86ad6 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 721586a80186..185577ec0265 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 4ef90e992b03..c4995e6e81c1 100644
--- a/shell/source/backends/kdebe/kdebecdef.cxx
+++ b/shell/source/backends/kdebe/kdebecdef.cxx
@@ -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"
diff --git a/shell/source/backends/kdebe/kdecommonlayer.cxx b/shell/source/backends/kdebe/kdecommonlayer.cxx
index d2347f7becdb..44592e893342 100644
--- a/shell/source/backends/kdebe/kdecommonlayer.cxx
+++ b/shell/source/backends/kdebe/kdecommonlayer.cxx
@@ -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>
diff --git a/shell/source/backends/kdebe/kdeinetlayer.hxx b/shell/source/backends/kdebe/kdeinetlayer.hxx
index 7e8053a67b7b..1a7427b1cb2c 100644..100755
--- 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 ;
diff --git a/shell/source/backends/kdebe/kdepathslayer.cxx b/shell/source/backends/kdebe/kdepathslayer.cxx
index 34d85ee93d6d..c60a7fff040a 100644
--- a/shell/source/backends/kdebe/kdepathslayer.cxx
+++ b/shell/source/backends/kdebe/kdepathslayer.cxx
@@ -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>
diff --git a/shell/source/backends/kdebe/kdevcllayer.cxx b/shell/source/backends/kdebe/kdevcllayer.cxx
index d657ea5054a6..f6c5368acfec 100644
--- a/shell/source/backends/kdebe/kdevcllayer.cxx
+++ b/shell/source/backends/kdebe/kdevcllayer.cxx
@@ -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"
//==============================================================================
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 43fbd410dbe3..f605d6f340d9 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 9126f1829ed7..6de067a62936 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 93d0027a0d3e..ec27e5458cf0 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 faf8118d7f8d..80d22501ed46 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 (git 2.34.1) at 2024-06-19 10:00:52 +0000