Author: hdu
Date: Thu Jul 25 08:06:12 2013
New Revision: 1506841
URL: http://svn.apache.org/r1506841
Log:
fix rejuvenate01 branch after AOO400/trunk merges
Modified:
openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h
openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx
openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm
Modified: openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h?rev=1506841&r1=1506840&r2=1506841&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h Thu Jul 25
08:06:12 2013
@@ -55,7 +55,7 @@ extern "C" {
/* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if defined(__GNUC__) // workaround gcc bug 14608
+#if defined(__GNUC__) && !defined(__clang__) // workaround for gcc bug 14608
#if (__GNUC_MINOR__ >= 3) // gcc>=4.3 has a builtin
#define SAL_MATH_FINITE(d) __builtin_isfinite(d)
#else
Modified:
openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx?rev=1506841&r1=1506840&r2=1506841&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx
(original)
+++ openoffice/branches/rejuvenate01/main/sfx2/source/sidebar/ContextList.cxx
Thu Jul 25 08:06:12 2013
@@ -56,6 +56,18 @@ const ContextList::Entry* ContextList::G
+ContextList::Entry* ContextList::GetMatch (const Context& rContext)
+{
+ const ::std::vector<Entry>::const_iterator iEntry =
FindBestMatch(rContext);
+ if (iEntry != maEntries.end())
+ return const_cast<Entry*>(&*iEntry);
+ else
+ return NULL;
+}
+
+
+
+
::std::vector<ContextList::Entry>::const_iterator ContextList::FindBestMatch
(const Context& rContext) const
{
sal_Int32 nBestMatch (Context::NoMatch);
Modified:
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx?rev=1506841&r1=1506840&r2=1506841&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
Thu Jul 25 08:06:12 2013
@@ -549,11 +549,7 @@ DataFlavor DataFlavorMapper::systemToOpe
return oOOFlavor;
}
-<<<<<<< .working
const NSString* DataFlavorMapper::openOfficeToSystemFlavor( const DataFlavor&
oOOFlavor, bool& rbInternal) const
-=======
-NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor&
oOOFlavor, bool& rbInternal) const
->>>>>>> .merge-right.r1505621
{
const NSString* sysFlavor = NULL;
rbInternal = false;
@@ -725,11 +721,7 @@ NSArray* DataFlavorMapper::flavorSequenc
}
else
{
-<<<<<<< .working
const NSString* str = openOfficeToSystemFlavor(flavors[i],
bNeedDummyInternalFlavor);
-=======
- NSString* str = openOfficeToSystemFlavor(flavors[i],
bNeedDummyInternalFlavor);
->>>>>>> .merge-right.r1505621
if (str != NULL)
{
Modified:
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx?rev=1506841&r1=1506840&r2=1506841&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
Thu Jul 25 08:06:12 2013
@@ -85,11 +85,7 @@ public:
If there is no suiteable mapping available NULL will
be returned.
*/
-<<<<<<< .working
const NSString* openOfficeToSystemFlavor(const
com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal)
const;
-=======
- NSString* openOfficeToSystemFlavor(const
com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal)
const;
->>>>>>> .merge-right.r1505621
/* Select the best available image data type
If there is no suiteable mapping available NULL will
Modified:
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx?rev=1506841&r1=1506840&r2=1506841&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/aqua/source/dtrans/aqua_clipboard.cxx
Thu Jul 25 08:06:12 2013
@@ -347,12 +347,8 @@ void SAL_CALL AquaClipboard::flushClipbo
for (sal_uInt32 i = 0; i < nFlavors; i++)
{
-<<<<<<< .working
const NSString* sysType =
mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i], bInternal);
-=======
- NSString* sysType =
mpDataFlavorMapper->openOfficeToSystemFlavor(flavorList[i], bInternal);
->>>>>>> .merge-right.r1505621
-
+
if (sysType != NULL)
{
provideDataForType(mPasteboard, sysType);
Modified:
openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm
URL:
http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm?rev=1506841&r1=1506840&r2=1506841&view=diff
==============================================================================
---
openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm
(original)
+++
openoffice/branches/rejuvenate01/main/vcl/aqua/source/window/salframeview.mm
Thu Jul 25 08:06:12 2013
@@ -170,13 +170,8 @@ try {
const SEL setCollectionBehavior = @selector(setCollectionBehavior:);
if( bAllowFullScreen && [pNSWindow respondsToSelector:
setCollectionBehavior])
{
-<<<<<<< .working
- const int bMode = (bAllowFullScreen ?
NSWindowCollectionBehaviorFullScreenPrimary :
NSWindowCollectionBehaviorFullScreenAuxiliary);
- [pNSWindow performSelector:setCollectionBehavior withObject:(id)bMode];
-=======
const int bMode= (bAllowFullScreen ?
NSWindowCollectionBehaviorFullScreenPrimary :
NSWindowCollectionBehaviorFullScreenAuxiliary);
[pNSWindow performSelector:setCollectionBehavior withObject:(id)bMode];
->>>>>>> .merge-right.r1505621
}
// disable OSX>=10.7 window restoration until we support it directly
