incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1354497 [15/33] - in /incubator/ooo/branches/alg/aw080: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/prj/ ext_libraries/serf/win/ ext_sources/ main/ main/animations/source/animc...
Date Wed, 27 Jun 2012 13:45:34 GMT
Modified: incubator/ooo/branches/alg/aw080/main/sal/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sal/util/makefile.mk?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sal/util/makefile.mk (original)
+++ incubator/ooo/branches/alg/aw080/main/sal/util/makefile.mk Wed Jun 27 13:44:09 2012
@@ -1,237 +1,237 @@
-#**************************************************************
-#  
-#  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.
-#  
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=sal
-TARGET=sal
-
-NO_BSYMBOLIC=TRUE
-NO_DEFAULT_STL=TRUE
-
-USE_LDUMP2=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(GUI)"=="UNX"
-TARGETTYPE=CUI
-.ENDIF # UNX
-
-UNIXVERSIONNAMES=UDK
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= $(LFS_CFLAGS)
-CXXFLAGS+= $(LFS_CFLAGS)
-
-.IF "$(depend)" == ""
-
-# --- Files --------------------------------------------------------
-
-# disable check for PIC code as it would complain about 
-# hand coded assembler
-CHECKFORPIC=
-
-.IF "$(header)" == ""
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1FILES=	\
-	$(SLB)$/oslall.lib	\
-	$(SLB)$/cpposl.lib	\
-	$(SLB)$/cpprtl.lib	\
-	$(SLB)$/textenc.lib 
-
-#.IF "$(GUI)"=="UNX"
-#LIB1FILES+=$(SLB)$/systoolsunx.lib
-#.ENDIF # UNX
-
-
-LIB3TARGET=$(LB)$/a$(TARGET).lib
-LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
-LIB3FILES=	\
-	$(LB)$/oslall.lib	\
-	$(LB)$/cpposl.lib	\
-	$(LB)$/cpprtl.lib	\
-	$(LB)$/textenc.lib
-
-#.IF "$(GUI)"=="UNX"
-#LIB3FILES+=$(LB)$/systoolsunx.lib
-#.ENDIF # UNX
-
-.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
-SHL1TARGET= $(TARGET)
-.ELSE
-SHL1TARGET= uno_$(TARGET)
-.ENDIF
-SHL1IMPLIB= i$(TARGET)
-SHL1VERSIONMAP=	$(TARGET).map
-SHL1RPATH=URELIB
-
-.IF "$(GUI)"=="WNT"
-
-.IF "$(COM)"=="GCC"
-UWINAPILIB=     -luwinapi
-.ELSE
-UWINAPILIB=     $(LB)$/uwinapi.lib
-.ENDIF
-
-SHL1STDLIBS=	\
-				$(UWINAPILIB)\
-				$(ADVAPI32LIB)\
-				$(WSOCK32LIB)\
-				$(MPRLIB)\
-				$(SHELL32LIB)\
-				$(COMDLG32LIB)\
-				$(USER32LIB)\
-				$(OLE32LIB)
-.IF "$(COM)"=="GCC"
-MINGWSSTDOBJ=
-MINGWSSTDENDOBJ=
-.ENDIF
-.ENDIF # WNT
-
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="SOLARIS"
-# libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7)
-SHL1STDLIBS= -Bdynamic -ldl -lpthread -lposix4 -lsocket -lnsl
-.IF "$(COM)" == "C50"
-SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
-.ENDIF # C50
-.ENDIF # SOLARIS
-.ENDIF # UNX
-
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS=-lmmap -lpthread
-.ENDIF # OS2
-
-# If we compile sal with STLport checking iterators
-# we need to link against the STLport
-.IF "$(USE_STLP_DEBUG)" != ""
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
-#The irony that using the system STL instead of
-#stlport requires that we link libsal with the
-#LIBSTLPORT alias which is not required when using
-#stlport is not lost on me
-.IF "$(USE_SYSTEM_STL)"=="YES"
-SHL1STDLIBS+=$(LIBSTLPORT)
-.ENDIF
-
-.IF "$(OS)"=="MACOSX"
-SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
-.ENDIF
-
-.IF "$(OS)" == "LINUX"
-.IF "$(PAM_LINK)" == "YES"
-SHL1STDLIBS+=-lpam
-.ENDIF
-.IF "$(CRYPT_LINK)" == "YES"
-SHL1STDLIBS+=-lcrypt
-.ENDIF
-.ENDIF
-
-# #i105898# required for LD_PRELOAD libsalalloc_malloc.so
-#           if sal is linked with -Bsymbolic-functions
-.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-SHL1LINKFLAGS+=-Wl,--dynamic-list=salalloc.list
-.ENDIF # .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
-
-SHL1LIBS+=$(SLB)$/$(TARGET).lib
-
-.IF "$(linkinc)" != ""
-SHL11FILE=$(MISC)$/sal.slo
-.ELSE
-.IF "$(GUI)"=="UNX"
-SHL1OBJS=
-.ELSE
-.IF "$(GUI)$(COM)"!="WNTGCC"
-SHL1OBJS= \
-    $(SLO)$/dllentry.obj
-.ENDIF # WNTGCC
-.ENDIF # UNX
-.ENDIF # lincinc
-
-SHL1DEPN=
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME= $(SHL1TARGET)
-
-#
-# This part builds a tiny extra lib,
-# containing an alloc.c which uses system 
-# heap instead of our own mem management. 
-# This is e.g. useful for proper valgrinding
-# the office.
-#
-.IF "$(OS)"=="LINUX"
-
-TARGET2 = salalloc_malloc
-SHL2TARGET= $(TARGET2)
-SHL2IMPLIB= i$(TARGET2)
-SHL2VERSIONMAP=	salalloc.map
-
-SHL2LIBS+=$(SLB)$/SYSALLOC_cpprtl.lib
-
-.ENDIF # .IF "$(OS)"=="LINUX"
-
-# --- Coverage -----------------------------------------------------
-# LLA: 20040304 The follows lines are an additional which is only need if we run
-#               coverage tests. For normal test runs this feature is not used.
-#               For more information about coverage tests see:
-#               http://gcc.gnu.org/onlinedocs/gcc-3.0/gcc_8.html
-#
-#               Why this additional?
-#               Anybody has decide to link sal with g++ instead of gcc.
-#
-.IF "$(TESTCOVERAGE)"!=""
-.IF "$(GUI)"=="UNX"
-.IF "$(COM)"=="GCC"
-.IF "$(OS)"=="LINUX"
-SHL1STDLIBS+=-lgcc
-.ENDIF
-.ENDIF
-.ENDIF
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.ENDIF # $(header) != ""
-.ENDIF # $(depend) != ""
-
-.INCLUDE :  target.mk
-
-.IF "$(SHL1TARGETN)" != ""
-$(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h
-.ENDIF # "$(SHL1TARGETN)" != ""
-
-$(OUT)$/inc$/udkversion.h: 
-	echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
-	echo '#define _SAL_UDKVERSION_H_'           >> $@
-	echo ''                                     >> $@
-	echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@
-	echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@
-	echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
-	echo ''                                     >> $@
-	echo '#endif'                               >> $@
+#**************************************************************
+#  
+#  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.
+#  
+#**************************************************************
+
+
+
+PRJ=..
+
+PRJNAME=sal
+TARGET=sal
+
+NO_BSYMBOLIC=TRUE
+NO_DEFAULT_STL=TRUE
+
+USE_LDUMP2=TRUE
+USE_DEFFILE=TRUE
+
+.IF "$(GUI)"=="UNX"
+TARGETTYPE=CUI
+.ENDIF # UNX
+
+UNIXVERSIONNAMES=UDK
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :  settings.mk
+
+CFLAGS+= $(LFS_CFLAGS)
+CXXFLAGS+= $(LFS_CFLAGS)
+
+.IF "$(depend)" == ""
+
+# --- Files --------------------------------------------------------
+
+# disable check for PIC code as it would complain about 
+# hand coded assembler
+CHECKFORPIC=
+
+.IF "$(header)" == ""
+
+LIB1TARGET=$(SLB)$/$(TARGET).lib
+LIB1FILES=	\
+	$(SLB)$/oslall.lib	\
+	$(SLB)$/cpposl.lib	\
+	$(SLB)$/cpprtl.lib	\
+	$(SLB)$/textenc.lib 
+
+#.IF "$(GUI)"=="UNX"
+#LIB1FILES+=$(SLB)$/systoolsunx.lib
+#.ENDIF # UNX
+
+
+LIB3TARGET=$(LB)$/a$(TARGET).lib
+LIB3ARCHIV=$(LB)$/lib$(TARGET)$(DLLPOSTFIX).a
+LIB3FILES=	\
+	$(LB)$/oslall.lib	\
+	$(LB)$/cpposl.lib	\
+	$(LB)$/cpprtl.lib	\
+	$(LB)$/textenc.lib
+
+#.IF "$(GUI)"=="UNX"
+#LIB3FILES+=$(LB)$/systoolsunx.lib
+#.ENDIF # UNX
+
+.IF "$(GUI)" == "WNT" || "$(GUI)"=="OS2"
+SHL1TARGET= $(TARGET)
+.ELSE
+SHL1TARGET= uno_$(TARGET)
+.ENDIF
+SHL1IMPLIB= i$(TARGET)
+SHL1VERSIONMAP=	$(TARGET).map
+SHL1RPATH=URELIB
+
+.IF "$(GUI)"=="WNT"
+
+.IF "$(COM)"=="GCC"
+UWINAPILIB=     -luwinapi
+.ELSE
+UWINAPILIB=     $(LB)$/uwinapi.lib
+.ENDIF
+
+SHL1STDLIBS=	\
+				$(UWINAPILIB)\
+				$(ADVAPI32LIB)\
+				$(WSOCK32LIB)\
+				$(MPRLIB)\
+				$(SHELL32LIB)\
+				$(COMDLG32LIB)\
+				$(USER32LIB)\
+				$(OLE32LIB)
+.IF "$(COM)"=="GCC"
+MINGWSSTDOBJ=
+MINGWSSTDENDOBJ=
+.ENDIF
+.ENDIF # WNT
+
+.IF "$(GUI)"=="UNX"
+.IF "$(OS)"=="SOLARIS"
+# libposix4.so (SunOS 5.6) <-> librt.so (SunOS >= 5.7)
+SHL1STDLIBS= -Bdynamic -ldl -lpthread -lposix4 -lsocket -lnsl
+.IF "$(COM)" == "C50"
+SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
+.ENDIF # C50
+.ENDIF # SOLARIS
+.ENDIF # UNX
+
+.IF "$(GUI)"=="OS2"
+SHL1STDLIBS=-lmmap -lpthread
+.ENDIF # OS2
+
+# If we compile sal with STLport checking iterators
+# we need to link against the STLport
+.IF "$(USE_STLP_DEBUG)" != ""
+SHL1STDLIBS+=$(LIBSTLPORT)
+.ENDIF
+
+#The irony that using the system STL instead of
+#stlport requires that we link libsal with the
+#LIBSTLPORT alias which is not required when using
+#stlport is not lost on me
+.IF "$(USE_SYSTEM_STL)"=="YES"
+SHL1STDLIBS+=$(LIBSTLPORT)
+.ENDIF
+
+.IF "$(OS)"=="MACOSX"
+SHL1STDLIBS+=-framework CoreFoundation -framework Carbon
+.ENDIF
+
+.IF "$(OS)" == "LINUX"
+.IF "$(PAM_LINK)" == "YES"
+SHL1STDLIBS+=-lpam
+.ENDIF
+.IF "$(CRYPT_LINK)" == "YES"
+SHL1STDLIBS+=-lcrypt
+.ENDIF
+.ENDIF
+
+# #i105898# required for LD_PRELOAD libsalalloc_malloc.so
+#           if sal is linked with -Bsymbolic-functions
+.IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+SHL1LINKFLAGS+=-Wl,--dynamic-list=salalloc.list
+.ENDIF # .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)" == "TRUE"
+
+SHL1LIBS+=$(SLB)$/$(TARGET).lib
+
+.IF "$(linkinc)" != ""
+SHL11FILE=$(MISC)$/sal.slo
+.ELSE
+.IF "$(GUI)"=="UNX"
+SHL1OBJS=
+.ELSE
+.IF "$(GUI)$(COM)"!="WNTGCC"
+SHL1OBJS= \
+    $(SLO)$/dllentry.obj
+.ENDIF # WNTGCC
+.ENDIF # UNX
+.ENDIF # lincinc
+
+SHL1DEPN=
+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME= $(SHL1TARGET)
+
+#
+# This part builds a tiny extra lib,
+# containing an alloc.c which uses system 
+# heap instead of our own mem management. 
+# This is e.g. useful for proper valgrinding
+# the office.
+#
+.IF "$(OS)"=="LINUX"
+
+TARGET2 = salalloc_malloc
+SHL2TARGET= $(TARGET2)
+SHL2IMPLIB= i$(TARGET2)
+SHL2VERSIONMAP=	salalloc.map
+
+SHL2LIBS+=$(SLB)$/SYSALLOC_cpprtl.lib
+
+.ENDIF # .IF "$(OS)"=="LINUX"
+
+# --- Coverage -----------------------------------------------------
+# LLA: 20040304 The follows lines are an additional which is only need if we run
+#               coverage tests. For normal test runs this feature is not used.
+#               For more information about coverage tests see:
+#               http://gcc.gnu.org/onlinedocs/gcc-3.0/gcc_8.html
+#
+#               Why this additional?
+#               Anybody has decide to link sal with g++ instead of gcc.
+#
+.IF "$(TESTCOVERAGE)"!=""
+.IF "$(GUI)"=="UNX"
+.IF "$(COM)"=="GCC"
+.IF "$(OS)"=="LINUX"
+SHL1STDLIBS+=-lgcc
+.ENDIF
+.ENDIF
+.ENDIF
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+
+.ENDIF # $(header) != ""
+.ENDIF # $(depend) != ""
+
+.INCLUDE :  target.mk
+
+.IF "$(SHL1TARGETN)" != ""
+$(SHL1TARGETN) : $(OUT)$/inc$/udkversion.h
+.ENDIF # "$(SHL1TARGETN)" != ""
+
+$(OUT)$/inc$/udkversion.h: 
+	echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
+	echo '#define _SAL_UDKVERSION_H_'           >> $@
+	echo ''                                     >> $@
+	echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@
+	echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@
+	echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@
+	echo ''                                     >> $@
+	echo '#endif'                               >> $@

Modified: incubator/ooo/branches/alg/aw080/main/sc/inc/compressedarray.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/inc/compressedarray.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/inc/compressedarray.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/inc/compressedarray.hxx Wed Jun 27 13:44:09 2012
@@ -546,18 +546,18 @@ public:
 template< typename A, typename D >
 void ScBitMaskCompressedArray<A,D>::AndValue( A nPos, const D& rValueToAnd )
 {
-    const D& rValue = GetValue( nPos);
+    const D& rValue = this->GetValue( nPos);
     if ((rValue & rValueToAnd) != rValue)
-        SetValue( nPos, rValue & rValueToAnd);
+        this->SetValue( nPos, rValue & rValueToAnd);
 }
 
 
 template< typename A, typename D >
 void ScBitMaskCompressedArray<A,D>::OrValue( A nPos, const D& rValueToOr )
 {
-    const D& rValue = GetValue( nPos);
+    const D& rValue = this->GetValue( nPos);
     if ((rValue | rValueToOr) != rValue)
-        SetValue( nPos, rValue | rValueToOr);
+        this->SetValue( nPos, rValue | rValueToOr);
 }
 
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/inc/document.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/inc/document.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/inc/document.hxx Wed Jun 27 13:44:09 2012
@@ -715,6 +715,9 @@ public:
 	ScDrawLayer*	GetDrawLayer()				{ return pDrawLayer; }
 	SfxBroadcaster*	GetDrawBroadcaster();		// zwecks Header-Vermeidung
 	void			BeginDrawUndo();
+	sal_Bool		IsDrawRecording() const;
+	void			EndDrawUndo();//paired with BeginDrawUndo, clear undo object if GetUndoObj is not called. 
+								//Not necessary if GetUndoObj is called, but call EndDrawUndo paired with BeginDrawUndo is recommended
 
     void            BeginUnoRefUndo();
     bool            HasUnoRefUndo() const       { return ( pUnoRefUndoList != NULL ); }

Modified: incubator/ooo/branches/alg/aw080/main/sc/inc/globstr.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/inc/globstr.hrc?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/inc/globstr.hrc (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/inc/globstr.hrc Wed Jun 27 13:44:09 2012
@@ -573,7 +573,15 @@
 #define STR_UNDO_SET_TAB_BG_COLOR       438
 #define STR_UNDO_SET_MULTI_TAB_BG_COLOR 439
 
-#define STR_COUNT                       440
+#define STR_DPFIELD_GROUP_BY_SECONDS     440
+#define STR_DPFIELD_GROUP_BY_MINUTES     441
+#define STR_DPFIELD_GROUP_BY_HOURS       442
+#define STR_DPFIELD_GROUP_BY_DAYS        443
+#define STR_DPFIELD_GROUP_BY_MONTHS      444
+#define STR_DPFIELD_GROUP_BY_QUARTERS    445
+#define STR_DPFIELD_GROUP_BY_YEARS       446
+
+#define STR_COUNT                        447
 
 #endif
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/inc/helpids.h
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/inc/helpids.h?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/inc/helpids.h (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/inc/helpids.h Wed Jun 27 13:44:09 2012
@@ -379,6 +379,14 @@
 #define HID_AAI_FUNC_OCT2HEX                                    "SC_HID_AAI_FUNC_OCT2HEX"
 #define HID_AAI_FUNC_CONVERT                                    "SC_HID_AAI_FUNC_CONVERT"
 #define HID_AAI_FUNC_FACTDOUBLE                                 "SC_HID_AAI_FUNC_FACTDOUBLE"
+#define HID_AAI_FUNC_IMTAN                                      "SC_HID_AAI_FUNC_IMTAN"
+#define HID_AAI_FUNC_IMSEC                                      "SC_HID_AAI_FUNC_IMSEC"
+#define HID_AAI_FUNC_IMCSC                                      "SC_HID_AAI_FUNC_IMCSC"
+#define HID_AAI_FUNC_IMCOT                                      "SC_HID_AAI_FUNC_IMCOT"
+#define HID_AAI_FUNC_IMSINH                                     "SC_HID_AAI_FUNC_IMSINH"
+#define HID_AAI_FUNC_IMCOSH                                     "SC_HID_AAI_FUNC_IMCOSH"
+#define HID_AAI_FUNC_IMSECH                                     "SC_HID_AAI_FUNC_IMSECH"
+#define HID_AAI_FUNC_IMCSCH                                     "SC_HID_AAI_FUNC_IMCSCH"
 
 // DateFunc Addin Functions (max.20) -----------------------------------------
 #define HID_DAI_FUNC_DAYSINMONTH                                "SC_HID_DAI_FUNC_DAYSINMONTH"

Modified: incubator/ooo/branches/alg/aw080/main/sc/inc/scerrors.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/inc/scerrors.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/inc/scerrors.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/inc/scerrors.hxx Wed Jun 27 13:44:09 2012
@@ -58,6 +58,7 @@
 #define SCWARN_IMPORT_ROW_OVERFLOW (  2 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
 #define SCWARN_IMPORT_COLUMN_OVERFLOW (  3 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
 #define SCWARN_IMPORT_SHEET_OVERFLOW (  4 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
+#define SCWARN_IMPORT_FEATURES_LOST ( 5 | ERRCODE_CLASS_IMPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )
 
 // ERRCODE_CLASS_EXPORT - does not display "Write-Error" in MsgBox
 #define SCWARN_EXPORT_NONCONVERTIBLE_CHARS  (   1 | ERRCODE_CLASS_EXPORT | ERRCODE_WARNING_MASK | ERRCODE_AREA_SC )

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/cell.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/cell.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/cell.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/cell.cxx Wed Jun 27 13:44:09 2012
@@ -747,7 +747,7 @@ ScFormulaCell::ScFormulaCell( const ScFo
 	bNeedListening( sal_False ),
 	aPos( rPos )
 {
-	pCode = rCell.pCode->Clone();
+	pCode = (rCell.pCode) ? rCell.pCode->Clone() : NULL;
 
     if ( nCloneFlags & SC_CLONECELL_ADJUST3DREL )
         pCode->ReadjustRelative3DReferences( rCell.aPos, aPos );
@@ -912,7 +912,8 @@ void ScFormulaCell::GetResultDimensions(
 void ScFormulaCell::Compile( const String& rFormula, sal_Bool bNoListening,
                             const FormulaGrammar::Grammar eGrammar )
 {
-	if ( pDocument->IsClipOrUndo() ) return;
+	//#118851#, the initialization code for pCode after it can not be gnored if it is still NULL
+	if ( pCode && pDocument->IsClipOrUndo() ) return;
 	sal_Bool bWasInFormulaTree = pDocument->IsInFormulaTree( this );
 	if ( bWasInFormulaTree )
 		pDocument->RemoveFromFormulaTree( this );

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/compressedarray.cxx Wed Jun 27 13:44:09 2012
@@ -363,7 +363,7 @@ A ScCompressedArray<A,D>::GetLastUnequal
 template< typename A, typename D >
 unsigned long ScSummableCompressedArray<A,D>::SumValues( A nStart, A nEnd ) const
 {
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     unsigned long nSum = SumValuesContinuation( nStart, nEnd, nIndex);
     if (nEnd > this->nMaxAccess)
         nSum += this->pData[this->nCount-1].aValue * (nEnd - this->nMaxAccess);
@@ -425,17 +425,17 @@ void ScBitMaskCompressedArray<A,D>::AndV
     if (nStart > nEnd)
         return;
 
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     do
     {
         if ((this->pData[nIndex].aValue & rValueToAnd) != this->pData[nIndex].aValue)
         {
             A nS = ::std::max( (nIndex>0 ? this->pData[nIndex-1].nEnd+1 : 0), nStart);
             A nE = ::std::min( this->pData[nIndex].nEnd, nEnd);
-            SetValue( nS, nE, this->pData[nIndex].aValue & rValueToAnd);
+            this->SetValue( nS, nE, this->pData[nIndex].aValue & rValueToAnd);
             if (nE >= nEnd)
                 break;  // while
-            nIndex = Search( nE + 1);
+            nIndex = this->Search( nE + 1);
         }
         else if (this->pData[nIndex].nEnd >= nEnd)
             break;  // while
@@ -452,17 +452,17 @@ void ScBitMaskCompressedArray<A,D>::OrVa
     if (nStart > nEnd)
         return;
 
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     do
     {
         if ((this->pData[nIndex].aValue | rValueToOr) != this->pData[nIndex].aValue)
         {
             A nS = ::std::max( (nIndex>0 ? this->pData[nIndex-1].nEnd+1 : 0), nStart);
             A nE = ::std::min( this->pData[nIndex].nEnd, nEnd);
-            SetValue( nS, nE, this->pData[nIndex].aValue | rValueToOr);
+            this->SetValue( nS, nE, this->pData[nIndex].aValue | rValueToOr);
             if (nE >= nEnd)
                 break;  // while
-            nIndex = Search( nE + 1);
+            nIndex = this->Search( nE + 1);
         }
         else if (this->pData[nIndex].nEnd >= nEnd)
             break;  // while
@@ -487,7 +487,7 @@ void ScBitMaskCompressedArray<A,D>::Copy
         nRegionEnd -= nSourceDy;
         if (nRegionEnd > nEnd)
             nRegionEnd = nEnd;
-        SetValue( j, nRegionEnd, rValue & rValueToAnd);
+        this->SetValue( j, nRegionEnd, rValue & rValueToAnd);
         j = nRegionEnd;
     }
 }
@@ -508,7 +508,7 @@ void ScBitMaskCompressedArray<A,D>::Copy
         nRegionEnd -= nSourceDy;
         if (nRegionEnd > nEnd)
             nRegionEnd = nEnd;
-        SetValue( j, nRegionEnd, rValue | rValueToOr);
+        this->SetValue( j, nRegionEnd, rValue | rValueToOr);
         j = nRegionEnd;
     }
 }
@@ -519,7 +519,7 @@ A ScBitMaskCompressedArray<A,D>::GetBitS
         const D& rBitMask, const D& rMaskedCompare ) const
 {
     A nStart = ::std::numeric_limits<A>::max();
-    size_t nIndex = Search( nEnd);
+    size_t nIndex = this->Search( nEnd);
     while ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
     {
         if (nIndex > 0)
@@ -542,7 +542,7 @@ A ScBitMaskCompressedArray<A,D>::GetBitS
         const D& rBitMask, const D& rMaskedCompare ) const
 {
     A nEnd = ::std::numeric_limits<A>::max();
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     while (nIndex < this->nCount && (this->pData[nIndex].aValue & rBitMask) ==
             rMaskedCompare)
     {
@@ -557,7 +557,7 @@ template< typename A, typename D >
 A ScBitMaskCompressedArray<A,D>::GetFirstForCondition( A nStart, A nEnd,
         const D& rBitMask, const D& rMaskedCompare ) const
 {
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     do
     {
         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
@@ -577,7 +577,7 @@ template< typename A, typename D >
 A ScBitMaskCompressedArray<A,D>::GetLastForCondition( A nStart, A nEnd,
         const D& rBitMask, const D& rMaskedCompare ) const
 {
-    size_t nIndex = Search( nEnd);
+    size_t nIndex = this->Search( nEnd);
     while (1)
     {
         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
@@ -601,7 +601,7 @@ A ScBitMaskCompressedArray<A,D>::CountFo
         const D& rBitMask, const D& rMaskedCompare ) const
 {
     A nRet = 0;
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     do
     {
         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
@@ -624,7 +624,7 @@ size_t ScBitMaskCompressedArray<A,D>::Fi
         A * pArray, size_t nArraySize ) const
 {
     size_t nUsed = 0;
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     while (nIndex < this->nCount && nUsed < nArraySize)
     {
         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
@@ -646,7 +646,7 @@ template< typename A, typename D >
 bool ScBitMaskCompressedArray<A,D>::HasCondition( A nStart, A nEnd,
         const D& rBitMask, const D& rMaskedCompare ) const
 {
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     do
     {
         if ((this->pData[nIndex].aValue & rBitMask) == rMaskedCompare)
@@ -664,7 +664,7 @@ A ScBitMaskCompressedArray<A,D>::CountFo
         const D& rBitMask ) const
 {
     A nRet = 0;
-    size_t nIndex = Search( nStart);
+    size_t nIndex = this->Search( nStart);
     do
     {
         if ((this->pData[nIndex].aValue & rBitMask) != 0)
@@ -718,7 +718,7 @@ unsigned long ScBitMaskCompressedArray<A
 {
     unsigned long nSum = 0;
     A nS = nStart;
-    size_t nIndex1 = Search( nStart);
+    size_t nIndex1 = this->Search( nStart);
     size_t nIndex2 = rArray.Search( nStart);
     do
     {
@@ -752,7 +752,7 @@ unsigned long ScBitMaskCompressedArray<A
 {
     unsigned long nSum = 0;
     A nS = nStart;
-    size_t nIndex1 = Search( nStart);
+    size_t nIndex1 = this->Search( nStart);
     size_t nIndex2 = rArray.Search( nStart);
     do
     {

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/documen9.cxx Wed Jun 27 13:44:09 2012
@@ -79,6 +79,17 @@ void ScDocument::BeginDrawUndo()
 		pDrawLayer->BeginCalcUndo();
 }
 
+sal_Bool ScDocument::IsDrawRecording() const
+{
+	return pDrawLayer ? pDrawLayer->IsRecording() : sal_False;
+}
+
+void ScDocument::EndDrawUndo()
+{
+	if( pDrawLayer )
+		delete pDrawLayer->GetCalcUndo();
+}
+
 XColorTable* ScDocument::GetColorTable()
 {
 	if (pDrawLayer)

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpdimsave.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpdimsave.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpdimsave.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpdimsave.cxx Wed Jun 27 13:44:09 2012
@@ -36,6 +36,10 @@
 #include <rtl/math.hxx>
 #include <algorithm>
 
+#include "global.hxx"
+#include "scresid.hxx"
+#include "globstr.hrc"
+
 // ============================================================================
 
 ScDPSaveGroupItem::ScDPSaveGroupItem( const String& rName ) :
@@ -557,20 +561,33 @@ String ScDPDimensionSaveData::CreateGrou
     return EMPTY_STRING;
 }
 
+namespace {
+
+static const sal_uInt16 nDatePartIds[] =
+{
+    STR_DPFIELD_GROUP_BY_SECONDS,
+    STR_DPFIELD_GROUP_BY_MINUTES,
+    STR_DPFIELD_GROUP_BY_HOURS,
+    STR_DPFIELD_GROUP_BY_DAYS,
+    STR_DPFIELD_GROUP_BY_MONTHS,
+    STR_DPFIELD_GROUP_BY_QUARTERS,
+    STR_DPFIELD_GROUP_BY_YEARS
+};
+
+}
 String ScDPDimensionSaveData::CreateDateGroupDimName( sal_Int32 nDatePart, const ScDPObject& rObject, bool bAllowSource, const ::std::vector< String >* pDeletedNames )
 {
     using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy;
     String aPartName;
     switch( nDatePart )
     {
-        //! use translated strings from globstr.src
-        case SECONDS:  aPartName = String::CreateFromAscii( "Seconds" );    break;
-        case MINUTES:  aPartName = String::CreateFromAscii( "Minutes" );    break;
-        case HOURS:    aPartName = String::CreateFromAscii( "Hours" );      break;
-        case DAYS:     aPartName = String::CreateFromAscii( "Days" );       break;
-        case MONTHS:   aPartName = String::CreateFromAscii( "Months" );     break;
-        case QUARTERS: aPartName = String::CreateFromAscii( "Quarters" );   break;
-        case YEARS:    aPartName = String::CreateFromAscii( "Years" );      break;
+        case SECONDS:  aPartName = ScGlobal::GetRscString( nDatePartIds[0] ); break;
+        case MINUTES:  aPartName = ScGlobal::GetRscString( nDatePartIds[1] ); break;
+        case HOURS:    aPartName = ScGlobal::GetRscString( nDatePartIds[2] ); break;
+        case DAYS:     aPartName = ScGlobal::GetRscString( nDatePartIds[3] ); break;
+        case MONTHS:   aPartName = ScGlobal::GetRscString( nDatePartIds[4] ); break;
+        case QUARTERS: aPartName = ScGlobal::GetRscString( nDatePartIds[5] ); break;
+        case YEARS:    aPartName = ScGlobal::GetRscString( nDatePartIds[6] ); break;
     }
     DBG_ASSERT( aPartName.Len() > 0, "ScDPDimensionSaveData::CreateDateGroupDimName - invalid date part" );
     return CreateGroupDimName( aPartName, rObject, bAllowSource, pDeletedNames );

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpoutput.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpoutput.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpoutput.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/dpoutput.cxx Wed Jun 27 13:44:09 2012
@@ -1134,6 +1134,22 @@ void lcl_GetTableVars( sal_Int32& rGrand
                     String aSourceName;
                     String aGivenName;
                     ScDPOutput::GetDataDimensionNames( aSourceName, aGivenName, xDim );
+					try
+					{	
+						uno::Any aValue = xDimProp->getPropertyValue( rtl::OUString::createFromAscii(SC_UNO_LAYOUTNAME) );
+
+                        if( aValue.hasValue() )
+                        {
+                            OUString strLayoutName;
+
+                            if( aValue >>= strLayoutName )
+                                if ( strLayoutName.getLength() > 0 )
+                                    aGivenName = strLayoutName;
+                        }
+					}
+					catch(uno::Exception&)
+					{
+					}
                     rDataNames.push_back( aSourceName );
                     rGivenNames.push_back( aGivenName );
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/patattr.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/patattr.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/patattr.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/patattr.cxx Wed Jun 27 13:44:09 2012
@@ -1187,16 +1187,17 @@ void ScPatternAttr::UpdateStyleSheet()
 {
 	if (pName)
 	{
-		pStyle = (ScStyleSheet*)pDoc->GetStyleSheetPool()->Find(*pName, SFX_STYLE_FAMILY_PARA);
+		pStyle = dynamic_cast< ScStyleSheet* >(pDoc->GetStyleSheetPool()->Find(*pName, SFX_STYLE_FAMILY_PARA));
 
 		//	wenn Style nicht gefunden, Standard nehmen,
 		//	damit keine leere Anzeige im Toolbox-Controller
 		//!	es wird vorausgesetzt, dass "Standard" immer der erste Eintrag ist!
 		if (!pStyle)
 		{
-			SfxStyleSheetIterator* pIter = pDoc->GetStyleSheetPool()->CreateIterator(
-													SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL );
-			pStyle = (ScStyleSheet*)pIter->First();
+            // #i120077# memory leak
+            SfxStyleSheetIterator aIter(pDoc->GetStyleSheetPool(), SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_ALL);
+			
+            pStyle = dynamic_cast< ScStyleSheet* >(aIter.First());
 		}
 
 		if (pStyle)

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/stlsheet.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/stlsheet.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/stlsheet.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/stlsheet.cxx Wed Jun 27 13:44:09 2012
@@ -117,9 +117,12 @@ sal_Bool __EXPORT ScStyleSheet::SetParen
 	SfxStyleSheetBase* pStyle = rPool.Find( aEffName, nFamily );
 	if (!pStyle)
 	{
-		SfxStyleSheetIterator* pIter = rPool.CreateIterator( nFamily, SFXSTYLEBIT_ALL );
-		pStyle = pIter->First();
-		if (pStyle)
+        // memory leak #i120077#
+        SfxStyleSheetIterator aIter(&rPool, nFamily, SFXSTYLEBIT_ALL);
+
+        pStyle = aIter.First();
+
+        if (pStyle)
 			aEffName = pStyle->GetName();
 	}
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/data/table3.cxx Wed Jun 27 13:44:09 2012
@@ -421,12 +421,12 @@ void ScTable::SwapCol(SCCOL nCol1, SCCOL
 			const ScPatternAttr* pPat2 = GetPattern(nCol2, nRow);
 			if (pPat1 != pPat2)
 			{
-				//maybe the content is the same
-				if (!(*pPat1 == *pPat2))
-				{
-					SetPattern(nCol1, nRow, *pPat2, sal_True);
-					SetPattern(nCol2, nRow, *pPat1, sal_True);
-				}
+				//Add Reference to avoid pPat1 to be deleted by merge same cell attributes for adjacent cells
+				if( IsPooledItem( pPat1 ) ) pPat1->AddRef();
+				SetPattern(nCol1, nRow, *pPat2, sal_True);
+				SetPattern(nCol2, nRow, *pPat1, sal_True);
+				if( IsPooledItem( pPat1 ) ) pPat1->ReleaseRef();
+				
 			}
 		}
 	}
@@ -443,12 +443,11 @@ void ScTable::SwapRow(SCROW nRow1, SCROW
 			const ScPatternAttr* pPat2 = GetPattern(nCol, nRow2);
 			if (pPat1 != pPat2)
 			{
-				//maybe the content is the same
-				if (!(*pPat1 == *pPat2))
-				{
-					SetPattern(nCol, nRow1, *pPat2, sal_True);
-					SetPattern(nCol, nRow2, *pPat1, sal_True);
-				}
+				//Add Reference to avoid pPat1 to be deleted by merge same cell attributes for adjacent cells
+				if( IsPooledItem( pPat1 ) ) pPat1->AddRef();
+				SetPattern(nCol, nRow1, *pPat2, sal_True);
+				SetPattern(nCol, nRow2, *pPat1, sal_True);
+				if( IsPooledItem( pPat1 ) ) pPat1->ReleaseRef();
 			}
 		}
 	}

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/addinhelpid.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/addinhelpid.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/addinhelpid.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/addinhelpid.cxx Wed Jun 27 13:44:09 2012
@@ -88,6 +88,10 @@ const ScUnoAddInHelpId pAnalysisHelpIds[
     { "getImargument"               , HID_AAI_FUNC_IMARGUMENT       },
     { "getImconjugate"              , HID_AAI_FUNC_IMCONJUGATE      },
     { "getImcos"                    , HID_AAI_FUNC_IMCOS            },
+    { "getImcosh"                   , HID_AAI_FUNC_IMCOSH           },
+    { "getImcot"                    , HID_AAI_FUNC_IMCOT            },
+    { "getImcsc"                    , HID_AAI_FUNC_IMCSC            },
+    { "getImcsch"                   , HID_AAI_FUNC_IMCSCH           },
     { "getImdiv"                    , HID_AAI_FUNC_IMDIV            },
     { "getImexp"                    , HID_AAI_FUNC_IMEXP            },
     { "getImln"                     , HID_AAI_FUNC_IMLN             },
@@ -96,10 +100,14 @@ const ScUnoAddInHelpId pAnalysisHelpIds[
     { "getImpower"                  , HID_AAI_FUNC_IMPOWER          },
     { "getImproduct"                , HID_AAI_FUNC_IMPRODUCT        },
     { "getImreal"                   , HID_AAI_FUNC_IMREAL           },
+    { "getImsec"                    , HID_AAI_FUNC_IMSEC            },
+    { "getImsech"                   , HID_AAI_FUNC_IMSECH           },
     { "getImsin"                    , HID_AAI_FUNC_IMSIN            },
+    { "getImsinh"                   , HID_AAI_FUNC_IMSINH           },
     { "getImsqrt"                   , HID_AAI_FUNC_IMSQRT           },
     { "getImsub"                    , HID_AAI_FUNC_IMSUB            },
     { "getImsum"                    , HID_AAI_FUNC_IMSUM            },
+    { "getImtan"                    , HID_AAI_FUNC_IMTAN            },
     { "getIntrate"                  , HID_AAI_FUNC_INTRATE          },
     { "getIseven"                   , HID_AAI_FUNC_ISEVEN           },
     { "getIsodd"                    , HID_AAI_FUNC_ISODD            },

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/odffmap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/odffmap.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/odffmap.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/core/tool/odffmap.cxx Wed Jun 27 13:44:09 2012
@@ -91,6 +91,14 @@ ScCompiler::AddInMap ScCompiler::maAddIn
     { "IMSUB", "IMSUB", false, "com.sun.star.sheet.addin.Analysis.getImsub", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSUB" },
     { "IMSUM", "IMSUM", false, "com.sun.star.sheet.addin.Analysis.getImsum", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSUM" },
     { "IMSQRT", "IMSQRT", false, "com.sun.star.sheet.addin.Analysis.getImsqrt", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSQRT" },
+    { "IMTAN", "IMTAN", false, "com.sun.star.sheet.addin.Analysis.getImtan", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMTAN" },
+    { "IMSEC", "IMSEC", false, "com.sun.star.sheet.addin.Analysis.getImsec", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSEC" },
+    { "IMCSC", "IMCSC", false, "com.sun.star.sheet.addin.Analysis.getImcsc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCSC" },
+    { "IMCOT", "IMCOT", false, "com.sun.star.sheet.addin.Analysis.getImcot", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCOT" },
+    { "IMSINH", "IMSINH", false, "com.sun.star.sheet.addin.Analysis.getImsinh", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSINH" },
+    { "IMCOSH", "IMCOSH", false, "com.sun.star.sheet.addin.Analysis.getImcosh", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCOSH" },
+    { "IMSECH", "IMSECH", false, "com.sun.star.sheet.addin.Analysis.getImsech", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMSECH" },
+    { "IMCSCH", "IMCSCH", false, "com.sun.star.sheet.addin.Analysis.getImcsch", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETIMCSCH" },
     { "COMPLEX", "COMPLEX", false, "com.sun.star.sheet.addin.Analysis.getComplex", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCOMPLEX" },
     { "CONVERT", "CONVERT_ADD", false, "com.sun.star.sheet.addin.Analysis.getConvert", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCONVERT" },
     { "AMORDEGRC", "AMORDEGRC", false, "com.sun.star.sheet.addin.Analysis.getAmordegrc", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETAMORDEGRC" },
@@ -130,6 +138,7 @@ ScCompiler::AddInMap ScCompiler::maAddIn
     { "COUPPCD", "COUPPCD", false, "com.sun.star.sheet.addin.Analysis.getCouppcd", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCOUPPCD" },
     { "COUPNUM", "COUPNUM", false, "com.sun.star.sheet.addin.Analysis.getCoupnum", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETCOUPNUM" },
     { "FVSCHEDULE", "FVSCHEDULE", false, "com.sun.star.sheet.addin.Analysis.getFvschedule", "COM.SUN.STAR.SHEET.ADDIN.ANALYSIS.GETFVSCHEDULE" },
+    
 };
 
 // static

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/excform.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/excform.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/excform.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/excform.cxx Wed Jun 27 13:44:09 2012
@@ -1525,6 +1525,37 @@ sal_Bool ExcelToSc::GetAbsRefs( ScRangeL
     return rRangeList.Count() != 0;
 }
 
+static DefTokenId missArgForZeroList[] = {
+	ocCount,
+	ocCount2,
+	ocAverage,
+	ocMin,
+	ocMinA,
+	ocMax,
+	ocMaxA,
+	ocStDev,
+	ocStDevA,
+	ocVar,
+	ocVarP,
+	ocAveDev,
+	ocKurt,
+	ocSchiefe,
+	ocVarPA,
+	ocVarA,
+	ocDevSq
+};
+
+#define missArgForZeroCount sizeof(missArgForZeroList)/sizeof(DefTokenId)
+
+
+sal_Bool lcl_isInMissArgForZeroList(DefTokenId id)
+{
+	for(short index = 0; index < missArgForZeroCount; index++)
+		if(missArgForZeroList[index] == id)
+			return sal_True;
+	return sal_False;
+
+}
 void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCount )
 {
 	TokenId					eParam[ 256 ];
@@ -1575,7 +1606,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eI
 			nSkipEnd = 0;		// letzten Parameter bei Bedarf weglassen
 
 		// Joost-Spezialfaelle
-		else if( eId == ocIf )
+		else if( eId == ocIf || lcl_isInMissArgForZeroList(eId))
 		{
 			sal_uInt16			nNullParam = 0;
 			for( nLauf = 0 ; nLauf < nAnz ; nLauf++ )

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xeescher.cxx Wed Jun 27 13:44:09 2012
@@ -564,6 +564,13 @@ XclExpTbxControlObj::XclExpTbxControlObj
     if( aCtrlProp.GetProperty( aCtrlName, CREATE_OUSTRING( "Name" ) ) && (aCtrlName.getLength() > 0) )
         aPropOpt.AddOpt( ESCHER_Prop_wzName, aCtrlName );
 
+    //Export description as alt text
+	if( SdrObject* pSdrObj = SdrObject::getSdrObjectFromXShape( xShape ) )
+	{
+		String  aAltTxt( pSdrObj->GetDescription(), 0, MSPROP_DESCRIPTION_MAX_LEN );
+		aPropOpt.AddOpt( ESCHER_Prop_wzDescription, aAltTxt );
+	}
+
     // write DFF property set to stream
     aPropOpt.Commit( mrEscherEx.GetStream() );
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xiescher.cxx Wed Jun 27 13:44:09 2012
@@ -110,6 +110,7 @@
 
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
+using ::com::sun::star::uno::makeAny;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::Reference;
@@ -2000,6 +2001,20 @@ void XclImpTbxObjBase::ConvertLabel( Scf
                 aLabel.Insert( '~', nPos );
         }
         rPropSet.SetStringProperty( CREATE_OUSTRING( "Label" ), aLabel );
+
+        //Excel Alt text <==> Aoo description
+		//For TBX control, if user does not operate alt text, alt text will be set label text as default value in Excel.
+		//In this case, DFF_Prop_wzDescription will not be set in excel file. 
+		//So In the end of SvxMSDffManager::ImportShape, description will not be set. But actually in excel,
+		//the alt text is the label value. So here set description as label text first which is called before ImportShape.
+		Reference< ::com::sun::star::beans::XPropertySet > xPropset( mxShape, UNO_QUERY );
+		try{
+		if(xPropset.is())
+			xPropset->setPropertyValue( CREATE_OUSTRING( "Description" ), makeAny(::rtl::OUString(aLabel)) );
+		}catch( ... )
+		{
+			OSL_TRACE( " Can't set a default text for TBX Control ");
+		}
     }
     ConvertFont( rPropSet );
 }

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xlchart.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xlchart.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xlchart.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/excel/xlchart.cxx Wed Jun 27 13:44:09 2012
@@ -937,10 +937,17 @@ void XclChPropSetHelper::ReadMarkerPrope
                     case 1:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_DIAMOND;   break;  // diamond
                     case 2:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_STDDEV;    break;  // arrow down
                     case 3:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_TRIANGLE;  break;  // arrow up
-                    case 4:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_CIRCLE;    break;  // arrow right
+                    case 4:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_DOWJ;      break;  // arrow right, same as import
                     case 5:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_PLUS;      break;  // arrow left
                     case 6:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_CROSS;     break;  // bow tie
                     case 7:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_STAR;      break;  // sand glass
+                    case 8:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_CIRCLE;    break;  // circle new in LibO3.5
+                    case 9:     rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_DIAMOND;   break;  // star new in LibO3.5
+                    case 10:    rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_CROSS;     break;  // X new in LibO3.5
+                    case 11:    rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_PLUS;      break;  // plus new in LibO3.5
+                    case 12:    rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_STAR;      break;  // asterisk new in LibO3.5
+                    case 13:    rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_STDDEV;    break;  // horizontal bar new in LibO3.5
+                    case 14:    rMarkerFmt.mnMarkerType = EXC_CHMARKERFORMAT_STAR;      break;  // vertical bar new in LibO3.5
                     default:    rMarkerFmt.mnMarkerType = XclChartHelper::GetAutoMarkerType( nFormatIdx );
                 }
             break;
@@ -1148,12 +1155,13 @@ void XclChPropSetHelper::WriteMarkerProp
         case EXC_CHMARKERFORMAT_SQUARE:     aApiSymbol.StandardSymbol = 0;              break;  // square
         case EXC_CHMARKERFORMAT_DIAMOND:    aApiSymbol.StandardSymbol = 1;              break;  // diamond
         case EXC_CHMARKERFORMAT_TRIANGLE:   aApiSymbol.StandardSymbol = 3;              break;  // arrow up
-        case EXC_CHMARKERFORMAT_CROSS:      aApiSymbol.StandardSymbol = 6;              break;  // bow tie
-        case EXC_CHMARKERFORMAT_STAR:       aApiSymbol.StandardSymbol = 7;              break;  // sand glass
-        case EXC_CHMARKERFORMAT_DOWJ:       aApiSymbol.StandardSymbol = 4;              break;  // arrow right
-        case EXC_CHMARKERFORMAT_STDDEV:     aApiSymbol.StandardSymbol = 2;              break;  // arrow down
-        case EXC_CHMARKERFORMAT_CIRCLE:     aApiSymbol.StandardSymbol = 4;              break;  // arrow right
-        case EXC_CHMARKERFORMAT_PLUS:       aApiSymbol.StandardSymbol = 5;              break;  // arrow left
+        case EXC_CHMARKERFORMAT_CROSS:      aApiSymbol.StandardSymbol = 10;             break;  // X, legacy bow tie
+        case EXC_CHMARKERFORMAT_STAR:       aApiSymbol.StandardSymbol = 12;             break;  // asterisk, legacy sand glass
+        case EXC_CHMARKERFORMAT_DOWJ:       aApiSymbol.StandardSymbol = 4;              break;  // arrow right, same as export
+        case EXC_CHMARKERFORMAT_STDDEV:     aApiSymbol.StandardSymbol = 13;             break;  // horizontal bar, legacy arrow down
+        case EXC_CHMARKERFORMAT_CIRCLE:     aApiSymbol.StandardSymbol = 8;              break;  // circle, legacy arrow right
+        case EXC_CHMARKERFORMAT_PLUS:       aApiSymbol.StandardSymbol = 11;             break;  // plus, legacy arrow left
+        default: break;
     }
 
     // symbol size

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/ftools.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/ftools.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/ftools.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/ftools.hxx Wed Jun 27 13:44:09 2012
@@ -233,14 +233,14 @@ public:
     /** Returns true, if the object accossiated to the passed key exists. */
     inline bool         has( key_type nKey ) const
                         {
-                            typename map_type::const_iterator aIt = find( nKey );
+                            typename map_type::const_iterator aIt = this->find( nKey );
                             return (aIt != this->end()) && aIt->second.is();
                         }
 
     /** Returns a reference to the object accossiated to the passed key, or 0 on error. */
     inline ref_type     get( key_type nKey ) const
                         {
-                            typename map_type::const_iterator aIt = find( nKey );
+                            typename map_type::const_iterator aIt = this->find( nKey );
                             if( aIt != this->end() ) return aIt->second;
                             return ref_type();
                         }

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/xiescher.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/xiescher.hxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/xiescher.hxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/inc/xiescher.hxx Wed Jun 27 13:44:09 2012
@@ -497,6 +497,8 @@ protected:
 
     /** Derived classes will set additional properties for the current form control. */
     virtual void        DoProcessControl( ScfPropertySet& rPropSet ) const;
+    mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+                        mxShape;        /// The UNO wrapper of the control shape.
 
 private:
     /** Reads a list of cell ranges from a formula at the current stream position. */
@@ -506,8 +508,6 @@ private:
 
 private:
     const XclImpRoot&   mrRoot;         /// Not derived from XclImpRoot to allow multiple inheritance.
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-                        mxShape;        /// The UNO wrapper of the control shape.
     ScfRef< ScAddress > mxCellLink;     /// Linked cell in the Calc document.
     ScfRef< ScRange >   mxSrcRange;     /// Source data range in the Calc document.
     XclCtrlBindMode     meBindMode;     /// Value binding mode.

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/XMLTextPContext.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/XMLTextPContext.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/XMLTextPContext.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/XMLTextPContext.cxx Wed Jun 27 13:44:09 2012
@@ -122,6 +122,7 @@ void ScXMLTextPContext::AddSpaces(sal_In
 	sal_Char* pChars = new sal_Char[nSpaceCount];
 	memset(pChars, ' ', nSpaceCount);
     pContentBuffer->appendAscii(pChars, nSpaceCount);
+	delete[] pChars;
 }
 
 SvXMLImportContext *ScXMLTextPContext::CreateChildContext( sal_uInt16 nTempPrefix,

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlfonte.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlfonte.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlfonte.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlfonte.cxx Wed Jun 27 13:44:09 2012
@@ -45,11 +45,14 @@
 
 class ScXMLFontAutoStylePool_Impl: public XMLFontAutoStylePool
 {
-	void AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const sal_Bool bExportDefaults);
-	public:
+private:
+    // #i120077# remember owned pool
+	SfxItemPool*    mpEditEnginePool;
 
+    void AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const sal_Bool bExportDefaults);
+public:
 	ScXMLFontAutoStylePool_Impl( ScXMLExport& rExport );
-
+	virtual ~ScXMLFontAutoStylePool_Impl();
 };
 
 void ScXMLFontAutoStylePool_Impl::AddFontItems(sal_uInt16* pWhichIds, sal_uInt8 nIdCount, const SfxItemPool* pItemPool, const sal_Bool bExportDefaults)
@@ -83,7 +86,8 @@ void ScXMLFontAutoStylePool_Impl::AddFon
 
 ScXMLFontAutoStylePool_Impl::ScXMLFontAutoStylePool_Impl(
 	ScXMLExport& rExportP ) :
-	XMLFontAutoStylePool( rExportP )
+	XMLFontAutoStylePool( rExportP ),
+    mpEditEnginePool(0)
 {
 	sal_uInt16 aWhichIds[3] = { ATTR_FONT, ATTR_CJK_FONT,
 								ATTR_CTL_FONT };
@@ -96,14 +100,19 @@ ScXMLFontAutoStylePool_Impl::ScXMLFontAu
 	AddFontItems(aWhichIds, 3, pItemPool, sal_True);
 	const SfxItemPool* pEditPool(rExportP.GetDocument()->GetEditPool());
 	AddFontItems(aEditWhichIds, 3, pEditPool, sal_False);
-
-	SfxStyleSheetIterator* pItr(rExportP.GetDocument() ? rExportP.GetDocument()->GetStyleSheetPool()->CreateIterator(SFX_STYLE_FAMILY_PAGE, 0xFFFF) : NULL);
-	if(pItr)
-	{
-		SfxStyleSheetBase* pStyle(pItr->First());
-		SfxItemPool* pPageEditPool(EditEngine::CreatePool());
+    
+    if(rExportP.GetDocument() && rExportP.GetDocument()->GetStyleSheetPool())
+    {
+        // memory leak #i120077#
+        SfxStyleSheetIterator aIter(rExportP.GetDocument()->GetStyleSheetPool(), SFX_STYLE_FAMILY_PAGE, 0xFFFF);
+		SfxStyleSheetBase* pStyle(aIter.First());
+		
+        // #i120077# init pool and use it
+		mpEditEnginePool = EditEngine::CreatePool();  // memory leak #i120077#, to save the SfxItemPool obj into member data for releasing
+		SfxItemPool* pPageEditPool( mpEditEnginePool );
 		EditEngine aEditEngine(pPageEditPool);
-		while (pStyle)
+		
+        while (pStyle)
 		{
 			const SfxItemPool& rPagePool(pStyle->GetPool().GetPool());
 			for (sal_uInt8 j = 0; j < 4; ++j)
@@ -136,11 +145,19 @@ ScXMLFontAutoStylePool_Impl::ScXMLFontAu
 					}
 				}
 			}
-			pStyle = pItr->Next();
+			pStyle = aIter.Next();
 		}
 	}
 }
 
+ScXMLFontAutoStylePool_Impl::~ScXMLFontAutoStylePool_Impl()
+{
+	if(mpEditEnginePool)
+	{
+        // memory leak #i120077#
+		SfxItemPool::Free(mpEditEnginePool);  
+	}
+}
 
 XMLFontAutoStylePool* ScXMLExport::CreateFontAutoStylePool()
 {

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlwrap.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlwrap.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlwrap.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/filter/xml/xmlwrap.cxx Wed Jun 27 13:44:09 2012
@@ -62,7 +62,12 @@
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
+#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
+#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 
+#include <sfx2/DocumentMetadataAccess.hxx>
+#include <comphelper/componentcontext.hxx>
+#include <comphelper/documentconstants.hxx>
 #include <svx/xmleohlp.hxx>
 #include <rtl/logfile.hxx>
 #include <unotools/saveopt.hxx>
@@ -466,9 +471,9 @@ sal_Bool ScXMLImportWrapper::Import(sal_
 	    xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) );
 
 		// TODO/LATER: do not do it for embedded links
+		OUString aName;
 	    if( SFX_CREATE_MODE_EMBEDDED == pObjSh->GetCreateMode() )
 	    {
-            OUString aName;
 			if ( pMedium && pMedium->GetItemSet() )
 			{
 				const SfxStringItem* pDocHierarchItem = static_cast<const SfxStringItem*>(
@@ -495,6 +500,38 @@ sal_Bool ScXMLImportWrapper::Import(sal_
 
     	sal_Bool bOasis = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 );
 
+		if (!bStylesOnly && bOasis)
+		{
+			// RDF metadata: ODF >= 1.2
+			try
+			{
+				::comphelper::ComponentContext aContext( xServiceFactory );
+				const uno::Reference< rdf::XDocumentMetadataAccess > xDMA(
+					xModel, uno::UNO_QUERY_THROW );
+				const uno::Reference< rdf::XURI > xBaseURI(
+					::sfx2::createBaseURI( aContext.getUNOContext(), xStorage, aBaseURL, aName ) );
+				const uno::Reference< task::XInteractionHandler > xHandler(
+					pObjSh->GetMedium()->GetInteractionHandler() );
+				xDMA->loadMetadataFromStorage( xStorage, xBaseURI, xHandler );
+			}
+			catch (lang::WrappedTargetException & e)
+			{
+				ucb::InteractiveAugmentedIOException iaioe;
+				if ( e.TargetException >>= iaioe )
+				{
+					nError = SCERR_IMPORT_UNKNOWN;
+				}
+				else
+				{
+					nError = SCWARN_IMPORT_FEATURES_LOST;
+				}
+			}
+			catch (uno::Exception &)
+			{
+				nError = SCWARN_IMPORT_FEATURES_LOST;
+			}
+		}
+
         // #i103539#: always read meta.xml for generator
 		sal_uInt32 nMetaRetval(0);
         uno::Sequence<uno::Any> aMetaArgs(1);
@@ -917,6 +954,31 @@ sal_Bool ScXMLImportWrapper::Export(sal_
 
         sal_Bool bOasis = ( SotStorage::GetVersion( xStorage ) > SOFFICE_FILEFORMAT_60 );
 
+		// RDF metadata: ODF >= 1.2
+		if ( !bStylesOnly && bOasis )
+		{
+			const uno::Reference< beans::XPropertySet > xPropSet( xStorage, uno::UNO_QUERY_THROW );
+			try
+			{
+				::rtl::OUString aVersion;
+				if (( xPropSet->getPropertyValue(
+					rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Version"))) >>= aVersion )
+					&& !aVersion.equals(ODFVER_010_TEXT)
+					&& !aVersion.equals(ODFVER_011_TEXT) )
+				{
+					const uno::Reference< rdf::XDocumentMetadataAccess > xDMA(
+						xModel, uno::UNO_QUERY_THROW );
+					xDMA->storeMetadataToStorage( xStorage );
+				}
+			}
+			catch (beans::UnknownPropertyException &)
+			{
+			}
+			catch (uno::Exception &)
+			{
+			}
+		}
+		
 		// meta export
 		if (!bStylesOnly && !bMetaRet)
 		{

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.cxx Wed Jun 27 13:44:09 2012
@@ -33,11 +33,14 @@
 #ifndef SC_DPGROUPDLG_HRC
 #include "dpgroupdlg.hrc"
 #endif
-#include <tools/resary.hxx>
+
 #include "scresid.hxx"
 #ifndef SC_SC_HRC
 #include "sc.hrc"
 #endif
+
+#include "globstr.hrc"
+
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 
 // ============================================================================
@@ -56,6 +59,17 @@ static const sal_Int32 spnDateParts[] =
     com::sun::star::sheet::DataPilotFieldGroupBy::YEARS
 };
 
+static const sal_uInt16 nDatePartResIds[] =
+{
+    STR_DPFIELD_GROUP_BY_SECONDS,
+    STR_DPFIELD_GROUP_BY_MINUTES,
+    STR_DPFIELD_GROUP_BY_HOURS,
+    STR_DPFIELD_GROUP_BY_DAYS,
+    STR_DPFIELD_GROUP_BY_MONTHS,
+    STR_DPFIELD_GROUP_BY_QUARTERS,
+    STR_DPFIELD_GROUP_BY_YEARS
+};
+
 } // namespace
 
 // ============================================================================
@@ -236,12 +250,13 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Wind
     maStartHelper   ( maRbAutoStart, maRbManStart, maEdStart, rNullDate ),
     maEndHelper     ( maRbAutoEnd, maRbManEnd, maEdEnd, rNullDate )
 {
+    FreeResource();
+
     maLbUnits.SetHelpId( HID_SC_DPDATEGROUP_LB );
-    ResStringArray aArr( ScResId( STR_UNITS ) );
-    for( sal_uInt16 nIdx = 0, nCount = sal::static_int_cast<sal_uInt16>(aArr.Count()); nIdx < nCount; ++nIdx )
-        maLbUnits.InsertEntry( aArr.GetString( nIdx ) );
 
-    FreeResource();
+    static const size_t nCount = sizeof( nDatePartResIds ) / sizeof( nDatePartResIds[0] );
+    for( size_t nIdx = 0 ; nIdx < nCount; ++nIdx )
+        maLbUnits.InsertEntry( ScGlobal::GetRscString( nDatePartResIds[nIdx] ) );
 
     maEdStart.SetShowDateCentury( sal_True );
     maEdEnd.SetShowDateCentury( sal_True );
@@ -251,7 +266,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Wind
 
     if( nDatePart == 0 )
         nDatePart = com::sun::star::sheet::DataPilotFieldGroupBy::MONTHS;
-    for( sal_uLong nIdx = 0, nCount = maLbUnits.GetEntryCount(); nIdx < nCount; ++nIdx )
+    for( size_t nIdx = 0; nIdx < nCount; ++nIdx )
         maLbUnits.CheckEntryPos( static_cast< sal_uInt16 >( nIdx ), (nDatePart & spnDateParts[ nIdx ]) != 0 );
 
     if( rInfo.DateValues )

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.src (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/dbgui/dpgroupdlg.src Wed Jun 27 13:44:09 2012
@@ -262,19 +262,6 @@ ModalDialog RID_SCDLG_DPDATEGROUP
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
     };
-    StringArray STR_UNITS
-    {
-        ItemList [ en-US ] =
-        {
-            < "Seconds" ; Default ; > ;
-            < "Minutes" ; Default ; > ;
-            < "Hours" ; Default ; > ;
-            < "Days" ; Default ; > ;
-            < "Months" ; Default ; > ;
-            < "Quarters" ; Default ; > ;
-            < "Years" ; Default ; > ;
-        } ;
-    } ;
     Text [ en-US ] = "Grouping" ;
 } ;
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/docshell/impex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/docshell/impex.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/docshell/impex.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/docshell/impex.cxx Wed Jun 27 13:44:09 2012
@@ -843,23 +843,20 @@ sal_Bool ScImportExport::Text2Doc( SvStr
 			while( *p )
 			{
 				aCell.Erase();
-				if( *p == cStr )
+
+				if( *p == cStr )//cStr = " 
 				{
 					p = lcl_ScanString( p, aCell, cStr, DQM_KEEP );
-					while( *p && *p != cSep )
-						p++;
-					if( *p )
-						p++;
-				}
-				else
-				{
-					const sal_Unicode* q = p;
-					while( *p && *p != cSep )
-						p++;
-                    aCell.Assign( q, sal::static_int_cast<xub_StrLen>( p - q ) );
-					if( *p )
-						p++;
 				}
+
+				const sal_Unicode* q = p;
+				while( *p && *p != cSep )// cSep = tab
+					p++;
+                
+                aCell.Append( q, sal::static_int_cast<xub_StrLen>( p - q ) );
+                
+				if( *p )
+					p++;
 				if (ValidCol(nCol) && ValidRow(nRow) )
 				{
 					if( bSingle )

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/globstr.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/globstr.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/globstr.src (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/globstr.src Wed Jun 27 13:44:09 2012
@@ -1734,5 +1734,33 @@ Resource RID_GLOBSTR
 	{
 		Text [ en-US ] = "Pivot table needs at least two rows of data to create or refresh." ;
 	};
+    String  STR_DPFIELD_GROUP_BY_SECONDS
+    {
+        Text [ en-US ] = "Seconds" ;
+    };
+    String  STR_DPFIELD_GROUP_BY_MINUTES
+    {
+        Text [ en-US ] = "Minutes" ;
+    };
+    String  STR_DPFIELD_GROUP_BY_HOURS
+    {
+        Text [ en-US ] = "Hours" ;
+    };
+    String  STR_DPFIELD_GROUP_BY_DAYS
+    {
+        Text [ en-US ] = "Days" ;
+    };
+    String  STR_DPFIELD_GROUP_BY_MONTHS
+    {
+        Text [ en-US ] = "Months" ;
+    };
+    String  STR_DPFIELD_GROUP_BY_QUARTERS
+    {
+        Text [ en-US ] = "Quarters" ;
+    };
+    String  STR_DPFIELD_GROUP_BY_YEARS
+    {
+        Text [ en-US ] = "Years" ;
+    };
 };
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/scerrors.src
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/scerrors.src?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/scerrors.src (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/src/scerrors.src Wed Jun 27 13:44:09 2012
@@ -162,5 +162,9 @@ Resource RID_ERRHDLSC
 	{
 		Text [ en-US ] = "Format error discovered in the file in sub-document $(ARG1) at $(ARG2)(row,col).";
 	};
+    String SCWARN_IMPORT_FEATURES_LOST & ERRCODE_RES_MASK
+    {
+        Text [ en-US] = "Not all attributes could be read." ;
+    };
 };
 

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/dbfunc3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/dbfunc3.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/dbfunc3.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/dbfunc3.cxx Wed Jun 27 13:44:09 2012
@@ -614,6 +614,11 @@ bool ScDBFunc::MakePivotTable( const ScD
 
 		SCTAB nNewTab = nSrcTab+1;
 
+		const bool bDrawUndo = ( bUndo && !pDoc->IsDrawRecording() );
+
+		if( bDrawUndo )
+			pDoc->BeginDrawUndo();
+
 		SCTAB i=1;
 		while ( !pDoc->InsertTab( nNewTab, lcl_MakePivotTabName( aName, i ) ) && i <= MAXTAB )
 			i++;
@@ -629,6 +634,9 @@ bool ScDBFunc::MakePivotTable( const ScD
 		SetTabNo( nNewTab, sal_True );
 
 		aDestRange = ScRange( 0, 0, nNewTab );
+
+		if( bDrawUndo )
+			pDoc->EndDrawUndo();
 	}
 
 	ScDPObject* pDPObj = pDoc->GetDPAtCursor(

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin.cxx Wed Jun 27 13:44:09 2012
@@ -881,6 +881,8 @@ void ScGridWindow::DoAutoFilterMenue( SC
 	long nSizeY  = 0;
 	long nHeight = 0;
 	pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
+	// The button height should not use the merged cell height, should still use single row height
+	nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
 	Point aPos = pViewData->GetScrPos( nCol, nRow, eWhich );
 	if ( bLayoutRTL )
 		aPos.X() -= nSizeX;
@@ -1673,12 +1675,23 @@ void ScGridWindow::HandleMouseButtonDown
 
     if ( !bDouble && !bFormulaMode && rMEvt.IsLeft() )
 	{
+		SCsCOL nRealPosX;
+		SCsROW nRealPosY;
+		pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nRealPosX, nRealPosY, false );//the real row/col
+		ScMergeFlagAttr* pRealPosAttr = (ScMergeFlagAttr*)
+									pDoc->GetAttr( nRealPosX, nRealPosY, nTab, ATTR_MERGE_FLAG );
 		ScMergeFlagAttr* pAttr = (ScMergeFlagAttr*)
 									pDoc->GetAttr( nPosX, nPosY, nTab, ATTR_MERGE_FLAG );
-		if (pAttr->HasAutoFilter())
+		if( pRealPosAttr->HasAutoFilter() )
+		{
+			SC_MOD()->InputEnterHandler();	
+			if (DoAutoFilterButton( nRealPosX, nRealPosY, rMEvt))
+                return;
+		}
+		if( pAttr->HasAutoFilter() )
 		{
 			SC_MOD()->InputEnterHandler();	//Add for i85305
-			if (DoAutoFilterButton(nPosX, nPosY, rMEvt))
+			if (DoAutoFilterButton( nPosX, nPosY, rMEvt))
                 return;
 		}
 		if (pAttr->HasButton())

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin2.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin2.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin2.cxx Wed Jun 27 13:44:09 2012
@@ -137,6 +137,8 @@ bool ScGridWindow::DoAutoFilterButton( S
 
     long nSizeX, nSizeY;
     pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
+    // The button height should not use the merged cell height, should still use single row height
+    nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
     Size aScrSize(nSizeX-1, nSizeY-1);
 
     // Check if the mouse cursor is clicking on the popup arrow box.

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin4.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin4.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin4.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/gridwin4.cxx Wed Jun 27 13:44:09 2012
@@ -1226,7 +1226,9 @@ void ScGridWindow::DrawButtons( SCCOL nX
 			for (nCol=nX1; nCol<=nX2; nCol++)
 			{
 				CellInfo* pInfo = &pThisRowInfo->pCellInfo[nCol+1];
-				if ( pInfo->bAutoFilter && !pInfo->bHOverlapped && !pInfo->bVOverlapped )
+				//if several columns merged on a row, there should be only one auto button at the end of the columns.
+				//if several rows merged on a column, the button may be in the middle, so "!pInfo->bVOverlapped" should not be used
+				if ( pInfo->bAutoFilter && !pInfo->bHOverlapped )
 				{
 					if (!pQueryParam)
 						pQueryParam = new ScQueryParam;
@@ -1278,7 +1280,13 @@ void ScGridWindow::DrawButtons( SCCOL nX
                     bool bArrowState = bSimpleQuery && bColumnFound;
 					long	nSizeX;
 					long	nSizeY;
-					pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY );
+					SCCOL nStartCol= nCol;
+					SCROW nStartRow = nRow;
+					//if address(nCol,nRow) is not the start pos of the merge area, the value of the nSizeX will be incorrect, it will be the length of the cell.
+					//should first get the start pos of the merge area, then get the nSizeX through the start pos.
+					pDoc->ExtendOverlapped(nStartCol, nStartRow,nCol, nRow, nTab);//get nStartCol,nStartRow
+					pViewData->GetMergeSizePixel( nStartCol, nStartRow, nSizeX, nSizeY );//get nSizeX 
+					nSizeY = pViewData->ToPixel(pDoc->GetRowHeight(nRow, nTab), pViewData->GetPPTY());
 					Point aScrPos = pViewData->GetScrPos( nCol, nRow, eWhich );
 
                     aCellBtn.setBoundingBox(aScrPos, Size(nSizeX-1, nSizeY-1), bLayoutRTL);

Modified: incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewdata.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewdata.cxx?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewdata.cxx (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/source/ui/view/viewdata.cxx Wed Jun 27 13:44:09 2012
@@ -2585,6 +2585,9 @@ void ScViewData::ReadExtOptions( const S
                     double nFactor = pDocShell->GetOutputFactor();
                     aPixel.X() = (long)( aPixel.X() * nFactor + 0.5 );
                 }
+                
+                bHSplit = bHSplit && aPixel.X() > 0;
+                bVSplit = bVSplit && aPixel.Y() > 0;
                 if( bHSplit )
                 {
                     rViewTab.eHSplitMode = SC_SPLIT_NORMAL;

Modified: incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/statusbar/statusbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/statusbar/statusbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/statusbar/statusbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/statusbar/statusbar.xml Wed Jun 27 13:44:09 2012
@@ -21,13 +21,13 @@
  * 
  ***********************************************************-->
 <statusbar:statusbar xmlns:statusbar="http://openoffice.org/2001/statusbar" xmlns:xlink="http://www.w3.org/1999/xlink">
- <statusbar:statusbaritem xlink:href=".uno:StatusDocPos" statusbar:align="left" statusbar:autosize="true" statusbar:width="58" statusbar:helpid="helpid:26114"/>
- <statusbar:statusbaritem xlink:href=".uno:StatusPageStyle" statusbar:align="left" statusbar:autosize="true" statusbar:width="83" statusbar:helpid="helpid:26115"/>
- <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="41" statusbar:helpid="helpid:10221"/>
- <statusbar:statusbaritem xlink:href=".uno:StatusSelectionMode" statusbar:align="center" statusbar:width="34" statusbar:helpid="helpid:26116"/>
- <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="18" statusbar:helpid="helpid:5584"/>
- <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16" statusbar:helpid="helpid:5699"/>
- <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="212" statusbar:helpid="helpid:10224"/>
- <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="140" statusbar:helpid="helpid:11065"/>
- <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35" statusbar:helpid="helpid:10000"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatusDocPos" statusbar:align="left" statusbar:autosize="true" statusbar:width="58"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatusPageStyle" statusbar:align="left" statusbar:autosize="true" statusbar:width="83"/>
+ <statusbar:statusbaritem xlink:href=".uno:InsertMode" statusbar:align="center" statusbar:width="41"/>
+ <statusbar:statusbaritem xlink:href=".uno:StatusSelectionMode" statusbar:align="center" statusbar:width="34"/>
+ <statusbar:statusbaritem xlink:href=".uno:ModifiedStatus" statusbar:align="center" statusbar:width="18"/>
+ <statusbar:statusbaritem xlink:href=".uno:Signature" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="16"/>
+ <statusbar:statusbaritem xlink:href=".uno:Size" statusbar:align="center" statusbar:autosize="true" statusbar:ownerdraw="true" statusbar:width="212"/>
+ <statusbar:statusbaritem xlink:href=".uno:ZoomSlider" statusbar:align="center" statusbar:ownerdraw="true" statusbar:width="140"/>
+ <statusbar:statusbaritem xlink:href=".uno:Zoom" statusbar:align="center" statusbar:width="35"/>
 </statusbar:statusbar>

Modified: incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/alignmentbar.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/alignmentbar.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/alignmentbar.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/alignmentbar.xml Wed Jun 27 13:44:09 2012
@@ -23,11 +23,11 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:helpid="helpid:10131" />
- <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:helpid="helpid:10132" />
- <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:helpid="helpid:10133" />
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:helpid="helpid:10134" />
- <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:helpid="helpid:10135" />
- <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:helpid="helpid:10136" />
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/arrowshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/arrowshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/arrowshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/arrowshapes.xml Wed Jun 27 13:44:09 2012
@@ -23,34 +23,34 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow" toolbar:helpid="helpid:11004" />
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-down-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.corner-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.striped-right-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron" toolbar:helpid="helpid:11004" />
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.notched-right-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.pentagon-right"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.chevron"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-arrow-callout"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.left-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-down-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.up-right-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.quad-arrow-callout"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.circular-arrow"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow" toolbar:helpid="helpid:11004" /> 
- <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow" toolbar:helpid="helpid:11004" /> 
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.split-round-arrow"/>
+ <toolbar:toolbaritem xlink:href=".uno:ArrowShapes.s-sharped-arrow"/>
 </toolbar:toolbar>
\ No newline at end of file

Modified: incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/basicshapes.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/basicshapes.xml?rev=1354497&r1=1354496&r2=1354497&view=diff
==============================================================================
--- incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/basicshapes.xml (original)
+++ incubator/ooo/branches/alg/aw080/main/sc/uiconfig/scalc/toolbar/basicshapes.xml Wed Jun 27 13:44:09 2012
@@ -23,29 +23,29 @@
 
 
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-rectangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.quadrat"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.round-quadrat"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ellipse"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram" toolbar:helpid="helpid:11002" />
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.circle-pie"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.isosceles-triangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.right-triangle"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.trapezoid"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.diamond"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.parallelogram"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon" toolbar:helpid="helpid:11002" />
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc" toolbar:helpid="helpid:11002" /> 
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.pentagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.hexagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.octagon"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cross"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.ring"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.block-arc"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper" toolbar:helpid="helpid:11002" /> 
- <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame" toolbar:helpid="helpid:11002" /> 
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.can"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.cube"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.paper"/>
+ <toolbar:toolbaritem xlink:href=".uno:BasicShapes.frame"/>
 </toolbar:toolbar>
\ No newline at end of file



Mime
View raw message