diff options
-rw-r--r-- | framework/source/helper/titlebarupdate.cxx | 6 | ||||
-rw-r--r-- | shell/inc/internal/xml_parser.hxx | 7 | ||||
-rw-r--r-- | shell/source/all/xml_parser.cxx | 14 | ||||
-rw-r--r-- | shell/source/backends/gconfbe/gconfbackend.cxx | 3 | ||||
-rw-r--r-- | shell/source/backends/gconfbe/gconfbackend.hxx | 5 | ||||
-rw-r--r-- | shell/source/unix/sysshell/recently_used_file.cxx | 6 | ||||
-rw-r--r-- | shell/source/unix/sysshell/recently_used_file.hxx | 3 | ||||
-rw-r--r-- | shell/source/unix/sysshell/recently_used_file_handler.cxx | 20 |
8 files changed, 10 insertions, 54 deletions
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index c57840b4d442..feec90e5a167 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -371,6 +371,12 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra { WorkWindow* pWorkWindow = (WorkWindow*)pWindow; pWorkWindow->SetIcon( (sal_uInt16)nIcon ); + + css::uno::Reference< css::frame::XModel > xModel = xController->getModel(); + rtl::OUString aURL; + if( xModel.is() ) + aURL = xModel->getURL(); + pWorkWindow->SetRepresentedURL( aURL ); } aSolarLock.clear(); diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/internal/xml_parser.hxx index 5c52fcb7cd13..e27fbdccd01d 100644 --- a/shell/inc/internal/xml_parser.hxx +++ b/shell/inc/internal/xml_parser.hxx @@ -76,9 +76,6 @@ public: xml_parser(const XML_Char* EncodingName = 0); //######################################################## - xml_parser(const XML_Char* EncodingName, XML_Char NamespaceSeparator); - - //######################################################## ~xml_parser(); //######################################################## @@ -126,10 +123,6 @@ public: /** Returns the currently used document handler or null if no document handler was set before. */ i_xml_parser_event_handler* get_document_handler() const; - - //############################################ - void set_encoding(const XML_Char* Encoding); - private: void init(); 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/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 { |