[ooo-build-commit] Branch 'ooo/OOO310' - 3 commits - drawinglayer/source formula/inc formula/source sysui/desktop
Jan Holesovsky
kendy at kemper.freedesktop.org
Tue Jun 9 17:52:45 PDT 2009
drawinglayer/source/processor2d/vclprocessor2d.cxx | 6 ++++++
formula/inc/formula/FormulaCompiler.hxx | 3 +++
formula/source/ui/dlg/formula.cxx | 5 ++++-
sysui/desktop/solaris/makefile.mk | 4 +++-
sysui/desktop/solaris/pkginfo | 3 +++
5 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit b93c60c3735fa0c998f22d67477c566958a6ae13
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 9 07:12:06 2009 +0000
CWS-TOOLING: integrate CWS ooo31osol
2009-05-14 15:49:09 +0200 ihi r271896 : #i101913# added missing solaris entries
2009-05-14 12:36:19 +0200 ihi r271885 : #i101913# ARCH -> all
2009-05-13 11:14:52 +0200 jl r271846 : #i101457# Do not search for Java every time OOo starts
2009-05-13 08:49:28 +0200 jl r271838 : #tr6585548# Redone last change. On Solaris we do not scan the directories anymore and instead just ckeck /usr/jdk/latest
2009-05-12 17:10:03 +0200 jl r271828 : #i64357# We scan on Unix only for a java in different folders if we haven't found one by looking into JAVA_HOME or PATH
2009-05-12 13:17:04 +0200 releng r271819 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
2009-05-12 13:08:28 +0200 is r271816 : #i101457# avoiding usage of faspac with switch DONTCOMPRESS
diff --git a/sysui/desktop/solaris/makefile.mk b/sysui/desktop/solaris/makefile.mk
index 9a2c606..32dc11b 100644
--- a/sysui/desktop/solaris/makefile.mk
+++ b/sysui/desktop/solaris/makefile.mk
@@ -49,7 +49,7 @@ TARGET=solaris
PKGFILES = $(BIN)$/pkg$/{$(PRODUCTLIST)}-desktop-integration.tar.gz
PKGDATESTRING = $(shell @date -u +%Y.%m.%d)
-PKGARCH=sparc,i386
+PKGARCH=all
FASPAC=`test -f $(SOLARBINDIR)/faspac-so.sh && echo "/sbin/sh" || echo "echo"`
@@ -125,7 +125,9 @@ $(PKGFILES) : $(MISC)$/{$(PRODUCTLIST)}$/prototype
@-$(RM) $(BIN)$/$(@:f)
@$(MKDIRHIER) $(@:d)
pkgmk -l 1073741824 -r . -f $(MISC)$/$(@:b:b:s/-/ /:1)$/prototype -o -d $(PKGDIR) ARCH=$(PKGARCH) VERSION=$(PKGVERSION.$(@:b:s/-/ /:1)),REV=$(PKGREV).$(PKGDATESTRING)
+.IF "$(DONTCOMPRESS)"==""
$(FASPAC) $(SOLARBINDIR)/faspac-so.sh -a -d $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
+.ENDIF # "$(DONTCOMPRESS)"==""
@tar -cf - -C $(PKGDIR) $(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int | gzip > $@
@rm -rf $(PKGDIR)/$(@:b:b:s/-/ /:1:s/.//)$(PRODUCTVERSIONSHORT)-desktop-int
diff --git a/sysui/desktop/solaris/pkginfo b/sysui/desktop/solaris/pkginfo
index 8fbf60e..4f7f42d 100644
--- a/sysui/desktop/solaris/pkginfo
+++ b/sysui/desktop/solaris/pkginfo
@@ -11,3 +11,6 @@ SUNW_PKGVERS=1.0
CLASSES=none build
OFFICE_PATH=
LEGACY_GNOME="false"
+DESC=Desktop integration for %PRODUCTNAME
+SUNW_PRODNAME=%PRODUCTNAME
+SUNW_PRODVERS=3
commit 38941660cbaf179b5e447bbf8d8e2a4b487ede4d
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 9 06:27:41 2009 +0000
CWS-TOOLING: integrate CWS ooo311gsl01
2009-05-12 11:26:05 +0200 hdu r271803 : #i99842# set text decoration overline color
2009-05-12 09:07:02 +0200 hdu r271796 : #i99842# set text decoration color (backport from CWS vcl101)
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 3fcbc60..8407968 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -220,6 +220,12 @@ namespace drawinglayer
if( pTCPP != NULL )
{
+ // set the color of text decorations
+ const basegfx::BColor aTextlineColor = maBColorModifierStack.getModifiedColor(pTCPP->getTextlineColor());
+ mpOutputDevice->SetTextLineColor( Color(aTextlineColor) );
+ const basegfx::BColor aOverlineColor = maBColorModifierStack.getModifiedColor(pTCPP->getOverlineColor());
+ mpOutputDevice->SetOverlineColor( Color(aOverlineColor) );
+
// set Overline attribute
FontUnderline eFontOverline = mapTextLineStyle( pTCPP->getFontOverline() );
if( eFontOverline != UNDERLINE_NONE )
commit 7620aaa03c66a5f96acfb63b2a89e823083cba03
Author: Oliver Bolte <obo at openoffice.org>
Date: Tue Jun 9 06:07:51 2009 +0000
CWS-TOOLING: integrate CWS calc311fixes
2009-05-26 16:43:50 +0200 nn r272311 : patch flags
2009-05-26 15:20:08 +0200 nn r272306 : CWS-TOOLING: rebase CWS calc311fixes to branches/OOO310 at 272261 (milestone: OOO310:m12)
2009-05-26 13:39:20 +0200 nn r272298 : #i101960# UpdateExternalRefLinks: set document modified
2009-05-20 20:02:01 +0200 dr r272148 : #i102056# drag and drop of note cells loses cell contents
2009-05-19 17:37:04 +0200 nn r272091 : #i101273# #i101304# #i101319# copied from CWS calclinkfixes
2009-05-13 18:46:19 +0200 nn r271869 : #i101690# copied from CWS calc50
2009-05-13 17:45:18 +0200 nn r271867 : #i101869# DeleteRange: before broadcasting, check if EndListening removed the note cells
2009-05-11 18:44:54 +0200 nn r271784 : #i101725# don't copy hash_set with pointers from the other collection
2009-05-11 18:39:33 +0200 nn r271782 : #i101512# copied from CWS calc50
2009-05-11 18:39:22 +0200 nn r271781 : #i101512# copied from CWS calc50
diff --git a/formula/inc/formula/FormulaCompiler.hxx b/formula/inc/formula/FormulaCompiler.hxx
index 9aa65ba..4be65ad 100644
--- a/formula/inc/formula/FormulaCompiler.hxx
+++ b/formula/inc/formula/FormulaCompiler.hxx
@@ -219,6 +219,9 @@ public:
*/
OpCode GetEnglishOpCode( const String& rName ) const;
+ void SetCompileForFAP( BOOL bVal )
+ { bCompileForFAP = bVal; bIgnoreErrors = bVal; }
+
static BOOL DeQuote( String& rStr );
static const String& GetNativeSymbol( OpCode eOp );
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 35e16e5..ecd0563 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -675,8 +675,10 @@ void FormulaDlg_Impl::MakeTree(IStructHelper* _pTree,SvLBoxEntry* pParent,Formul
long nParas = _pToken->GetParamCount();
OpCode eOp = _pToken->GetOpCode();
+ // #i101512# for output, the original token is needed
+ FormulaToken* pOrigToken = (_pToken->GetType() == svFAP) ? _pToken->GetFAPOrigToken() : _pToken;
uno::Sequence<sheet::FormulaToken> aArgs(1);
- aArgs[0] = m_aTokenMap.find(_pToken)->second;
+ aArgs[0] = m_aTokenMap.find(pOrigToken)->second;
try
{
const String aResult = m_pHelper->getFormulaParser()->printFormula(aArgs);
@@ -766,6 +768,7 @@ void FormulaDlg_Impl::UpdateTokenArray( const String& rStrExp)
} // if ( pTokens && nLen == m_aTokenList.getLength() )
FormulaCompiler aCompiler(*m_pTokenArray.get());
+ aCompiler.SetCompileForFAP(TRUE); // #i101512# special handling is needed
aCompiler.CompileTokenArray();
}
More information about the ooo-build-commit
mailing list