[Libreoffice-commits] core.git: sal/osl sal/workben sdext/source sd/source toolkit/source ucb/source vcl/generic
Jelle van der Waa
jelle at vdwaa.nl
Tue Dec 17 03:57:23 PST 2013
sal/osl/unx/system.c | 3 ---
sal/workben/measure_oustrings.cxx | 2 --
sd/source/ui/dlg/filedlg.cxx | 4 ----
sdext/source/pdfimport/pdfparse/pdfparse.cxx | 12 +++---------
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++------
toolkit/source/awt/vclxtabpagecontainer.cxx | 2 --
toolkit/source/awt/vclxtabpagemodel.cxx | 2 --
toolkit/source/awt/vclxwindows.cxx | 4 ----
ucb/source/ucp/webdav-neon/NeonUri.cxx | 7 -------
ucb/source/ucp/webdav/SerfUri.cxx | 4 ----
vcl/generic/print/genprnpsp.cxx | 6 ------
11 files changed, 5 insertions(+), 49 deletions(-)
New commits:
commit 417c85bf582e0d1dbabb7b0f16d60a394d537e61
Author: Jelle van der Waa <jelle at vdwaa.nl>
Date: Mon Dec 16 22:27:05 2013 +0100
fdo#72598 Remove SunStudio cruft from code base
Change-Id: I6f75d0df0ddafc892fef0ce1bfdcdd6c70151afc
Reviewed-on: https://gerrit.libreoffice.org/7104
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
Tested-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sal/osl/unx/system.c b/sal/osl/unx/system.c
index 23e4f8c..a50996a 100644
--- a/sal/osl/unx/system.c
+++ b/sal/osl/unx/system.c
@@ -305,9 +305,6 @@ int osl_isSingleCPU = 0;
#if defined(_SC_NPROCESSORS_CONF) /* i.e. MACOSX for Intel doesn't have this */
#if defined(__GNUC__)
void osl_interlockedCountCheckForSingleCPU(void) __attribute__((constructor));
-#elif defined(__SUNPRO_C)
-void osl_interlockedCountCheckForSingleCPU(void);
-#pragma init (osl_interlockedCountCheckForSingleCPU)
#endif
void osl_interlockedCountCheckForSingleCPU(void)
diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx
index 2baf92f..8372f49 100644
--- a/sal/workben/measure_oustrings.cxx
+++ b/sal/workben/measure_oustrings.cxx
@@ -33,8 +33,6 @@ int COUNT = 10000000;
#ifdef HAVE_CXX_Ox
# define SAL_DECLARE_UTF16(str) u ## str
-#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550)
-# define SAL_DECLARE_UTF16(str) U ## str
#elif __SIZEOF_WCHAR_T__ == 2
# define SAL_DECLARE_UTF16(str) L ## str
#endif
diff --git a/sd/source/ui/dlg/filedlg.cxx b/sd/source/ui/dlg/filedlg.cxx
index ce3eb29..24afe3c 100644
--- a/sd/source/ui/dlg/filedlg.cxx
+++ b/sd/source/ui/dlg/filedlg.cxx
@@ -49,10 +49,6 @@
class SdFileDialog_Imp : public sfx2::FileDialogHelper
{
private:
-#if defined __SUNPRO_CC
- using sfx2::FileDialogHelper::Execute;
-#endif
-
friend class SdOpenSoundFileDialog;
css::uno::Reference< css::ui::dialogs::XFilePickerControlAccess > mxControlAccess;
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 69aa4d8..ec8b643 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -18,9 +18,7 @@
*/
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
#pragma warning(push, 1)
#endif
@@ -38,9 +36,7 @@
#include <rtl/alloc.h>
// disable warnings again because someone along the line has enabled them
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
#pragma warning(push, 1)
#endif
@@ -681,9 +677,7 @@ PDFEntry* PDFReader::read( const char* pFileName )
#endif // WIN32
}
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
#pragma warning(pop)
#endif
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index b4b66a3..7f14192 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -27,9 +27,7 @@
#include <boost/shared_array.hpp>
-#if defined __SUNPRO_CC
-#pragma disable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
#pragma warning(push, 1)
#endif
@@ -44,9 +42,7 @@
#include "UTF8.h"
#endif
-#if defined __SUNPRO_CC
-#pragma enable_warn
-#elif defined _MSC_VER
+#if defined _MSC_VER
#pragma warning(pop)
#endif
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 47447d4..12d7af6 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -50,9 +50,7 @@ VCLXTabPageContainer::VCLXTabPageContainer() :
VCLXTabPageContainer::~VCLXTabPageContainer()
{
-#ifndef __SUNPRO_CC
OSL_TRACE ("%s", __FUNCTION__);
-#endif
}
void SAL_CALL VCLXTabPageContainer::draw( sal_Int32 nX, sal_Int32 nY ) throw(RuntimeException)
diff --git a/toolkit/source/awt/vclxtabpagemodel.cxx b/toolkit/source/awt/vclxtabpagemodel.cxx
index 3f0e0d2..51756ed 100644
--- a/toolkit/source/awt/vclxtabpagemodel.cxx
+++ b/toolkit/source/awt/vclxtabpagemodel.cxx
@@ -34,9 +34,7 @@ VCLXTabPageModel::VCLXTabPageModel()
VCLXTabPageModel::~VCLXTabPageModel()
{
-#ifndef __SUNPRO_CC
OSL_TRACE ("%s", __FUNCTION__);
-#endif
}
void SAL_CALL VCLXTabPageModel::draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException)
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 5da5369..21325de 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -2271,9 +2271,7 @@ VCLXDialog::VCLXDialog()
VCLXDialog::~VCLXDialog()
{
-#ifndef __SUNPRO_CC
OSL_TRACE ("%s", __FUNCTION__);
-#endif
}
// ::com::sun::star::uno::XInterface
@@ -4197,9 +4195,7 @@ VCLXComboBox::VCLXComboBox()
VCLXComboBox::~VCLXComboBox()
{
-#ifndef __SUNPRO_CC
OSL_TRACE ("%s", __FUNCTION__);
-#endif
}
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > VCLXComboBox::CreateAccessibleContext()
diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx
index 6d8be54..31327d3 100644
--- a/ucb/source/ucp/webdav-neon/NeonUri.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx
@@ -40,11 +40,8 @@
using namespace webdav_ucp;
-# if defined __SUNPRO_CC
// FIXME: not sure whether initializing a ne_uri statically is supposed to work
// the string fields of ne_uri are char*, not const char*
-# pragma disable_warn
-# endif
#if HAVE_GCC_PRAGMA_DIAGNOSTIC_MODIFY
#pragma GCC diagnostic ignored "-Wwrite-strings"
@@ -75,10 +72,6 @@ const ne_uri g_sUriDefaultsFTP = { (char *) "ftp",
NULL };
} // namespace
-# if defined __SUNPRO_CC
-# pragma enable_warn
-#endif
-
NeonUri::NeonUri( const ne_uri * inUri )
throw ( DAVException )
{
diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx
index 16a4b17..a49c46e 100644
--- a/ucb/source/ucp/webdav/SerfUri.cxx
+++ b/ucb/source/ucp/webdav/SerfUri.cxx
@@ -29,10 +29,6 @@
using namespace http_dav_ucp;
-# if defined __SUNPRO_CC
-# pragma enable_warn
-#endif
-
// -------------------------------------------------------------------
// Constructor
// -------------------------------------------------------------------
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/generic/print/genprnpsp.cxx
index 1f080a2..bf38ef0 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/generic/print/genprnpsp.cxx
@@ -1181,13 +1181,7 @@ sal_Bool PspSalPrinter::StartJob( const OUString* i_pFileName, const OUString& i
aContext.URL = aPDFUrl;
// create and initialize PDFWriter
- #if defined __SUNPRO_CC
- #pragma disable_warn
- #endif
pWriter.reset( new vcl::PDFWriter( aContext, uno::Reference< beans::XMaterialHolder >() ) );
- #if defined __SUNPRO_CC
- #pragma enable_warn
- #endif
}
pWriter->NewPage( TenMuToPt( aNewParm.maPageSize.Width() ),
More information about the Libreoffice-commits
mailing list