[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 8 commits - bridges/source configure.in editeng/source l10ntools/inc sc/source svx/source sw/source
Herbert Dürr
hdu at apache.org
Tue Mar 5 17:05:13 PST 2013
bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 1
configure.in | 10 +++++--
editeng/source/outliner/outleeng.cxx | 2 -
l10ntools/inc/export.hxx | 29 ---------------------
l10ntools/inc/l10ntools/directory.hxx | 9 ++++--
l10ntools/inc/l10ntools/file.hxx | 6 ++++
l10ntools/inc/srciter.hxx | 7 ++---
sc/source/core/inc/interpre.hxx | 2 +
svx/source/dialog/hdft.cxx | 2 -
sw/source/core/text/portxt.hxx | 6 ----
sw/source/filter/ww8/ww8par3.cxx | 2 -
11 files changed, 29 insertions(+), 47 deletions(-)
New commits:
commit ef84b27a141da728614ddc484049be1573cec157
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Mar 5 11:22:40 2013 +0000
consolidate bytestring helper functors in l10ntools
also replace the "inverted" header guards by their canonical
counterparts to make that possible
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 67c6655..1dc282f 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -24,11 +24,9 @@
#ifndef _EXPORT_HXX
#define _EXPORT_HXX
-#ifndef L10NTOOLS_DIRECTORY_HXX
-#define L10NTOOLS_DIRECTORY_HXX
#include <l10ntools/directory.hxx>
-#endif
+#include <tagtest.hxx>
// #define MERGE_SOURCE_LANGUAGES <- To merge en-US and de resource
@@ -55,31 +53,6 @@
#define JAPANESE_ISO "ja"
-
-struct eqstr{
- sal_Bool operator()(const char* s1, const char* s2) const{
- return strcmp(s1,s2)==0;
- }
-};
-
-struct equalByteString{
- bool operator()( const ByteString& rKey1, const ByteString& rKey2 ) const {
- return rKey1.CompareTo( rKey2 )==COMPARE_EQUAL;
- }
-};
-struct lessByteString{
- bool operator()( const ByteString& rKey1, const ByteString& rKey2 ) const {
- return rKey1.CompareTo( rKey2 )==COMPARE_LESS;
- }
-};
-
-struct hashByteString{
- size_t operator()( const ByteString& rName ) const{
- std::hash< const char* > myHash;
- return myHash( rName.GetBuffer() );
- }
-};
-
class PFormEntrys;
class MergeData;
typedef std::set<ByteString , lessByteString > ByteStringSet;
diff --git a/l10ntools/inc/l10ntools/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx
index 3b22f2b..23281c5 100644
--- a/l10ntools/inc/l10ntools/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -19,6 +19,9 @@
*
*************************************************************/
+#ifndef L10NTOOLS_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
+
#include <vector>
#include <algorithm>
#include <rtl/ustring.hxx>
@@ -33,10 +36,7 @@
#include <stdio.h>
-#ifndef L10NTOOLS_FILE_HXX
-#define L10NTOOLS_FILE_HXX
#include <l10ntools/file.hxx>
-#endif
namespace transex{
@@ -73,3 +73,6 @@ class Directory
};
}
+
+#endif // L10NTOOLS_DIRECTORY_HXX
+
diff --git a/l10ntools/inc/l10ntools/file.hxx b/l10ntools/inc/l10ntools/file.hxx
index 3e2760b..9156c54 100644
--- a/l10ntools/inc/l10ntools/file.hxx
+++ b/l10ntools/inc/l10ntools/file.hxx
@@ -19,6 +19,9 @@
*
*************************************************************/
+#ifndef L10NTOOLS_FILE_HXX
+#define L10NTOOLS_FILE_HXX
+
#include "rtl/ustring.hxx"
namespace transex
@@ -42,3 +45,6 @@ class File
};
}
+
+#endif // L10NTOOLS_FILE_HXX
+
diff --git a/l10ntools/inc/srciter.hxx b/l10ntools/inc/srciter.hxx
index 37ba96e..2ec6c28 100644
--- a/l10ntools/inc/srciter.hxx
+++ b/l10ntools/inc/srciter.hxx
@@ -20,14 +20,12 @@
*************************************************************/
+#ifndef L10NTOOLS_SRCITER_HXX
+#define L10NTOOLS_SRCITER_HXX
-#ifndef L10NTOOLS_DIRECTORY_HXX
-#define L10NTOOLS_DIRECTORY_HXX
#include <l10ntools/directory.hxx>
-#endif
// class SourceTreeIterator
-//
class SourceTreeIterator
{
@@ -51,4 +49,5 @@ public:
virtual void OnExecuteDirectory( const rtl::OUString &rDirectory );
};
+#endif // L10NTOOLS_SRCITER_HXX
commit e86a7b8c14e605bc08b02042117670ce6e451afe
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Tue Mar 5 10:07:11 2013 +0000
Presenter Console -> Presenter Screen.
diff --git a/configure.in b/configure.in
index b2646ae..08361e0 100644
--- a/configure.in
+++ b/configure.in
@@ -522,8 +522,8 @@ AC_ARG_WITH(beanshell-jar,
AC_ARG_ENABLE(minimizer,
[ --enable-minimizer enables the build of the Presentation Minimizer extension
],,)
-AC_ARG_ENABLE(presenter-console,
-[ --enable-presenter-console enables the build of the Presenter Console extension
+AC_ARG_ENABLE(presenter-screen,
+[ --enable-presenter-screen enables the build of the Presenter Screen extension
],,)
AC_ARG_ENABLE(pdfimport,
[ --enable-pdfimport enables the build of the PDF Import extension
@@ -6424,7 +6424,7 @@ fi
AC_SUBST(ENABLE_MINIMIZER)
AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then
+if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_PRESENTER_SCREEN=YES
else
commit dee39c7cebf3d9dd7b52bf35a10e22a063a0f6d2
Author: Pavel JanÃk <paveljanik at apache.org>
Date: Tue Mar 5 10:04:51 2013 +0000
Define BOOST_MATH_OVERFLOW_ERROR_POLICY only in case it is not yet defined.
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 56a6a12..3135082 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -44,7 +44,9 @@
// This header must be included before including any Boost
// math function.
//
+#ifndef BOOST_MATH_OVERFLOW_ERROR_POLICY
#define BOOST_MATH_OVERFLOW_ERROR_POLICY errno_on_error
+#endif
class ScDocument;
class SbxVariable;
commit 94e277e997d396ae44e4c13c806fa0f461dafd83
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Mar 5 09:37:22 2013 +0000
the header file new.h is obsolete on our platforms
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
index 548b608..494e8b1 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx
@@ -28,7 +28,6 @@
#include <hash_map>
#include <sal/config.h>
#include <malloc.h>
-#include <new.h>
#include <typeinfo.h>
#include <signal.h>
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index e732756..3290554 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -22,11 +22,7 @@
#ifndef _PORTXT_HXX
#define _PORTXT_HXX
-#ifdef GCC
-#include <sys/types.h>
-#else
-#include <new.h> //fuer size_t, FIXEDMEM aus tools
-#endif
+
#include <tools/mempool.hxx>
#include "porlin.hxx"
commit d9a81e07110bfb02d6c13cb17444e4bb7f6ebcaf
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Mar 5 09:16:43 2013 +0000
fix miscarried bitwise-or in WW8FormulaCheckBox's lcl_AddToPropertyContainer() helper
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 38fcf45..4a00e02 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2586,7 +2586,7 @@ static void lcl_AddToPropertyContainer
uno::Any aAny(C2U(""));
xPropContainer->addProperty
(rPropertyName,
- static_cast<sal_Int16>(beans::PropertyAttribute::BOUND ||
+ static_cast<sal_Int16>(beans::PropertyAttribute::BOUND |
beans::PropertyAttribute::REMOVABLE),
aAny);
}
commit ffeba46ae02330cc8b727288814c69d4f8e69704
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Mar 5 08:57:11 2013 +0000
fix miscarried bitwise check in SvxHFPage::Reset()
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 4c9a188..8b0350f 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -406,7 +406,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue();
- if(nHtmlMode && HTMLMODE_ON)
+ if(nHtmlMode & HTMLMODE_ON)
{
aCntSharedBox.Hide();
aBackgroundBtn.Hide();
commit 95ee4ea64c7704e3165662ad59e93063b8a2c96f
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Mar 5 08:51:35 2013 +0000
fix miscarried bitwise check in OutlinerEditEng::PaintingFirstLine()
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 696de2b..9351cbc 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -53,7 +53,7 @@ OutlinerEditEng::~OutlinerEditEng()
void OutlinerEditEng::PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
{
- if( GetControlWord() && EE_CNTRL_OUTLINER )
+ if( GetControlWord() & EE_CNTRL_OUTLINER )
{
PaintFirstLineInfo aInfo( nPara, rStartPos, nBaseLineY, rOrigin, nOrientation, pOutDev );
pOwner->maPaintFirstLineHdl.Call( &aInfo );
commit 877103f6c2390ceb688924f7202b856f51dc4148
Author: Herbert Dürr <hdu at apache.org>
Date: Tue Mar 5 07:35:18 2013 +0000
get more detailed info about the build platform's release and version
On the mailing lists there are frequently questions about the binary compatibility
of provided builds, e.g. from the buildbots. Autoconf and configure are bit skimpy
on the details of the build platform so the questions cannot be easily answered.
This change tries to get at least the details provided by /etc/*release and uname.
diff --git a/configure.in b/configure.in
index 918884c..b2646ae 100644
--- a/configure.in
+++ b/configure.in
@@ -1109,6 +1109,10 @@ else
CygwinVer="false"
fi
+# get info about the system provided release/version details
+head /etc/*-release
+uname -a
+
dnl ===================================================================
dnl The following is a list of supported systems.
dnl Sequential to keep the logic very simple
More information about the Libreoffice-commits
mailing list