extensions/source/update/check/updatecheck.cxx | 8 +--
extensions/source/update/check/updatecheck.hxx | 2
extensions/source/update/tools/makefile.mk | 35 ----------------
extensions/source/update/tools/ztool.cxx | 52 -------------------------
svgio/inc/svgio/svgreader/svgimagenode.hxx | 3 -
5 files changed, 5 insertions(+), 95 deletions(-)
New commits:
commit c80c70c8c306d887ce0b399e9f20b0363e888369
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Mar 17 12:41:54 2014 +0100
Remove unused getXLink
Change-Id: I848d8afbec17dd5cfb5063942d1e504aa548c759
diff --git a/svgio/inc/svgio/svgreader/svgimagenode.hxx
b/svgio/inc/svgio/svgreader/svgimagenode.hxx
index 2461a22..9dbb624 100644
--- a/svgio/inc/svgio/svgreader/svgimagenode.hxx
+++ b/svgio/inc/svgio/svgreader/svgimagenode.hxx
@@ -82,9 +82,6 @@ namespace svgio
/// height content, set if found in current context
const SvgNumber& getHeight() const { return maHeight; }
void setHeight(const SvgNumber& rHeight = SvgNumber()) { maHeight
= rHeight; }
-
- /// XLink access
- const OUString& getXLink() const { return maXLink; }
};
} // end of namespace svgreader
} // end of namespace svgio
commit 549c3b81190d64ec23254f448ebf69520dd76da9
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Mar 17 12:41:37 2014 +0100
Remove unused code
Change-Id: I1690f5b88b7bd04d336a45b1d745185285e13070
diff --git a/extensions/source/update/tools/makefile.mk
b/extensions/source/update/tools/makefile.mk
deleted file mode 100644
index a533673..0000000
--- a/extensions/source/update/tools/makefile.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# 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 .
-#
-
-PRJ = ..$/..$/..
-PRJNAME = extensions
-TARGET = ztool
-LIBTARGET = NO
-TARGETTYPE = CUI
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE: settings.mk
-
-OBJFILES = \
- $(OBJ)$/ztool.obj
-
-APP1TARGET = ztool
-APP1OBJS = $(OBJ)$/ztool.obj
-APP1STDLIBS = $(TOOLSLIB)
-
-.INCLUDE: target.mk
diff --git a/extensions/source/update/tools/ztool.cxx
b/extensions/source/update/tools/ztool.cxx
deleted file mode 100644
index 7009d48..0000000
--- a/extensions/source/update/tools/ztool.cxx
+++ /dev/null
@@ -1,52 +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 .
- */
-
-#include <stdio.h>
-
-#include <tools/stream.hxx>
-#include <tools/zcodec.hxx>
-
-void show_usage()
-{
- fputs("ztool usage: ztool <source> <dest>\n", stderr);
-}
-
-int SAL_CALL main( int argc, char **argv )
-{
- if ( argc != 3 )
- {
- show_usage();
- return -1;
- }
- OUString aInName = OUString::createFromAscii(argv[1]);
- OUString aOutName = OUString::createFromAscii(argv[2]);
- SvFileStream aInFile( aInName, STREAM_READ );
- SvFileStream aOutFile( aOutName, STREAM_WRITE | STREAM_TRUNC );
-
- ZCodec aCompressor;
- aCompressor.BeginCompression();
- aCompressor.Compress( aInFile, aOutFile );
- aCompressor.EndCompression();
-
- return 0;
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 488817e3c47223ed65c3a22763fca9a435fa2c01
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Mar 17 12:41:05 2014 +0100
No need for SAL_CALL here
Change-Id: I283c883bf49e33941de33b9e58d355f683c96ea3
diff --git a/extensions/source/update/check/updatecheck.cxx
b/extensions/source/update/check/updatecheck.cxx
index 4a86c0f..4b9038f 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -239,7 +239,7 @@ public:
virtual void SAL_CALL join();
virtual void SAL_CALL terminate();
- virtual void SAL_CALL cancel();
+ virtual void cancel();
protected:
virtual ~UpdateCheckThread();
@@ -323,7 +323,7 @@ public:
const OUString& rURL );
virtual void SAL_CALL run();
- virtual void SAL_CALL cancel();
+ virtual void cancel();
virtual void SAL_CALL suspend();
virtual void SAL_CALL onTerminated();
@@ -401,7 +401,7 @@ UpdateCheckThread::join()
-void SAL_CALL
+void
UpdateCheckThread::cancel()
{
uno::Reference< deployment::XUpdateInformationProvider >
xProvider(getProvider());
@@ -669,7 +669,7 @@ DownloadThread::run()
-void SAL_CALL DownloadThread::cancel()
+void DownloadThread::cancel()
{
m_aDownload.stop();
resume();
diff --git a/extensions/source/update/check/updatecheck.hxx
b/extensions/source/update/check/updatecheck.hxx
index 8d40c32..9df1960 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -45,7 +45,7 @@ public:
class WorkerThread : public osl::Thread
{
public:
- virtual void SAL_CALL cancel() = 0;
+ virtual void cancel() = 0;
};
class UpdateCheck :
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
