[Libreoffice-commits] .: 2 commits - solenv/gbuild sw/source

Lubos Lunak llunak at kemper.freedesktop.org
Sun Jul 22 03:29:35 PDT 2012


 solenv/gbuild/platform/unxgcc.mk             |    2 ++
 sw/source/filter/ww8/docxattributeoutput.cxx |    5 -----
 sw/source/filter/ww8/docxexport.cxx          |    3 ---
 sw/source/filter/ww8/docxexportfilter.cxx    |    1 -
 sw/source/filter/ww8/rtfattributeoutput.cxx  |    6 ------
 sw/source/filter/ww8/rtfexport.cxx           |    5 -----
 sw/source/filter/ww8/rtfexportfilter.cxx     |    1 -
 sw/source/filter/ww8/rtfimportfilter.cxx     |    2 --
 sw/source/filter/ww8/rtfsdrexport.cxx        |    4 ----
 9 files changed, 2 insertions(+), 27 deletions(-)

New commits:
commit 92b016c45a61d0aaff619e71e3ce31ce04f573bf
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Sun Jul 22 12:27:16 2012 +0200

    remove using rtl::OUString
    
    Change-Id: I437559c82d99adba2221f7511a7b879682b4b67d

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 06ac408..f9df2d1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -136,11 +136,6 @@
 #endif
 
 using ::editeng::SvxBorderLine;
-using rtl::OString;
-using rtl::OStringBuffer;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-using rtl::OUStringToOString;
 
 using namespace oox;
 using namespace docx;
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index 94dd34f..3b279bd 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -68,9 +68,6 @@ using namespace ::oox;
 
 using oox::vml::VMLExport;
 
-using rtl::OUString;
-using rtl::OUStringBuffer;
-
 using sw::mark::IMark;
 
 AttributeOutputBase& DocxExport::AttrOutput() const
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index 5c3272b..c04e329 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -31,7 +31,6 @@
 
 using namespace ::comphelper;
 using namespace ::com::sun::star;
-using ::rtl::OUString;
 
 DocxExportFilter::DocxExportFilter( const uno::Reference< uno::XComponentContext >& xContext )
     : oox::core::XmlFilterBase( xContext )
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5019f18..5b8de5c 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -106,12 +106,6 @@
 #include <com/sun/star/i18n/ScriptType.hpp>
 
 using ::editeng::SvxBorderLine;
-using rtl::OString;
-using rtl::OStringBuffer;
-using rtl::OUString;
-using rtl::OUStringBuffer;
-using rtl::OUStringToOString;
-
 using namespace nsSwDocInfoSubType;
 using namespace nsFieldFlags;
 using namespace sw::util;
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 117711b..b09345a 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -74,11 +74,6 @@ using ::editeng::SvxBorderLine;
 using namespace ::comphelper;
 using namespace ::com::sun::star;
 
-using rtl::OString;
-using rtl::OUString;
-using rtl::OStringBuffer;
-using rtl::OUStringBuffer;
-
 using sw::mark::IMark;
 
 #if defined(UNX)
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 72bec50..749f60e 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -39,7 +39,6 @@
 
 using namespace ::comphelper;
 using namespace ::com::sun::star;
-using ::rtl::OUString;
 
 RtfExportFilter::RtfExportFilter( const uno::Reference< uno::XComponentContext >& xCtx) :
     m_xCtx( xCtx )
diff --git a/sw/source/filter/ww8/rtfimportfilter.cxx b/sw/source/filter/ww8/rtfimportfilter.cxx
index 284e645..21966a5 100644
--- a/sw/source/filter/ww8/rtfimportfilter.cxx
+++ b/sw/source/filter/ww8/rtfimportfilter.cxx
@@ -39,8 +39,6 @@
 
 using namespace ::comphelper;
 using namespace ::com::sun::star;
-using ::rtl::OUString;
-using rtl::OUStringToOString;
 
 RtfImportFilter::RtfImportFilter( const uno::Reference< uno::XComponentContext > &xCtx ) :
     m_xCtx( xCtx )
diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx
index 0916342..5970fb6 100644
--- a/sw/source/filter/ww8/rtfsdrexport.cxx
+++ b/sw/source/filter/ww8/rtfsdrexport.cxx
@@ -37,10 +37,6 @@
 #include <svx/unoapi.hxx>
 #include <vcl/cvtgrf.hxx>
 
-using rtl::OString;
-using rtl::OStringBuffer;
-using rtl::OUString;
-using rtl::OUStringBuffer;
 using namespace sw::util;
 
 RtfSdrExport::RtfSdrExport( RtfExport &rExport )
commit b945ef68a3c9ec04f695ed761f616959d1a3e27d
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Jul 19 10:49:27 2012 +0200

    clang doesn't need/know -fuse-link-plugin for LTO
    
    Change-Id: I63843c335e4c0c3f7ddd15a13853c83db3218649

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9a232e2..ed73734 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -138,8 +138,10 @@ endif
 endif
 
 ifeq ($(ENABLE_LTO),TRUE)
+ifneq ($(COM_GCC_IS_CLANG),TRUE)
 gb_LinkTarget_LDFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
 endif
+endif
 
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)


More information about the Libreoffice-commits mailing list