dbaccess/source/core/api/RowSetBase.cxx | 2
extensions/source/plugin/aqua/sysplug.mm | 22 +++++-----
moz/makefile.mk | 1
moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch | 33 +++++++++++++++
reportdesign/source/core/sdr/UndoEnv.cxx | 18 --------
5 files changed, 45 insertions(+), 31 deletions(-)
New commits:
commit 075271062ac719a2790713b7f301a4a4ac7505c0
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Jun 6 09:31:30 2012 +0200
-Werror,-Wself-assign (Clang)
Change-Id: Ic541f6539a34ea20b19613edc4fe8670b1a69dee
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx
b/reportdesign/source/core/sdr/UndoEnv.cxx
index 487bbaf..46b8986 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -176,20 +176,6 @@ void OXUndoEnvironment::Clear(const Accessor& /*_r*/)
{
OUndoEnvLock aLock(*this);
-#if OSL_DEBUG_LEVEL > 0
- // TODO: LLA->OJ please describe what you are doing in this code fragment.
- PropertySetInfoCache::iterator aIter =
m_pImpl->m_aPropertySetCache.begin();
- PropertySetInfoCache::iterator aEnd = m_pImpl->m_aPropertySetCache.end();
- int ndbg_len = m_pImpl->m_aPropertySetCache.size();
- ndbg_len = ndbg_len;
- for (int idbg_ = 0; aIter != aEnd; ++aIter,++idbg_)
- {
- uno::Reference<beans::XPropertySet> xProp(aIter->first,uno::UNO_QUERY);
- xProp->getPropertySetInfo();
- int nlen = aIter->second.aProperties.size();
- nlen = nlen;
- }
-#endif
m_pImpl->m_aPropertySetCache.clear();
sal_uInt16 nCount = m_pImpl->m_rModel.GetPageCount();
@@ -267,10 +253,6 @@ void SAL_CALL OXUndoEnvironment::propertyChange( const
PropertyChangeEvent& _rEv
// no Undo for transient and readonly props.
// let's see if we know something about the set
-#if OSL_DEBUG_LEVEL > 0
- int nlen = m_pImpl->m_aPropertySetCache.size();
- nlen = nlen;
-#endif
PropertySetInfoCache::iterator objectPos =
m_pImpl->m_aPropertySetCache.find(xSet);
if (objectPos == m_pImpl->m_aPropertySetCache.end())
{
commit a519cacd61624784eff0646c8a472349373b2993
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jun 5 23:32:45 2012 +0200
-Werror,-Wself-assign (Clang)
Change-Id: I92f1271ad36e4ae1221182a3a446f36cf770e003
diff --git a/dbaccess/source/core/api/RowSetBase.cxx
b/dbaccess/source/core/api/RowSetBase.cxx
index 728934b..758a715 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -268,8 +268,6 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32
columnIndex)
aCacheEnd = m_pCache->getEnd();
aCurrentRow = m_aCurrentRow;
ORowSetCacheMap::iterator aCacheIter = m_aCurrentRow.getIter();
- sal_Int32 n = aCacheIter->first;
- n = n;
ORowSetCacheIterator_Helper aHelper = aCacheIter->second;
ORowSetMatrix::iterator k = aHelper.aIterator;
for (; k != m_pCache->getEnd(); ++k)
commit 39ec7832d165d81385b340bc6c0ca9cf5f194eb5
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jun 5 23:22:48 2012 +0200
Adapt to --with-macosx-version-min-required=10.6 and Xcode 4
...signature of TransitionWindowWithOptions apparently changed slightly in
10.6,
and /Developer/Tools/Rez can more reliably be found in /usr/bin.
Change-Id: Iba55478f3b6de1b4695b686095f4aa0bc0af8e7b
diff --git a/moz/makefile.mk b/moz/makefile.mk
index 13db91f..76296ad 100644
--- a/moz/makefile.mk
+++ b/moz/makefile.mk
@@ -88,6 +88,7 @@ PATCH_FILES = \
patches/nss-linux3.patch \
patches/clang_add_nsCaseInsensitiveStringComparator_default_constructor.patch \
patches/clang_missing_this_pointers.patch \
+ patches/seamonkey-1.1.14.source-macosx10.6and7.patch
# This file is needed for the W32 build when BUILD_MOZAB is set
# (currently only vc8/vs2005 is supported when BUILD_MOZAB is set)
diff --git a/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
b/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
new file mode 100644
index 0000000..e74c4e4
--- /dev/null
+++ b/moz/patches/seamonkey-1.1.14.source-macosx10.6and7.patch
@@ -0,0 +1,33 @@
+--- misc/mozilla/widget/src/mac/Makefile.in 2006-08-04 20:52:25.000000000
+0200
++++ misc/build/mozilla/widget/src/mac/Makefile.in 2012-06-04
23:26:18.000000000 +0200
+@@ -130,7 +130,7 @@
+ RES_SRC = $(srcdir)/nsMacWidget.r
+
+ $(RES_DEST): $(RES_SRC)
+- /Developer/Tools/Rez -i /Developer/Headers/FlatCarbon -useDF $(RES_SRC)
-o $(RES_DEST)
++ Rez -i $(MACOS_SDK_DIR)/Developer/Headers/FlatCarbon -useDF $(RES_SRC)
-o $(RES_DEST)
+
+ libs:: $(RES_DEST)
+
+--- misc/mozilla/widget/src/mac/nsMacWindow.cpp 2007-11-19
21:40:08.000000000 +0100
++++ misc/build/mozilla/widget/src/mac/nsMacWindow.cpp 2012-06-04
22:26:29.000000000 +0200
+@@ -1209,7 +1209,7 @@
+ if (!sChecked) {
+ sChecked = PR_TRUE;
+ #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_3
+- transitionFunc = ::TransitionWindowWithOptions;
++ transitionFunc = (TransitionWindowWithOptions_type)
::TransitionWindowWithOptions; // last TransitionWindowOptions* param is const*
in 10.6
+ #else
+ CFBundleRef carbonBundle =
+ ::CFBundleGetBundleWithIdentifier(CFSTR("com.apple.Carbon"));
+--- misc/mozilla/xpfe/bootstrap/appleevents/Makefile.in 2006-01-05
17:41:23.000000000 +0100
++++ misc/build/mozilla/xpfe/bootstrap/appleevents/Makefile.in 2012-06-04
23:35:22.000000000 +0200
+@@ -112,7 +112,7 @@
+
+ # convert AppleScript dictionary .sdef file into .r format, and thence to
.rsrc
+ SDP_TOOL = $(SDP)
+-REZ_TOOL = /Developer/Tools/Rez
++REZ_TOOL = Rez
+ SDEF_SRC = $(srcdir)/mozilla.sdef
+ RES_DEST = mozillaSuite.r
+ RSRC_DEST = mozillaSuite.rsrc
commit be733676d3d9c1e376066301f5e5b1849608d4d8
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Tue Jun 5 23:13:14 2012 +0200
-Werror,-Wsemicolon-before-method-body (Clang)
Change-Id: I1e4d7f1a719712d9665d30bab756ba5b0feaddad
diff --git a/extensions/source/plugin/aqua/sysplug.mm
b/extensions/source/plugin/aqua/sysplug.mm
index 6797f2a..4b3363e 100644
--- a/extensions/source/plugin/aqua/sysplug.mm
+++ b/extensions/source/plugin/aqua/sysplug.mm
@@ -196,7 +196,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)mouseDown: (NSEvent*)i_pEvent;
+-(void)mouseDown: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -204,7 +204,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)mouseDragged: (NSEvent*)i_pEvent;
+-(void)mouseDragged: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -212,7 +212,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)mouseUp: (NSEvent*)i_pEvent;
+-(void)mouseUp: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -220,7 +220,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)rightMouseDown: (NSEvent*)i_pEvent;
+-(void)rightMouseDown: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -228,7 +228,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)rightMouseDragged: (NSEvent*)i_pEvent;
+-(void)rightMouseDragged: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -236,7 +236,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)rightMouseUp: (NSEvent*)i_pEvent;
+-(void)rightMouseUp: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -244,7 +244,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)otherMouseDown: (NSEvent*)i_pEvent;
+-(void)otherMouseDown: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -252,7 +252,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)otherMouseDragged: (NSEvent*)i_pEvent;
+-(void)otherMouseDragged: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -260,7 +260,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)otherMouseUp: (NSEvent*)i_pEvent;
+-(void)otherMouseUp: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -268,7 +268,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)mouseEntered: (NSEvent*)i_pEvent;
+-(void)mouseEntered: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
@@ -276,7 +276,7 @@ struct FakeEventRecord : public EventRecord
m_pCom->NPP_HandleEvent( m_pImpl->getNPPInstance(), &aRec );
}
--(void)mouseExited: (NSEvent*)i_pEvent;
+-(void)mouseExited: (NSEvent*)i_pEvent
{
(void) i_pEvent; // unused
FakeEventRecord aRec;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
