[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - bridges/source desktop/source odk/examples odk/settings offapi/com sal/inc sw/source
Pedro Giffuni
pfg at apache.org
Fri May 2 05:08:05 PDT 2014
bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx | 8 ++-
desktop/source/deployment/misc/dp_platform.cxx | 2
odk/examples/cpp/complextoolbarcontrols/Makefile | 16 ++++---
odk/examples/cpp/complextoolbarcontrols/description.xml | 32 ++++++++++++++
odk/settings/platform.mk | 13 +----
offapi/com/sun/star/embed/XTransactionListener.idl | 2
sal/inc/osl/semaphor.hxx | 2
sw/source/core/layout/fly.cxx | 36 ++++------------
8 files changed, 63 insertions(+), 48 deletions(-)
New commits:
commit aa12ecb54b91ee7632a4adb9a6859d5a89b90602
Author: Pedro Giffuni <pfg at apache.org>
Date: Wed Apr 30 22:18:41 2014 +0000
Fix build with gcc on FreeBSD-i386.
There is an issue building the bridges module with newer versions
of gcc. Merge a local workaround for gcc used in amd64 (r1424178)
to fix the build.
Reference:
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/187218
diff --git a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx b/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
index d8149c1..ecaf9f6 100644
--- a/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_freebsd_intel/except.cxx
@@ -24,11 +24,15 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
+#if ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 6))
+#include <exception>
+#endif
+
#include <stdio.h>
+#include <string.h>
#include <dlfcn.h>
#include <cxxabi.h>
-#include <hash_map>
-#include <sys/param.h>
+#include <hash_map>#include <sys/param.h>
#include <rtl/strbuf.hxx>
#include <rtl/ustrbuf.hxx>
commit adb963c21cebaacb20eb12e9b8a75a1dc4dcf2cd
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Wed Apr 30 15:24:13 2014 +0000
i124783 - Fix wrong CPU string for MacOSX x86_64
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index ea07d41..3b04bed 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -171,7 +171,7 @@ namespace
else if (token.equals(OUSTR(PLATFORM_MACOSX_X86)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_X86_64)))
- ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("x86_64"));
+ ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("X86_64"));
else if (token.equals(OUSTR(PLATFORM_MACOSX_PPC)))
ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_OS2_X86)))
commit a738920303e77022fa89740c16cb832ee3477fa2
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Wed Apr 30 15:18:25 2014 +0000
Add extension description
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile
index d50c0f2..14cf999 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -27,6 +27,7 @@ SETTINGS=$(PRJ)/settings
include $(SETTINGS)/settings.mk
include $(SETTINGS)/std.mk
include $(SETTINGS)/dk.mk
+include $(SETTINGS)/platform.mk
# Define non-platform/compiler specific settings
COMP_NAME=complextoolbarcontrols
@@ -37,6 +38,7 @@ OUT_COMP_SLO=$(OUT_SLO)/$(COMP_NAME)
COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT)
COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)")
COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml
+COMP_UNOPKG_DESCRIPTION = $(OUT_COMP_GEN)/$(COMPONENT_NAME)/description.xml
COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map
COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components
COMP_REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag
@@ -49,11 +51,6 @@ CXXFILES = \
SLOFILES = $(patsubst %.cxx,$(OUT_COMP_SLO)/%.$(OBJ_EXT),$(CXXFILES))
-# Add OSL_DEBUG_LEVEL to compiler the flags (for OSL_TRACE et. al.)
-ifeq "$(DEBUG)" "yes"
-CC_FLAGS += -DOSL_DEBUG_LEVEL=2
-endif
-
# Targets
.PHONY: ALL
ALL : \
@@ -92,6 +89,11 @@ ifeq "$(OS)" "MACOSX"
endif
endif
+# rule for extension description.xml
+$(COMP_UNOPKG_DESCRIPTION) : description.xml
+ -$(MKDIR) $(subst /,$(PS),$(@D))
+ $(SDK_CAT) $< | $(SDK_SED) -e "s/#EXTENSION_PLATFORM#/$(EXTENSION_PLATFORM)/" > $@
+
# rule for component package manifest
$(OUT_COMP_GEN)/%/manifest.xml :
-$(MKDIR) $(subst /,$(PS),$(@D))
@@ -121,11 +123,11 @@ $(COMP_COMPONENTS) :
@echo $(OSEP)/components$(CSEP) >> $@
# rule for component package file
-$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
+$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS) $(COMP_UNOPKG_DESCRIPTION)
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
- cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components
+ cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components description.xml
cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
$(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu logo_small.png logo_big.png
cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
diff --git a/odk/examples/cpp/complextoolbarcontrols/description.xml b/odk/examples/cpp/complextoolbarcontrols/description.xml
new file mode 100644
index 0000000..d5fb329
--- /dev/null
+++ b/odk/examples/cpp/complextoolbarcontrols/description.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ ***********************************************************-->
+<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <version value="0.0.1"/>
+ <identifier value="org.apache.openoffice.framework.complextoolbarcontrols"/>
+ <platform value="#EXTENSION_PLATFORM#"/>
+ <publisher>
+ <name xlink:href="https://api.openoffice.org" lang="en">Apache OpenOffice</name>
+ </publisher>
+ <display-name>
+ <name lang="en-US">Complex Toolbar Controls Demo for Apache OpenOffice</name>
+ </display-name>
+</description>
commit 1307f0949c9b6e1ef2e8a3128c2113bbd7f17a58
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Wed Apr 30 15:18:17 2014 +0000
Add support for MacOSX x86_64
diff --git a/odk/settings/platform.mk b/odk/settings/platform.mk
index d4ec869..e026f15 100644
--- a/odk/settings/platform.mk
+++ b/odk/settings/platform.mk
@@ -46,6 +46,9 @@ else
ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86"
EXTENSION_PLATFORM=macosx_x86
else
+ ifeq "$(UNOPKG_PLATFORM)" "MacOSX_x86_64"
+ EXTENSION_PLATFORM=macosx_x86_64
+ else
ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC"
EXTENSION_PLATFORM=solaris_sparc
else
@@ -63,13 +66,5 @@ else
endif
endif
endif
+ endif
endif
-
-#ifeq "$(UNOPKG_PLATFORM)" "Linux_SPARC"
-# EXTENSION_PLATFORM=
-#ifeq "$(UNOPKG_PLATFORM)" "Solaris_SPARC64"
-# EXTENSION_PLATFORM=
-#ifeq "$(UNOPKG_PLATFORM)" "kFreeBSD_x86"
-# EXTENSION_PLATFORM=
-#ifeq "$(UNOPKG_PLATFORM)" "kFreeBSD_x86_64"
-# EXTENSION_PLATFORM=
commit 7fd640f4f69b755013295f96f1e8b53a13bc80fe
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 30 12:08:51 2014 +0000
117749: remove unused local variable
patch by: caolanm at redhat.com
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index feb36e1..e0c7602 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -103,10 +103,7 @@ TYPEINIT2(SwFlyFrm,SwLayoutFrm,SwAnchoredObject);
SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
SwLayoutFrm( pFmt, pSib ),
- // OD 2004-03-22 #i26791#
SwAnchoredObject(),
- // OD 2004-05-27 #i26791# - moved to <SwAnchoredObject>
-// aRelPos(),
pPrevLink( 0 ),
pNextLink( 0 ),
bInCnt( sal_False ),
@@ -119,20 +116,15 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
nType = FRMC_FLY;
bInvalid = bNotifyBack = sal_True;
- bLocked = bMinHeight =
- bHeightClipped = bWidthClipped = bFormatHeightOnly = sal_False;
+ bLocked = bMinHeight = bHeightClipped = bWidthClipped = bFormatHeightOnly = sal_False;
//Grosseneinstellung, Fixe groesse ist immer die Breite
const SwFmtFrmSize &rFrmSize = pFmt->GetFrmSize();
- sal_Bool bVert = sal_False;
- sal_uInt16 nDir =
- ((SvxFrameDirectionItem&)pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue();
+ sal_uInt16 nDir = ((SvxFrameDirectionItem&)pFmt->GetFmtAttr( RES_FRAMEDIR )).GetValue();
if( FRMDIR_ENVIRONMENT == nDir )
{
bDerivedVert = 1;
bDerivedR2L = 1;
- if( pAnch && pAnch->IsVertical() )
- bVert = sal_True;
}
else
{
@@ -165,7 +157,6 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
}
}
- bVert = bVertical;
bInvalidR2L = 0;
if( FRMDIR_HORI_RIGHT_TOP == nDir )
bRightToLeft = 1;
@@ -182,25 +173,20 @@ SwFlyFrm::SwFlyFrm( SwFlyFrmFmt *pFmt, SwFrm* pSib, SwFrm *pAnch ) :
else if ( rFrmSize.GetHeightSizeType() == ATT_FIX_SIZE )
bFixSize = sal_True;
- // OD 2004-02-12 #110582#-2 - insert columns, if necessary
+ // insert columns, if necessary
InsertColumns();
- //Erst das Init, dann den Inhalt, denn zum Inhalt koennen widerum
- //Objekte/Rahmen gehoeren die dann angemeldet werden.
+ // initialize before inserting content as the content might contain other objects which need to be registered
InitDrawObj( sal_False );
- // OD 2004-01-19 #110582#
Chain( pAnch );
- // OD 2004-01-19 #110582#
InsertCnt();
- //Und erstmal in den Wald stellen die Kiste, damit bei neuen Dokument nicht
- //unnoetig viel formatiert wird.
+ // apply dummy position which is far-away in order to avoid needless formattings
Frm().Pos().X() = Frm().Pos().Y() = WEIT_WECH;
}
-// OD 2004-01-19 #110582#
void SwFlyFrm::Chain( SwFrm* _pAnch )
{
// Connect to chain neighboors.
@@ -232,7 +218,6 @@ void SwFlyFrm::Chain( SwFrm* _pAnch )
}
}
-// OD 2004-01-19 #110582#
void SwFlyFrm::InsertCnt()
{
if ( !GetPrevLink() )
@@ -253,20 +238,17 @@ void SwFlyFrm::InsertCnt()
}
}
- // OD 2004-02-12 #110582#-2
- void SwFlyFrm::InsertColumns()
- {
- // --> OD 2009-08-12 #i97379#
+void SwFlyFrm::InsertColumns()
+{
// Check, if column are allowed.
// Columns are not allowed for fly frames, which represent graphics or embedded objects.
const SwFmtCntnt& rCntnt = GetFmt()->GetCntnt();
ASSERT( rCntnt.GetCntntIdx(), "<SwFlyFrm::InsertColumns()> - no content prepared." );
- SwNodeIndex aFirstCntnt( *(rCntnt.GetCntntIdx()), 1 );
+ SwNodeIndex aFirstCntnt( *( rCntnt.GetCntntIdx() ), 1 );
if ( aFirstCntnt.GetNode().IsNoTxtNode() )
{
return;
}
- // <--
const SwFmtCol &rCol = GetFmt()->GetCol();
if ( rCol.GetNumCols() > 1 )
@@ -280,7 +262,7 @@ void SwFlyFrm::InsertCnt()
//Old-Wert hereingereicht wird.
ChgColumns( aOld, rCol );
}
- }
+}
/*************************************************************************
|*
commit c882e147893137e681e5149682a491f8904f4c6b
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Apr 29 20:51:14 2014 +0000
Fix build after too happy script renamed a function.
The spelling issue is real but we can't really start renaming functions in
the API.
Reported by: arielch
diff --git a/offapi/com/sun/star/embed/XTransactionListener.idl b/offapi/com/sun/star/embed/XTransactionListener.idl
index 5bdbccc..4133e59 100644
--- a/offapi/com/sun/star/embed/XTransactionListener.idl
+++ b/offapi/com/sun/star/embed/XTransactionListener.idl
@@ -55,7 +55,7 @@ published interface XTransactionListener: com::sun::star::lang::XEventListener
//------------------------------------------------------------------------
/** is called after the object is committed.
*/
- void committed( [in] com::sun::star::lang::EventObject aEvent );
+ void commited( [in] com::sun::star::lang::EventObject aEvent );
//------------------------------------------------------------------------
/** is called just before the object is reverted.
commit e4ab21c40bd2f3a1a9dcd2d5d1cad5fdd6d7db08
Author: Pedro Giffuni <pfg at apache.org>
Date: Tue Apr 29 20:05:30 2014 +0000
Small typo.
diff --git a/sal/inc/osl/semaphor.hxx b/sal/inc/osl/semaphor.hxx
index b768a96..be54881 100644
--- a/sal/inc/osl/semaphor.hxx
+++ b/sal/inc/osl/semaphor.hxx
@@ -43,7 +43,7 @@ namespace osl
/** Creates a semaphore.<BR>
@param InitialCount denotes the starting value the semaphore. If you set it to
zero, the first acquire() blocks. Otherwise InitialCount acquire()s are
- immedeatly successful.
+ immediately successful.
@return 0 if the semaphore could not be created, otherwise a handle to the sem.
*/
More information about the Libreoffice-commits
mailing list