[Libreoffice-commits] core.git: xmlhelp/Library_ucpchelp1.mk xmlhelp/source
xmlhelp/Library_ucpchelp1.mk |1
xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx |3
xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx | 128 ---
xmlhelp/source/cxxhelp/util/Decompressor.cxx | 35 --
4 files changed, 1 insertion(+), 166 deletions(-)
New commits:
commit f8da549db16bf932271163480429c65eae1e6a3b
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jun 8 17:34:14 2015 +0100
Decompressor rubbish in xmlhelp is luckily unused
Change-Id: I0d44ef4df250921d24da0d202de96f60c567ded6
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 245d052..6c09e8a 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -72,7 +72,6 @@ $(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
xmlhelp/source/cxxhelp/provider/services \
xmlhelp/source/cxxhelp/provider/urlparameter \
xmlhelp/source/cxxhelp/qe/DocGenerator \
-xmlhelp/source/cxxhelp/util/Decompressor \
xmlhelp/source/treeview/tvfactory \
xmlhelp/source/treeview/tvread \
))
diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
index 2221f05..a1a6d06 100644
--- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
+++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx
@@ -22,8 +22,7 @@
#include rtl/ref.hxx
#include rtl/ustring.hxx
#include excep/XmlSearchExceptions.hxx
-#include util/Decompressor.hxx
-
+#include vector
namespace xmlsearch {
diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
deleted file mode 100644
index 836dd58..000
--- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx
+++ /dev/null
@@ -1,128 +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 .
- */
-#ifndef INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_DECOMPRESSOR_HXX
-#define INCLUDED_XMLHELP_SOURCE_CXXHELP_INC_UTIL_DECOMPRESSOR_HXX
-
-#include vector
-#include excep/XmlSearchExceptions.hxx
-
-namespace xmlsearch {
-
-namespace util {
-
-
-class Decompressor
-{
-public:
-
-Decompressor()
-: toRead_( 0 )
-{
-}
-
-virtual ~Decompressor() { }
-
-virtual sal_Int32 getNextByte() = 0;
-
-void initReading()
-{
-toRead_ = 0;
-}
-
-private:
-
-static const sal_Int32 BitsInByte;
-static const sal_Int32 NBits;
-
-sal_Int32 toRead_;
-};
-
-
-
-
-class StreamDecompressor
-: public Decompressor
-{
-public:
-
-StreamDecompressor() {}
-
-virtual ~StreamDecompressor() { }
-
-
-virtual sal_Int32 getNextByte() SAL_OVERRIDE;
-};
-
-
-
-class ByteArrayDecompressor
-: public Decompressor
-{
-public:
-
-ByteArrayDecompressor( sal_Int32 arrayL,sal_Int8* array,sal_Int32
index )
-{
-initReading(array,arrayL,index);
-}
-
-
-virtual ~ByteArrayDecompressor() { }
-
-sal_Int32 bytesRead()
-{
-return index_ - index0_;
-}
-
-
-sal_Int32 getNextByte() throw(
xmlsearch::excep::XmlSearchException ) SAL_OVERRIDE
-{
-if( arrayL_ = index_ )
-throw xmlsearch::excep::XmlSearchException(
-OUString( ByteArrayDecompressor-getNextByte() ) );
-return array_[index_++] 0xFF;
-}
-
-
-private:
-
-sal_Int32 arrayL_;
-sal_Int8 *array_;
-
-sal_Int32 index_,index0_;
-
-using xmlsearch::util::Decompressor::initReading;
-void initReading( sal_Int8* array,sal_Int32 arrayL,sal_Int32 index
)
-{
-arrayL_ = arrayL;
-array_ = array;
-index_ = index0_ = index;
-Decompressor::initReading();
-}
-
-};
-
-
-}
-
[Libreoffice-commits] core.git: xmlhelp/Library_ucpchelp1.mk xmlhelp/source
xmlhelp/Library_ucpchelp1.mk |1
xmlhelp/source/cxxhelp/provider/databases.cxx | 30 +-
xmlhelp/source/cxxhelp/provider/databases.hxx |2 -
3 files changed, 22 insertions(+), 11 deletions(-)
New commits:
commit 8d1765439caad42c8b679f94211c9bf022f51682
Author: Andras Timar ati...@suse.com
Date: Tue Apr 2 04:23:56 2013 -0700
icon style fixes in local help
correct icon style in offline help when icon style is Automatic
change icon style in offile help when icon style is changed on UI
Change-Id: I1b56beeaf370cb6b20b9a7c69f158291b4128ab0
diff --git a/xmlhelp/Library_ucpchelp1.mk b/xmlhelp/Library_ucpchelp1.mk
index 3d7d057..a1d119f 100644
--- a/xmlhelp/Library_ucpchelp1.mk
+++ b/xmlhelp/Library_ucpchelp1.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Library_use_libraries,ucpchelp1,\
ucbhelper \
utl \
i18nisolang1 \
+ vcl \
))
$(eval $(call gb_Library_add_exception_objects,ucpchelp1,\
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx
b/xmlhelp/source/cxxhelp/provider/databases.cxx
index c875840..0ecfa33 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -61,6 +61,8 @@
#include comphelper/storagehelper.hxx
#include comphelper/string.hxx
+#include vcl/svapp.hxx
+
#include databases.hxx
#include urlparameter.hxx
@@ -135,7 +137,7 @@ Databases::Databases( sal_Bool showBasic,
vendVersion( rtl::OUString( %VENDORVERSION ) ),
vendShort( rtl::OUString( %VENDORSHORT ) ),
m_aImagesZipPaths( imagesZipPaths ),
- m_nSymbolsStyle( 0 )
+ m_aSymbolsStyleName( )
{
m_xSMgr = Reference XMultiComponentFactory (
m_xContext-getServiceManager(), UNO_QUERY );
@@ -235,8 +237,7 @@ static bool impl_getZipFile(
rtl::OString Databases::getImagesZipFileURL()
{
-//sal_Int16 nSymbolsStyle = SvtMiscOptions().GetCurrentSymbolsStyle();
-sal_Int16 nSymbolsStyle = 0;
+OUString aSymbolsStyleName;
try
{
uno::Reference lang::XMultiServiceFactory xConfigProvider =
@@ -256,22 +257,31 @@ rtl::OString Databases::getImagesZipFileURL()
bool bChanged = false;
uno::Reference container::XHierarchicalNameAccess xAccess(xCFG,
uno::UNO_QUERY_THROW);
-uno::Any aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolSet));
-if ( (aResult = nSymbolsStyle) m_nSymbolsStyle != nSymbolsStyle )
+uno::Any aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle));
+if ( (aResult = aSymbolsStyleName) m_aSymbolsStyleName !=
aSymbolsStyleName )
{
-m_nSymbolsStyle = nSymbolsStyle;
+m_aSymbolsStyleName = aSymbolsStyleName;
bChanged = true;
}
if ( m_aImagesZipFileURL.isEmpty() || bChanged )
{
-rtl::OUString aImageZip, aSymbolsStyleName;
-aResult =
xAccess-getByHierarchicalName(::rtl::OUString(Misc/SymbolStyle));
-aResult = aSymbolsStyleName;
-
+rtl::OUString aImageZip;
bool bFound = false;
+
if ( !aSymbolsStyleName.isEmpty() )
{
+if ( aSymbolsStyleName.equalsAscii(auto) )
+{
+OUString const env =
Application::GetDesktopEnvironment();
+if ( env.equalsIgnoreAsciiCase(tde) ||
+ env.equalsIgnoreAsciiCase(kde) )
+aSymbolsStyleName = crystal;
+else if ( env.equalsIgnoreAsciiCase(kde4) )
+aSymbolsStyleName = oxygen;
+else
+aSymbolsStyleName = tango;
+}
rtl::OUString aZipName = rtl::OUString( images_ );
aZipName += aSymbolsStyleName;
aZipName += rtl::OUString( .zip );
diff --git a/xmlhelp/source/cxxhelp/provider/databases.hxx
b/xmlhelp/source/cxxhelp/provider/databases.hxx
index ec9b23e..afb9cb7 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.hxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.hxx
@@ -314,7 +314,7 @@ namespace chelp {
rtl::OUString m_aInstallDirectory;//
Installation directory
com::sun::star::uno::Sequence rtl::OUString m_aImagesZipPaths;
rtl::OString m_aImagesZipFileURL;
-sal_Int16 m_nSymbolsStyle;
+rtl::OUString m_aSymbolsStyleName;
std::vector rtl::OUString m_avModules;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
