[Libreoffice-commits] .: set_soenv.in
set_soenv.in | 96 ++-
1 file changed, 43 insertions(+), 53 deletions(-)
New commits:
commit ddb68b2eadf7c2aeea1625be734829541f3fe4af
Author: Norbert Thiebaud
Date: Thu Nov 10 00:34:33 2011 -0600
MacOSX doesn't support X based build anymore, stop pretending in set_soenv
diff --git a/set_soenv.in b/set_soenv.in
index e7e62ff..6ccb3c9 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -684,43 +684,49 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
}
}
elsif ( $platform =~ m/darwin/ )
-{ $COM= "GCC";
- $COMPATH= '@COMPATH@';
- if ($platform =~ m/^arm/)
- {
- print "Setting values for iOS... ";
- $oldoutfile = "iOSEnv.Set.sh";
- $CPU= "R";
- $CPUNAME= "ARM";
- $OUTPATH= "unxiosr";
- $GUI= "UNX";
- $OS = "IOS";
- $GUIBASE= "cocoatouch";
- }
- elsif ($platform =~ m/^powerpc/)
- {
- print "Setting values for Mac OS X/Darwin on PowerPC... ";
- $oldoutfile = "MacOSXPPCEnv.Set.sh";
- $CPU= "P";
- $CPUNAME= "POWERPC";
- $OUTPATH= "unxmacxp";
- $OS = "MACOSX";
- $GUI= "UNX";
- }
- else
- {
- print "Setting values for Mac OS X/Darwin on default x86... ";
- $oldoutfile = "MacOSXX86Env.Set.sh";
- $CPU= "I";
- $CPUNAME= "INTEL";
- $OUTPATH= "unxmacxi";
- $OS = "MACOSX";
- $GUI= "UNX";
- }
- $GVER = "VCL";
- $INPATH = $OUTPATH.$PROEXT;
- $PATH_SEPERATOR = $ps;
- # GUIBASE is set below for Mac OS X; may be "aqua" or "unx".
+{
+$COM= "GCC";
+$COMPATH= '@COMPATH@';
+if ($platform =~ m/^arm/)
+{
+print "Setting values for iOS... ";
+$oldoutfile = "iOSEnv.Set.sh";
+$CPU= "R";
+$CPUNAME= "ARM";
+$OUTPATH= "unxiosr";
+$GUI= "UNX";
+$OS = "IOS";
+$GUIBASE= "cocoatouch";
+}
+elsif ($platform =~ m/^powerpc/)
+{
+print "Setting values for Mac OS X/Darwin on PowerPC... ";
+$oldoutfile = "MacOSXPPCEnv.Set.sh";
+$CPU= "P";
+$CPUNAME= "POWERPC";
+$OUTPATH= "unxmacxp";
+$OS = "MACOSX";
+$GUI= "UNX";
+$GUIBASE= "aqua";
+$MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
+$FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
+}
+else
+{
+print "Setting values for Mac OS X/Darwin on default x86... ";
+$oldoutfile = "MacOSXX86Env.Set.sh";
+$CPU= "I";
+$CPUNAME= "INTEL";
+$OUTPATH= "unxmacxi";
+$OS = "MACOSX";
+$GUI= "UNX";
+$GUIBASE= "aqua";
+$MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
+$FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
+}
+$GVER = "VCL";
+$INPATH = $OUTPATH.$PROEXT;
+$PATH_SEPERATOR = $ps;
}
elsif ( $platform =~ m/dragonfly/ )
{
@@ -906,22 +912,6 @@ $PERL_PATH= dirname('@PERL@'); # Perl Path
$XLIB = PathFormat('@XLIB@'); # X11 libraries
$XINC = PathFormat('@XINC@'); # X11 includes
-
-# Mac OS X/Darwin only variables.
-if ( $platform =~ m/darwin/ && $platform !~ m/^arm/)
-{
-$MACOSX_SDK_PATH='@MACOSX_SDK_PATH@';
-$FRAMEWORKSHOME = $MACOSX_SDK_PATH."/System/Library/Frameworks";
-if ( $XLIB eq "no_x_libraries" )
-{
-$GUIBASE = "aqua";
-}
-else
-{
-$GUIBASE = "unx";
-}
-}
-
# The project's workstamp.
$WORK_STAMP= "@SOURCEVERSION@";
# Location of the source.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/inc sc/source svl/source
sc/inc/rangenam.hxx | 12 ++--
sc/source/core/tool/rangenam.cxx |6 +++---
sc/source/ui/docshell/docfunc.cxx |2 +-
svl/source/numbers/zformat.cxx|6 +-
4 files changed, 15 insertions(+), 11 deletions(-)
New commits:
commit 832c18da69aa944dffae8f7d7a351f352a94cfcf
Author: Markus Mohrhard
Date: Thu Nov 10 05:18:58 2011 +0100
change the code a bit to make it a bit more clear
this should do nearly the same as the old code
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index d9d71d5..214d89f 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -2252,9 +2252,13 @@ bool SvNumberformat::GetOutputString(double fNumber,
{
if (rScan.GetStandardPrec() ==
SvNumberFormatter::UNLIMITED_PRECISION)
{
-bool bSign = ::rtl::math::isSignBitSet(fNumber) && fNumber
!= 0.0;
+bool bSign = ::rtl::math::isSignBitSet(fNumber);
if (bSign)
+{
+if (!(fNumber < 0.0))
+bSign = false;
fNumber = -fNumber;
+}
ImpGetOutputStdToPrecision(fNumber, OutString, 10); // Use
10 decimals for general 'unlimited' format.
if (fNumber < EXP_LOWER_BOUND)
{
commit 1833e05aebcdbb277a7945efc34230dc3138c610
Author: Laurent Godard
Date: Wed Nov 9 15:33:32 2011 +0100
ScRangeData aName to OUString
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index ab2ed6a..32d31ff 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -72,7 +72,7 @@ class ScTokenArray;
class ScRangeData
{
private:
-String aName;
+rtl::OUString aName;
rtl::OUString aUpperName; // #i62977# for faster searching (aName is
never modified after ctor)
ScTokenArray* pCode;
ScAddress aPos;
@@ -95,18 +95,18 @@ public:
typedef ::std::map IndexMap;
SC_DLLPUBLICScRangeData( ScDocument* pDoc,
- const String& rName,
+ const rtl::OUString& rName,
const String& rSymbol,
const ScAddress& rAdr = ScAddress(),
RangeType nType = RT_NAME,
const formula::FormulaGrammar::Grammar
eGrammar = formula::FormulaGrammar::GRAM_DEFAULT );
SC_DLLPUBLICScRangeData( ScDocument* pDoc,
- const String& rName,
+ const rtl::OUString& rName,
const ScTokenArray& rArr,
const ScAddress& rAdr = ScAddress(),
RangeType nType = RT_NAME );
SC_DLLPUBLICScRangeData( ScDocument* pDoc,
- const String& rName,
+ const rtl::OUString& rName,
const ScAddress& rTarget );
// rTarget is ABSPOS jump label
ScRangeData(const ScRangeData& rScRangeData, ScDocument*
pDocument = NULL);
@@ -115,8 +115,8 @@ public:
booloperator== (const ScRangeData& rData) const;
-voidGetName( String& rName ) const { rName = aName; }
-const String& GetName( void ) const { return aName; }
+voidGetName( rtl::OUString& rName ) const { rName = aName; }
+const rtl::OUString& GetName( void ) const { return aName; }
const rtl::OUString& GetUpperName( void ) const { return
aUpperName; }
ScAddress GetPos() const { return aPos; }
// The index has to be unique. If index=0 a new index value is assigned.
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index d3ded0c..6984984 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -64,7 +64,7 @@ ScRangeData::ScRangeData( sal_uInt16 n )
{}
ScRangeData::ScRangeData( ScDocument* pDok,
- const String& rName,
+ const rtl::OUString& rName,
const String& rSymbol,
const ScAddress& rAddress,
RangeType nType,
@@ -96,7 +96,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
}
ScRangeData::ScRangeData( ScDocument* pDok,
- const String& rName,
+ const rtl::OUString& rName,
const ScTokenArray& rArr,
const ScAddress& rAddress,
RangeType nType ) :
@@ -127,7 +127,7 @@ ScRangeData::ScRangeData( ScDocument* pDok,
}
ScRangeData::ScRangeData(
[Libreoffice-commits] .: 3 commits - icu/makefile.mk icu/prj redland/prj redland/raptor redland/rasqal redland/redland store/prj
icu/makefile.mk |7 +++ icu/prj/d.lst |6 ++ redland/prj/d.lst |3 +++ redland/raptor/makefile.mk |3 +++ redland/rasqal/makefile.mk |3 +++ redland/redland/makefile.mk |2 ++ store/prj/d.lst |1 + 7 files changed, 25 insertions(+) New commits: commit 4db5ea1ed7de742723dcf197434a5e22204d7dc9 Author: Tor Lillqvist Date: Thu Nov 10 02:10:59 2011 +0200 Deliver libstore.so for Android diff --git a/store/prj/d.lst b/store/prj/d.lst index e6bc5fd..edda6e9 100644 --- a/store/prj/d.lst +++ b/store/prj/d.lst @@ -6,6 +6,7 @@ mkdir: %_DEST%\inc\store ..\%__SRC%\lib\istore.lib %_DEST%\lib\istore.lib ..\%__SRC%\lib\libstore.*.* %_DEST%\lib\* +..\%__SRC%\lib\libstore.so %_DEST%\lib\libstore.so ..\%__SRC%\lib\libstore.a %_DEST%\lib\libstore.a ..\%__SRC%\bin\sto*.dll %_DEST%\bin\sto*.dll commit 0013537709f1b79d0ca16863033bbecae23114ab Author: Tor Lillqvist Date: Thu Nov 10 02:08:25 2011 +0200 Deliver shared library file names ending in .so for Android diff --git a/redland/prj/d.lst b/redland/prj/d.lst index 20bae4d..5715417 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -2,14 +2,17 @@ mkdir: %_DEST%\inc\external ..\%__SRC%\inc\*.h %_DEST%\inc\external\*.h ..\%__SRC%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so.1 symlink: %_DEST%\lib\libraptor.so.1 %_DEST%\lib\libraptor.so +..\%__SRC%\lib\libraptor.so %_DEST%\lib\libraptor.so ..\%__SRC%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.1.dylib symlink: %_DEST%\lib\libraptor.1.dylib %_DEST%\lib\libraptor.dylib ..\%__SRC%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so.1 symlink: %_DEST%\lib\librasqal.so.1 %_DEST%\lib\librasqal.so +..\%__SRC%\lib\librasqal.so %_DEST%\lib\librasqal.so ..\%__SRC%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.1.dylib symlink: %_DEST%\lib\librasqal.1.dylib %_DEST%\lib\librasqal.dylib ..\%__SRC%\lib\librdf.so.0 %_DEST%\lib\librdf.so.0 symlink: %_DEST%\lib\librdf.so.0 %_DEST%\lib\librdf.so +..\%__SRC%\lib\librdf.so %_DEST%\lib\librdf.so ..\%__SRC%\lib\librdf.0.dylib %_DEST%\lib\librdf.0.dylib symlink: %_DEST%\lib\librdf.0.dylib %_DEST%\lib\librdf.dylib ..\%__SRC%\lib\*.lib %_DEST%\lib diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 6ddeef1..be863e7 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -172,6 +172,9 @@ OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="IOS" OUT2LIB+=src$/.libs$/libraptor.a OUT2BIN+=src/raptor-config +.ELIF "$(OS)"=="ANDROID" +OUT2LIB+=src$/.libs$/libraptor.so +OUT2BIN+=src/raptor-config .ELIF "$(OS)"=="AIX" OUT2LIB+=src$/.libs$/libraptor.so.$(RAPTOR_MAJOR) src$/.libs$/libraptor.so OUT2BIN+=src/raptor-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index dbad2d2..71bee48 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -147,6 +147,9 @@ OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="IOS" OUT2LIB+=src$/.libs$/librasqal.a OUT2BIN+=src/rasqal-config +.ELIF "$(OS)"=="ANDROID" +OUT2LIB+=src$/.libs$/librasqal.so +OUT2BIN+=src/rasqal-config .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=src$/.libs$/*.a diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index ea67d09..6113531 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -152,6 +152,8 @@ OUT2INC+=librdf$/*.h OUT2LIB+=librdf$/.libs$/librdf.$(REDLAND_MAJOR).dylib .ELIF "$(OS)"=="IOS" OUT2LIB+=librdf$/.libs$/librdf.a +.ELIF "$(OS)"=="ANDROID" +OUT2LIB+=librdf$/.libs$/librdf.so .ELIF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" OUT2LIB+=librdf$/.libs$/*.a commit e0183772e5821fcf05023eb5d510732a879c2869 Author: Tor Lillqvist Date: Thu Nov 10 01:46:19 2011 +0200 Deliver just shared library file names ending in .so for Android diff --git a/icu/makefile.mk b/icu/makefile.mk index c1b7a0b..4db60c0 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -152,6 +152,13 @@ OUT2LIB= \ $(BUILD_DIR)$/lib$/libicui18n.a \ $(BUILD_DIR)$/lib$/libicule.a \ $(BUILD_DIR)$/lib$/libicutu.a +.ELIF "$(OS)"=="ANDROID" +OUT2LIB= \ +$(BUILD_DIR)$/lib$/libicudata.so \ +$(BUILD_DIR)$/lib$/libicuuc.so \ +$(BUILD_DIR)$/lib$/libicui18n.so \ +$(BUILD_DIR)$/lib$/libicule.so \ +$(BUILD_DIR)$/lib$/libicutu.so .ELSE OUT2LIB= \ $(BUILD_DIR)$/lib$/libicudata$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR).$(ICU_MICRO) \ diff --git a/icu/prj/d.lst b/icu/prj/d.lst index 859a504..3ae4de0 100644 --- a/icu/prj/d.lst +++ b/icu/prj/d.lst @@ -25,6 +25,12 @@ mkdir: %_DEST%\inc\external\unicode ..\%__SRC%\lib\libicuuc.*.*.* %_DEST%\lib\ ..\%__SRC%\lib\libicutu.*.*.* %_DEST%\lib\ +..\%__SRC%\lib\libicudata.so%_DEST%\lib\ +..\%__SRC%\lib\libicui18n.so%_DEST%\lib\ +..\%__SRC%\lib\libicule.so %_DEST%\lib\ +..\%__SRC%\lib\libicuuc.so %_DEST%\lib\ +..\%__SRC%\lib\libicutu.so %_DEST%\lib\ + ..\%__SRC%\lib\libicudata.a %_DEST%\lib\ ..\%__SRC%\lib\libicui18n.a %_DEST%\lib\
[Libreoffice-commits] .: 7 commits - cppunit/android.patch cppunit/makefile.mk cppunit/prj curl/curl-android.patch curl/makefile.mk libxml2/libxml2-android.patch libxml2/makefile.mk libxml2/prj libxsl
README.cross | 14 +++--- cppunit/android.patch |1 - cppunit/makefile.mk |8 +++- cppunit/prj/d.lst |3 +++ curl/curl-android.patch | 15 +++ curl/makefile.mk |5 + libxml2/libxml2-android.patch | 15 +++ libxml2/makefile.mk |4 libxml2/prj/d.lst |1 + libxslt/libxslt-android.patch | 15 +++ libxslt/makefile.mk |4 libxslt/prj/d.lst |2 ++ sal/prj/d.lst |1 + solenv/inc/_tg_shl.mk | 40 solenv/inc/tg_shl.mk |4 ++-- solenv/inc/unx.mk |2 +- 16 files changed, 102 insertions(+), 32 deletions(-) New commits: commit 12fea3754acabadb5f6e267497cbc9ab9e3da274 Author: Tor Lillqvist Date: Thu Nov 10 01:22:03 2011 +0200 Make also the libxslt library file names end in .so for Android diff --git a/libxslt/libxslt-android.patch b/libxslt/libxslt-android.patch new file mode 100644 index 000..68069d6 --- /dev/null +++ b/libxslt/libxslt-android.patch @@ -0,0 +1,15 @@ +--- misc/libxslt-1.1.26/ltmain.sh misc/build/libxslt-1.1.26/ltmain.sh +@@ -3228,6 +3228,12 @@ + func_warning "\`-release' is ignored for convenience libraries" + else + ++ # Force no versioning suffix for Android thanks to silly ++ # apkbuilder which doesn't add extra native libs unless their ++ # name ends with .so ++ ++ version_type=none ++ + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk index f884c35..2bec8bd 100644 --- a/libxslt/makefile.mk +++ b/libxslt/makefile.mk @@ -59,6 +59,10 @@ PATCH_FILES=libxslt-configure.patch \ libxslt-aix.patch \ libxslt-vc10.patch +.IF "$(OS)"=="ANDROID" +PATCH_FILES+= libxslt-android.patch +.ENDIF + # This is only for UNX environment now .IF "$(OS)"=="WNT" .IF "$(COM)"=="GCC" diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst index 74f759e..0627cc1 100644 --- a/libxslt/prj/d.lst +++ b/libxslt/prj/d.lst @@ -2,8 +2,10 @@ mkdir: %_DEST%\inc\external\libxslt ..\%__SRC%\inc\*.h %_DEST%\inc\external\libxslt\*.h ..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so.1 symlink: %_DEST%\lib\libxslt.so.1 %_DEST%\lib\libxslt.so +..\%__SRC%\lib\libxslt.so %_DEST%\lib\libxslt.so ..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so.0 symlink: %_DEST%\lib\libexslt.so.0 %_DEST%\lib\libexslt.so +..\%__SRC%\lib\libexslt.so %_DEST%\lib\libexslt.so ..\%__SRC%\lib\libxslt*.* %_DEST%\lib\libxslt*.* ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib\*.a ..\%__SRC%\bin\lib*.dll %_DEST%\bin commit 90324ccc737805cd5adc3da0e1b078847cfa998d Author: Tor Lillqvist Date: Thu Nov 10 01:17:25 2011 +0200 Make also the libxml2 library file name end in .so for Android diff --git a/libxml2/libxml2-android.patch b/libxml2/libxml2-android.patch new file mode 100644 index 000..cbc9ff4 --- /dev/null +++ b/libxml2/libxml2-android.patch @@ -0,0 +1,15 @@ +--- misc/libxml2-2.7.6/ltmain.sh misc/build/libxml2-2.7.6/ltmain.sh +@@ -3228,6 +3228,12 @@ + func_warning "\`-release' is ignored for convenience libraries" + else + ++ # Force no versioning suffix for Android thanks to silly ++ # apkbuilder which doesn't add extra native libs unless their ++ # name ends with .so ++ ++ version_type=none ++ + # Parse the version information argument. + save_ifs="$IFS"; IFS=':' + set dummy $vinfo 0 0 0 diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 098d30b..1d125c1 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -63,6 +63,10 @@ PATCH_FILES+= libxml2-mingw.patch .ENDIF .ENDIF +.IF "$(OS)"=="ANDROID" +PATCH_FILES+= libxml2-android.patch +.ENDIF + # This is only for UNX environment now .IF "$(OS)"=="WNT" diff --git a/libxml2/prj/d.lst b/libxml2/prj/d.lst index e28c52e..6e7bbb4 100644 --- a/libxml2/prj/d.lst +++ b/libxml2/prj/d.lst @@ -2,6 +2,7 @@ mkdir: %_DEST%\inc\external\libxml ..\%__SRC%\inc\libxml\*.h %_DEST%\inc\external\libxml\*.h ..\%__SRC%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so.2 symlink: %_DEST%\lib\libxml2.so.2 %_DEST%\lib\libxml2.so +..\%__SRC%\lib\libxml2.so %_DEST%\lib\libxml2.so ..\%__SRC%\lib\*.lib %_DEST%\lib ..\%__SRC%\lib\libxml2.dll.a %_DEST%\lib\libxml2.dll.a ..\%__SRC%\lib\libxml2.a %_DEST%\lib\libxml2.a commit f52415847cd253af7e8b768ea945daeed8b6 Author: Tor Lillqvist Date: Thu Nov 10 01:10:19 2011 +0200 Make also the libcurl library end in .so for Android diff --git a/curl/curl-android.patch b/curl/curl-android.patch new file mode 100644 index 000..130c88d --- /dev/null +++ b/curl/curl-android.patch @@ -0,0 +1,15 @@ +--- misc/curl-7.19.7/ltmain.sh misc/build/curl-7.19.7/ltmain.sh +@@ -3228,6 +3228,12 @@ + func_warning "\
[Libreoffice-commits] .: readlicense_oo/docs
readlicense_oo/docs/readme/readme.xrm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 05a28af29272c73f7789f7c7548a44fa34aa3116
Author: Andras Timar
Date: Wed Nov 9 23:57:07 2011 +0100
JRE is _not_ part of LibreOffice install packages
diff --git a/readlicense_oo/docs/readme/readme.xrm
b/readlicense_oo/docs/readme/readme.xrm
index 8bcf7ca..71e6214 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -29,7 +29,7 @@
Notes on
Installation
- ${PRODUCTNAME} requires a recent version of JAVA for full
functionality which is part of the ${PRODUCTNAME} installation package.
+ ${PRODUCTNAME} requires a recent version of Java Runtime
Environment (JRE) for full functionality. JRE is not part of the ${PRODUCTNAME}
installation package, it should be installed separately.
System
Requirements
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sc/qa
sc/qa/unit/ucalc.cxx | 576 ---
1 file changed, 362 insertions(+), 214 deletions(-)
New commits:
commit 0f6bb1763f73481cd18681983af676ba02f36276
Author: Kohei Yoshida
Date: Wed Nov 9 17:35:09 2011 -0500
Added text values to the mix.
Textural evaluations throw an UNO exception, however. I need to look
into this.
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 8186be5..497dd35 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -527,33 +527,46 @@ struct NumStrCheck {
const char* pRes;
};
+struct StrStrCheck {
+const char* pVal;
+const char* pRes;
+};
+
template
-void runTestMATCH(ScDocument* pDoc, const char* aData[_DataSize], NumStrCheck
aChecks[_FormulaSize])
+void runTestMATCH(ScDocument* pDoc, const char* aData[_DataSize], StrStrCheck
aChecks[_FormulaSize])
{
-for (size_t i = 0; i < _DataSize; ++i)
+size_t nDataSize = _DataSize;
+for (size_t i = 0; i < nDataSize; ++i)
pDoc->SetString(0, i, 0, rtl::OUString::createFromAscii(aData[i]));
for (size_t i = 0; i < _FormulaSize; ++i)
{
+pDoc->SetString(1, i, 0,
rtl::OUString::createFromAscii(aChecks[i].pVal));
+
rtl::OUStringBuffer aBuf;
-aBuf.appendAscii("=MATCH(");
-aBuf.append(aChecks[i].fVal);
-aBuf.appendAscii(";A1:A9;");
+aBuf.appendAscii("=MATCH(B");
+aBuf.append(static_cast(i+1));
+aBuf.appendAscii(";A1:A");
+aBuf.append(static_cast(nDataSize));
+aBuf.appendAscii(";");
aBuf.append(static_cast(_Type));
aBuf.appendAscii(")");
-pDoc->SetString(1, i, 0, aBuf.makeStringAndClear());
+rtl::OUString aFormula = aBuf.makeStringAndClear();
+pDoc->SetString(2, i, 0, aFormula);
}
pDoc->CalcAll();
+printRange(pDoc, ScRange(0, 0, 0, 2, _FormulaSize-1, 0), "MATCH");
// verify the results.
for (size_t i = 0; i < _FormulaSize; ++i)
{
rtl::OUString aStr;
-pDoc->GetString(1, i, 0, aStr);
+pDoc->GetString(2, i, 0, aStr);
if (!aStr.equalsAscii(aChecks[i].pRes))
{
-cerr << "row " << (i+1) << ": expected='" << aChecks[i].pRes << "'
actual='" << aStr << "'" << endl;
+cerr << "row " << (i+1) << ": expected='" << aChecks[i].pRes << "'
actual='" << aStr << "'"
+<< " criterion='" << aChecks[i].pVal << "'" << endl;
CPPUNIT_ASSERT_MESSAGE("Unexpected result for MATCH", false);
}
}
@@ -561,6 +574,7 @@ void runTestMATCH(ScDocument* pDoc, const char*
aData[_DataSize], NumStrCheck aC
void testFuncMATCH(ScDocument* pDoc)
{
+clearRange(pDoc, ScRange(0, 0, 0, 4, 40, 0));
{
// Ascending in-exact match
@@ -574,23 +588,29 @@ void testFuncMATCH(ScDocument* pDoc)
"6",
"7",
"8",
-"9"
+"9",
+"A",
+"B",
+"C",
};
// formula (B1:C12)
-NumStrCheck aChecks[] = {
-{ 0.8, "#N/A" },
-{ 1.2, "1" },
-{ 2.3, "2" },
-{ 3.9, "3" },
-{ 4.1, "4" },
-{ 5.99, "5" },
-{ 6.1, "6" },
-{ 7.2, "7" },
-{ 8.569,"8" },
-{ 9.59, "9" },
-{ 10, "9" },
-{ 100, "9" }
+StrStrCheck aChecks[] = {
+{ "0.8", "#N/A" },
+{ "1.2", "1" },
+{ "2.3", "2" },
+{ "3.9", "3" },
+{ "4.1", "4" },
+{ "5.99", "5" },
+{ "6.1", "6" },
+{ "7.2", "7" },
+{ "8.569","8" },
+{ "9.59", "9" },
+{ "10", "9" },
+{ "100", "9" },
+// { "Andy","10" },
+// { "Bruce", "11" },
+// { "Charlie", "12" }
};
runTestMATCH(pDoc,
aData, aChecks);
@@ -601,6 +621,9 @@ void testFuncMATCH(ScDocument* pDoc)
// data range (A1:A9)
const char* aData[] = {
+"C",
+"B",
+"A",
"9",
"8",
"7",
@@ -613,19 +636,22 @@ void testFuncMATCH(ScDocument* pDoc)
};
// formula (B1:C12)
-NumStrCheck aChecks[] = {
-{ 10, "#N/A" },
-{ 8.9,"1" },
-{ 7.8,"2" },
-{ 6.7,"3" },
-{ 5.5,"4" },
-{ 4.6,"5" },
-{ 3.3,"6" },
-{ 2.2,"7" },
-{ 1.1,"8" },
-{ 0.8,"9" },
-{ 0,"9" },
-{ -2,"9" }
+StrStrCheck aChecks[] = {
+{ "10", "#N/A" },
+{ "8.9", "4" },
+{ "7.8", "5" },
+{ "6.7", "6" },
+{ "5.5", "7"
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 3f9df85defed04730fda2c862810b505579fb958 Author: Christina Rossmanith Date: Wed Nov 9 16:59:47 2011 + _SVSTDARR_sal_uIt16S is a typo and doesn't do anything diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 83695cf..bdf1bbd 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -36,9 +36,6 @@ #include #include -#define _SVSTDARR_sal_uIt16S -#include - #include #include #include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source svl/inc svl/source sw/source unusedcode.easy
sc/source/filter/html/htmlexp.cxx | 35 +++---
sc/source/filter/inc/htmlexp.hxx |5 +---
svl/inc/svl/svstdarr.hxx |5
svl/source/memtools/svarray.cxx|1
sw/source/filter/writer/writer.cxx | 38 ++---
unusedcode.easy|5
6 files changed, 29 insertions(+), 60 deletions(-)
New commits:
commit ff9fab243bb8f746077dbbc2d7d3a76616647839
Author: Daisuke Nishino
Date: Wed Nov 9 22:16:38 2011 +0900
Removed SvStringsSortDtor
diff --git a/sc/source/filter/html/htmlexp.cxx
b/sc/source/filter/html/htmlexp.cxx
index 8510edf..25f967b 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -243,8 +243,6 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String&
rBaseURL, ScDocument
aBaseURL( rBaseURL ),
aStreamPath( rStreamPathP ),
pAppWin( Application::GetDefaultDevice() ),
-pSrcArr( NULL ),
-pDestArr( NULL ),
nUsedTables( 0 ),
nIndent( 0 ),
bAll( bAllP ),
@@ -294,8 +292,6 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String&
rBaseURL, ScDocument
ScHTMLExport::~ScHTMLExport()
{
aGraphList.clear();
-delete pSrcArr;
-delete pDestArr;
}
@@ -1313,31 +1309,30 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( String&
rFileNm,
INET_PROT_FTP <= aTargetUrl.GetProtocol() &&
INET_PROT_NEWS >= aTargetUrl.GetProtocol()) ) )
{
-if( pSrcArr )
+if( pFileNameMap )
{
// wurde die Datei schon verschoben
-sal_uInt16 nPos;
-if( pSrcArr->Seek_Entry( &rFileNm, &nPos ))
+std::map::iterator it = pFileNameMap->find(
rFileNm );
+if( it != pFileNameMap->end() )
{
-rFileNm = *(*pDestArr)[ nPos ];
+rFileNm = it->second;
return sal_True;
}
}
else
{
-pSrcArr = new SvStringsSortDtor( 4, 4 );
-pDestArr = new SvStringsSortDtor( 4, 4 );
+pFileNameMap.reset( new std::map() );
}
-String* pSrc = new String( rFileNm );
SvFileStream aTmp( aFileUrl.PathToFileName(), STREAM_READ );
-String* pDest = new String( aTargetUrl.GetPartBeforeLastName() );
-*pDest += String(aFileUrl.GetName());
+String aSrc = rFileNm;
+String aDest = aTargetUrl.GetPartBeforeLastName();
+aDest += String(aFileUrl.GetName());
if( bFileToFile )
{
-INetURLObject aCpyURL( *pDest );
+INetURLObject aCpyURL( aDest );
SvFileStream aCpy( aCpyURL.PathToFileName(), STREAM_WRITE );
aCpy << aTmp;
@@ -1346,7 +1341,7 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( String&
rFileNm,
}
else
{
-SfxMedium aMedium( *pDest, STREAM_WRITE | STREAM_SHARE_DENYNONE,
+SfxMedium aMedium( aDest, STREAM_WRITE | STREAM_SHARE_DENYNONE,
false );
{
@@ -1363,14 +1358,8 @@ sal_Bool ScHTMLExport::CopyLocalFileToINet( String&
rFileNm,
if( bRet )
{
-pSrcArr->Insert( pSrc );
-pDestArr->Insert( pDest );
-rFileNm = *pDest;
-}
-else
-{
-delete pSrc;
-delete pDest;
+pFileNameMap->insert( std::make_pair( aSrc, aDest ) );
+rFileNm = aDest;
}
}
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 286997e..ecf90b4 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -34,6 +34,7 @@
#include
#include
#include
+#include
#include "expbase.hxx"
@@ -45,7 +46,6 @@ class Graphic;
class SdrObject;
class OutputDevice;
class ScDrawLayer;
-class SvStringsSortDtor;
class ScEditCell;
namespace editeng { class SvxBorderLine; }
@@ -109,8 +109,7 @@ class ScHTMLExport : public ScExportBase
String aStreamPath;
String aCId; // Content-Id fuer Mail-Export
OutputDevice* pAppWin;// fuer Pixelei
-SvStringsSortDtor* pSrcArr;// fuer CopyLocalFileToINet
-SvStringsSortDtor* pDestArr;
+boost::scoped_ptr< std::map > pFileNameMap;//
fuer CopyLocalFileToINet
String aNonConvertibleChars; // collect nonconvertible
characters
rtl_TextEncodingeDestEnc;
SCTAB nUsedTables;
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 3d3cc80..79c95c1 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -57,11 +57,6 @@ SV_DECL_PTRARR_DEL_VISIBILITY( SvStringsDtor, StringPtr, 1,
1, SVL_DLLPUBLIC )
#define _SVSTDARR_STRINGSDTOR_DECL
#endif
-#ifndef _SVSTDARR_STRINGSSORTDTOR_DECL
-SV_DECL_PTRARR_SORT_DEL_VISIBILITY( SvSt
[Libreoffice-commits] .: cui/source sfx2/inc sw/source
cui/source/tabpages/border.cxx | 11 ---
cui/source/tabpages/swpossizetabpage.cxx |5 -
sfx2/inc/sfx2/htmlmode.hxx |1 -
sw/source/ui/config/viewopt.cxx |4 ++--
sw/source/ui/frmdlg/frmpage.cxx |7 ---
sw/source/ui/frmdlg/wrap.cxx | 21 -
6 files changed, 2 insertions(+), 47 deletions(-)
New commits:
commit 090454c4c99498a79d87c55e1903132bd068d810
Author: Harri Pitkänen
Date: Tue Nov 8 19:36:21 2011 +0200
Enable features behind HTMLMODE_FULL_ABS_POS for all HTML export modes
HTMLMODE_FULL_ABS_POS appears to have been used for enabling accurate
margin settings for absolutely positioned graphics objects. If it was
disabled one could not set (in HTML editor mode) separate margins for
left and right (or bottom/top) sides of the image. The setting was
disabled for Netscape and enabled for other browsers.
This patch removes the setting and unconditionally enables the feature
in HTML editor mode. All modern browsers support
margin-{left,right,bottom,top} CSS properties.
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 98d62e9..d6c474f 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -559,17 +559,6 @@ void SvxBorderTabPage::Reset( const SfxItemSet& rSet )
aLbShadowColor.Disable();
aFlShadow .Disable();
-sal_uInt16 nLBCount = aLbLineStyle.GetEntryCount();
-// ist es ein Absatzdialog, dann alle Linien fuer
-// Sw-Export, sonst ist die Page nicht da
-if(!(mbHorEnabled || mbVerEnabled)
- && 0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS) &&
-SFX_ITEM_AVAILABLE > rSet.GetItemState(GetWhich(
SID_ATTR_PARA_LINESPACE )))
-{
-for( sal_uInt16 i = nLBCount - 1; i > LINESTYLE_HTML_MAX; --i)
-aLbLineStyle.RemoveEntry(i);
-}
-
if( !(nSWMode & SW_BORDER_MODE_TABLE) )
{
aUserDefFT.Disable();
diff --git a/cui/source/tabpages/swpossizetabpage.cxx
b/cui/source/tabpages/swpossizetabpage.cxx
index 2d08ded..7874eaa 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -895,11 +895,6 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet)
if(m_bHtmlMode)
{
-if( 0 == (m_nHtmlMode & HTMLMODE_FULL_ABS_POS))
-{
-m_aHeightFT .Enable( sal_False );
-m_aHeightMF .Enable( sal_False );
-}
if( 0 == (m_nHtmlMode & HTMLMODE_SOME_ABS_POS))
{
if(GetAnchorType() == TextContentAnchorType_AT_PAGE)
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index ce1af6f..65e41f6 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -37,7 +37,6 @@
#define HTMLMODE_PARA_BLOCK 0x0100
#define HTMLMODE_DROPCAPS 0x0200
#define HTMLMODE_FIRSTLINE 0x0400 /* First-line intent with Spacer ==
NS 3.0 */
-#define HTMLMODE_FULL_ABS_POS 0x1000
#define HTMLMODE_SOME_ABS_POS 0x2000
#define HTMLMODE_RESERVED1 0x4000
#define HTMLMODE_RESERVED0 0x8000
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index a34679c..32093ab 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -340,7 +340,7 @@ sal_uInt16 GetHtmlMode(const SwDocShell* pShell)
{
case HTML_CFG_MSIE:
nRet |= HTMLMODE_FULL_STYLES|
-HTMLMODE_FULL_ABS_POS|HTMLMODE_SOME_ABS_POS;
+HTMLMODE_SOME_ABS_POS;
break;
case HTML_CFG_NS40:
nRet |= HTMLMODE_FRM_COLUMNS|
@@ -349,7 +349,7 @@ sal_uInt16 GetHtmlMode(const SwDocShell* pShell)
case HTML_CFG_WRITER:
nRet |= HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES|
HTMLMODE_DROPCAPS|
-HTMLMODE_FULL_ABS_POS|HTMLMODE_SOME_ABS_POS;
+HTMLMODE_SOME_ABS_POS;
break;
}
}
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index b321d49..744ab01 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -908,13 +908,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet )
if(bHtmlMode)
{
-if(nDlgType == DLG_FRM_STD &&
-0 == (nHtmlMode & HTMLMODE_FULL_ABS_POS))
-{
-aHeightFT .Enable( sal_False );
-aHeightED .Enable( sal_False );
-aRelHeightCB.Enable( sal_False );
-}
if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS))
{
if (GetAnchor() == FLY_AT_PAGE)
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 75b99eb
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/ui/view/output.cxx | 62 ++-
1 file changed, 33 insertions(+), 29 deletions(-)
New commits:
commit 02b368e392c2d0f925601aff792910c628de5476
Author: Kohei Yoshida
Date: Wed Nov 9 10:12:12 2011 -0500
Reduced scoping.
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 2fe53a0..f78b956 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1751,34 +1751,38 @@ void ScOutputData::FindChanged()
for (nX=nX1; nX<=nX2; nX++)
{
ScBaseCell* pCell = pThisRowInfo->pCellInfo[nX+1].pCell;
-if (pCell)
-if (pCell->GetCellType() == CELLTYPE_FORMULA)
+if (!pCell)
+continue;
+
+if (pCell->GetCellType() != CELLTYPE_FORMULA)
+continue;
+
+ScFormulaCell* pFCell = (ScFormulaCell*)pCell;
+if ( !bProgress && pFCell->GetDirty() )
+{
+ScProgress::CreateInterpretProgress(pDoc, true);
+bProgress = true;
+}
+if (pFCell->IsRunning())
+// still being interpreted. Skip it.
+continue;
+
+(void)pFCell->GetValue();
+if (!pFCell->IsChanged())
+// the result hasn't changed. Skip it.
+continue;
+
+pThisRowInfo->bChanged = true;
+if ( pThisRowInfo->pCellInfo[nX+1].bMerged )
+{
+SCSIZE nOverY = nArrY + 1;
+while ( nOverYGetDirty() )
-{
-ScProgress::CreateInterpretProgress(pDoc, true);
-bProgress = true;
-}
-if (!pFCell->IsRunning())
-{
-(void)pFCell->GetValue();
-if (pFCell->IsChanged())
-{
-pThisRowInfo->bChanged = true;
-if ( pThisRowInfo->pCellInfo[nX+1].bMerged )
-{
-SCSIZE nOverY = nArrY + 1;
-while ( nOverY
Date: Wed Nov 9 10:06:55 2011 -0500
sal_Bool to bool.
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index 35fbedc..2fe53a0 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -1739,12 +1739,12 @@ void ScOutputData::FindChanged()
SCCOL nX;
SCSIZE nArrY;
-sal_Bool bWasIdleDisabled = pDoc->IsIdleDisabled();
-pDoc->DisableIdle( sal_True );
+bool bWasIdleDisabled = pDoc->IsIdleDisabled();
+pDoc->DisableIdle(true);
for (nArrY=0; nArrYGetDirty() )
{
-ScProgress::CreateInterpretProgress( pDoc, sal_True );
-bProgress = sal_True;
+ScProgress::CreateInterpretProgress(pDoc, true);
+bProgress = true;
}
if (!pFCell->IsRunning())
{
(void)pFCell->GetValue();
if (pFCell->IsChanged())
{
-pThisRowInfo->bChanged = sal_True;
+pThisRowInfo->bChanged = true;
if ( pThisRowInfo->pCellInfo[nX+1].bMerged )
{
SCSIZE nOverY = nArrY + 1;
while ( nOverYhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |9 +
1 file changed, 9 insertions(+)
New commits:
commit 02c6f5c74b346f1e3a095d99a36ece6b603bc26b
Author: Noel Power
Date: Wed Nov 9 14:36:28 2011 +
fix rtf image import ( causing wrong image sometimes displayed ) fdo#42640
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 50664df..96c0add 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -44,6 +44,8 @@
#include
#include
#include
+#include
+#include
#include // NS_sprm namespace
#include // NS_rtf namespace
@@ -590,6 +592,13 @@ int RTFDocumentImpl::resolvePict(bool bInline)
if (m_xModelFactory.is())
xShape.set(m_xModelFactory->createInstance(aService), uno::UNO_QUERY);
uno::Reference xPropertySet(xShape, uno::UNO_QUERY);
+uno::Reference xDrawSupplier( m_xDstDoc,
uno::UNO_QUERY);
+if ( xDrawSupplier.is() )
+{
+uno::Reference< drawing::XShapes > xShapes(
xDrawSupplier->getDrawPage(), uno::UNO_QUERY );
+if ( xShapes.is() )
+xShapes->add( xShape );
+}
if (m_bObject)
{
// Set bitmap
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/ure.scp | 57
1 file changed, 57 deletions(-)
New commits:
commit de56b0f22d774bb44419560376ba8029bb4cc661
Author: Stephan Bergmann
Date: Wed Nov 9 14:46:30 2011 +0100
Removed unused URE version ini file.
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 6b30619..50298ab 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -1165,63 +1165,6 @@ Module gid_Module_Root_Ure_Hidden
gid_Unixlink_File_Dl_Libxml2);
End
-// Profile version.ini
-
-Profile gid_Profile_Version_Ini_Ure
-ModuleID = gid_Module_Root_Ure_Hidden;
-Name = PROFILENAME(version);
-Dir = gid_Dir_Ure_Bin;
-Styles = ();
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Buildid
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = "Version";
-Key = "buildid";
-Value = "";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productsource
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = "Version";
-Key = "ProductSource";
-Value = "";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productmajor
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = "Version";
-Key = "ProductMajor";
-Value = "";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productminor
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = "Version";
-Key = "ProductMinor";
-Value = "";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Productbuildid
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = "Version";
-Key = "ProductBuildid";
-Value = "";
-End
-
-ProfileItem gid_Ure_Profileitem_Version_Ooobaseversion
-ProfileID = gid_Profile_Version_Ini_Ure;
-ModuleID = gid_Module_Root_Ure_Hidden;
-Section = "Version";
-Key = "OOOBaseVersion";
-Value = "${OOOBASEVERSION}";
-End
-
// Windows Registry:
RegistryItem gid_Regitem_Path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/unx
desktop/unx/source/args.c | 33 ++---
desktop/unx/source/args.h |1 -
desktop/unx/source/start.c |7 ---
3 files changed, 14 insertions(+), 27 deletions(-)
New commits:
commit 5d4af26ae9bfa6f747bfd8a56067b783228033fd
Author: Stephan Bergmann
Date: Wed Nov 9 13:48:21 2011 +0100
Revert "oosplash - daemonize to help mutt users recover their sanity"
For one, it leaves detached oosplash processes behind (the forked oosplash
instance waits for the soffice.bin child forked from the original oosplash
instance in vain). For another, it makes unavailable the soffice.bin exit
code.
This reverts commits aacf55dbe004ae3cad720002d40dc0e408107fd3 and
62ebb119cfb42adc5e007fb77f68d56b40de2a85.
diff --git a/desktop/unx/source/args.c b/desktop/unx/source/args.c
index c889e6c..367bac2 100644
--- a/desktop/unx/source/args.c
+++ b/desktop/unx/source/args.c
@@ -48,33 +48,29 @@ static struct {
unsigned int bInhibitSplash : 1;
unsigned int bInhibitPagein : 1;
unsigned int bInhibitJavaLdx : 1;
-unsigned int bInhibitDemon : 1;
const char *pPageinType;
} pArgDescr[] = {
/* have a trailing argument */
-{ "pt", 1, 0, 0, 0, 0, NULL },
-{ "display",1, 0, 0, 0, 0, NULL },
+{ "pt", 1, 0, 0, 0, NULL },
+{ "display",1, 0, 0, 0, NULL },
/* no splash */
-{ "nologo", 0, 1, 0, 0, 0, NULL },
-{ "headless", 0, 1, 0, 0, 0, NULL },
-{ "invisible", 0, 1, 0, 0, 0, NULL },
-{ "minimized", 0, 1, 0, 0, 0, NULL },
+{ "nologo", 0, 1, 0, 0, NULL },
+{ "headless", 0, 1, 0, 0, NULL },
+{ "invisible", 0, 1, 0, 0, NULL },
+{ "minimized", 0, 1, 0, 0, NULL },
/* pagein bits */
-{ "writer", 0, 0, 0, 0, 0, "pagein-writer" },
-{ "calc", 0, 0, 0, 0, 0, "pagein-calc"},
-{ "draw", 0, 0, 0, 0, 0, "pagein-draw"},
-{ "impress",0, 0, 0, 0, 0, "pagein-impress" },
+{ "writer", 0, 0, 0, 0, "pagein-writer" },
+{ "calc", 0, 0, 0, 0, "pagein-calc"},
+{ "draw", 0, 0, 0, 0, "pagein-draw"},
+{ "impress",0, 0, 0, 0, "pagein-impress" },
/* nothing much */
-{ "version",0, 1, 1, 1, 0, NULL },
-{ "help", 0, 1, 1, 1, 0, NULL },
-{ "h", 0, 1, 1, 1, 0, NULL },
-{ "?", 0, 1, 1, 1, 0, NULL },
-
-/* UNO remote controlled process */
-{ "accept", 0, 0, 0, 0, 1, NULL },
+{ "version",0, 1, 1, 1, NULL },
+{ "help", 0, 1, 1, 1, NULL },
+{ "h", 0, 1, 1, 1, NULL },
+{ "?", 0, 1, 1, 1, NULL },
};
Args *args_parse (void)
@@ -135,7 +131,6 @@ Args *args_parse (void)
args->bInhibitSplash |= pArgDescr[j].bInhibitSplash;
args->bInhibitPagein |= pArgDescr[j].bInhibitPagein;
args->bInhibitJavaLdx |= pArgDescr[j].bInhibitJavaLdx;
-args->bInhibitDemon |= pArgDescr[j].bInhibitDemon;
if (pArgDescr[j].pPageinType)
args->pPageinType = pArgDescr[j].pPageinType;
}
diff --git a/desktop/unx/source/args.h b/desktop/unx/source/args.h
index 0f1f114..4a0cb55 100644
--- a/desktop/unx/source/args.h
+++ b/desktop/unx/source/args.h
@@ -38,7 +38,6 @@ typedef struct {
sal_Bool bInhibitSplash; // should we show a splash screen
sal_Bool bInhibitPagein; // should we run pagein ?
sal_Bool bInhibitJavaLdx; // should we run javaldx ?
- sal_Bool bInhibitDemon; // we want to match the lifecycle of
soffice.bin
sal_uInt32 nArgsEnv;// number of -env: style args
sal_uInt32 nArgsTotal; // number of -env: as well as -writer style
args
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index b30efdc..940a997 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -882,13 +882,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
splash_destroy(splash);
splash = NULL;
bShortWait = sal_False;
-
-if (!args->bInhibitDemon)
-{
-/* Since a client can't distinguish between a
first-start and
- a factory re-use, we return control to them here. */
-daemon( 1 /* don't chdir */, 1 /* don't re-direct
output */ );
-}
}
#if OSL_DEBUG_LEVEL > 1
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - desktop/inc desktop/source desktop/test instsetoo_native/util scp2/source
desktop/inc/deployment.hrc|6
desktop/source/deployment/inc/dp_dependencies.hxx | 25 +--
desktop/source/deployment/misc/dp_dependencies.cxx| 139 +-
desktop/source/deployment/misc/dp_misc.src| 10 -
desktop/test/deployment/dependencies/maxversion33.oxt |binary
desktop/test/deployment/dependencies/maxversion34.oxt |binary
desktop/test/deployment/dependencies/maxversion35.oxt |binary
desktop/test/deployment/dependencies/maxversion36.oxt |binary
desktop/test/deployment/dependencies/version34.oxt|binary
desktop/test/deployment/dependencies/version35.oxt|binary
instsetoo_native/util/openoffice.lst |1
scp2/source/ooo/common_brand.scp |8 +
12 files changed, 97 insertions(+), 92 deletions(-)
New commits:
commit 4bfde371a893a3d6902c995d62a167e5c81ab0a2
Author: Stephan Bergmann
Date: Wed Nov 9 13:31:13 2011 +0100
OOo reference version for extension dependencies is still at 3.4.
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx
b/desktop/source/deployment/misc/dp_dependencies.cxx
index b168317..f2a997f 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -63,7 +63,7 @@ bool versionIsNot(dp_misc::Order order, rtl::OUString const &
version) {
rtl::OUString oooVersion(
RTL_CONSTASCII_USTRINGPARAM(
"${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
-":Version:OOOPackageVersion}"));
+":Version:ReferenceOOoMajorMinor}"));
rtl::Bootstrap::expandMacros(oooVersion); //TODO: check for failure
return dp_misc::compareVersions(oooVersion, version) != order;
}
diff --git a/desktop/test/deployment/dependencies/maxversion33.oxt
b/desktop/test/deployment/dependencies/maxversion33.oxt
new file mode 100644
index 000..fe0998c
Binary files /dev/null and
b/desktop/test/deployment/dependencies/maxversion33.oxt differ
diff --git a/desktop/test/deployment/dependencies/maxversion34.oxt
b/desktop/test/deployment/dependencies/maxversion34.oxt
new file mode 100644
index 000..0a284b3
Binary files /dev/null and
b/desktop/test/deployment/dependencies/maxversion34.oxt differ
diff --git a/desktop/test/deployment/dependencies/maxversion35.oxt
b/desktop/test/deployment/dependencies/maxversion35.oxt
new file mode 100644
index 000..e95b97c
Binary files /dev/null and
b/desktop/test/deployment/dependencies/maxversion35.oxt differ
diff --git a/desktop/test/deployment/dependencies/maxversion36.oxt
b/desktop/test/deployment/dependencies/maxversion36.oxt
new file mode 100644
index 000..786ed4c
Binary files /dev/null and
b/desktop/test/deployment/dependencies/maxversion36.oxt differ
diff --git a/desktop/test/deployment/dependencies/version34.oxt
b/desktop/test/deployment/dependencies/version34.oxt
new file mode 100644
index 000..ee2a82d
Binary files /dev/null and b/desktop/test/deployment/dependencies/version34.oxt
differ
diff --git a/desktop/test/deployment/dependencies/version35.oxt
b/desktop/test/deployment/dependencies/version35.oxt
new file mode 100644
index 000..6e99cf1
Binary files /dev/null and b/desktop/test/deployment/dependencies/version35.oxt
differ
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 1371634..b8e2ef7 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -8,6 +8,7 @@ Globals
OOOPACKAGEVERSION 3.5.0
UREPACKAGEVERSION 3.5.0
URELAYERVERSION 1
+REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
SERVICETAG_PRODUCTNAME LibreOffice 3.5
SERVICETAG_PRODUCTVERSION 3.5
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 794359c..71135b2 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1099,6 +1099,14 @@ ProfileItem
gid_Brand_Profileitem_Version_Extensionupdateurl
Value =
"http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";;
End
+ProfileItem gid_Brand_Profileitem_Version_ReferenceOOoMajorMinor
+ProfileID = gid_Brand_Profile_Version_Ini;
+ModuleID = gid_Module_Root_Brand;
+Section = "Version";
+Key = "ReferenceOOoMajorMinor";
+Value = "${REFERENCEOOOMAJORMINOR}";
+End
+
ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
commit debc96051f15652bc8d1b8aa5406f7760c5feed7
Author: Stephan Bergmann
Date: Wed Nov 9 12:20:28 2011 +0100
OpenOffice.org-minimal-version dependency is not branded.
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx
b/desktop/source/deployment/misc/dp_dependencies.cxx
index d0cd231..b168317 100644
--- a/de
[Libreoffice-commits] .: extensions/source
extensions/source/nsplugin/source/npshell.cxx | 19 --
extensions/source/nsplugin/source/npshell.hxx |4 +--
extensions/source/plugin/inc/plugin/unx/plugcon.hxx | 21
extensions/source/plugin/unx/npnapi.cxx |6 ++---
extensions/source/plugin/unx/nppapi.cxx |2 -
5 files changed, 6 insertions(+), 46 deletions(-)
New commits:
commit 57091022781ac3d0509e417bf427d2edc723eed2
Author: Fridrich Å trba
Date: Wed Nov 9 11:53:28 2011 +0100
Getting completely rid of the int32 and whatever
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index 7d74dcc..fa0e0a2 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -71,25 +71,6 @@
#include "boost/scoped_array.hpp"
#include "tools/pathutils.hxx"
-//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
-//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
-#ifndef _UINT32
-# if defined(__alpha) || defined(__LP64__) || defined(AIX) || defined(WNT)
- typedef unsigned int uint32;
-# else /* __alpha */
- typedef unsigned long uint32;
-# endif
-# define _UINT32
-#endif
-#ifndef _INT32
-# if defined(__alpha) || defined(__LP64__) || defined(AIX) || defined(WNT)
- typedef int int32;
-# else /* __alpha */
- typedef long int32;
-# endif
-# define _INT32
-#endif
-
#include "npapi.h"
#include "npshell.hxx"
#include "so_env.hxx"
diff --git a/extensions/source/nsplugin/source/npshell.hxx
b/extensions/source/nsplugin/source/npshell.hxx
index c5821a0..a59175a 100644
--- a/extensions/source/nsplugin/source/npshell.hxx
+++ b/extensions/source/nsplugin/source/npshell.hxx
@@ -42,8 +42,8 @@ typedef struct _PluginInstance
Window window;
Display *display;
#endif
-uint32 x, y;
-uint32 width, height;
+uint32_t x, y;
+uint32_t width, height;
NPMIMEType type;
char *message;
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index b98ba85..0574084 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -73,27 +73,6 @@ extern "C" {
#define MOZ_X11
#endif
-//http://qa.openoffice.org/issues/show_bug.cgi?id=82545
-//https://bugzilla.mozilla.org/show_bug.cgi?id=241262
-#ifdef UNIX
-# ifndef _UINT32
-#if defined(__alpha) || defined(__LP64__) || defined(AIX)
- typedef unsigned int uint32;
-#else /* __alpha */
- typedef unsigned long uint32;
-#endif
-#define _UINT32
-# endif
-# ifndef _INT32
-#if defined(__alpha) || defined(__LP64__) || defined(AIX)
- typedef int int32;
-#else /* __alpha */
- typedef long int32;
-#endif
-#define _INT32
-# endif
-#endif
-
#if ! defined ( _NPAPI_H_) && ! defined (npapi_h_)
extern "C" {
#include
diff --git a/extensions/source/plugin/unx/npnapi.cxx
b/extensions/source/plugin/unx/npnapi.cxx
index ceb79cc..6ca6ea8 100644
--- a/extensions/source/plugin/unx/npnapi.cxx
+++ b/extensions/source/plugin/unx/npnapi.cxx
@@ -811,7 +811,7 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl, Mediator*,
/*pMediator*/ )
NPP instance= m_aInstances[ nInstance ]->instance;
sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
-int32 nRet = aPluginFuncs.writeready( instance, pStream );
+int32_t nRet = aPluginFuncs.writeready( instance, pStream );
medDebug( 1, "pluginapp: NPP_WriteReady( %p, %p ) (stream id =
%d) returns %d\n",
instance, pStream, nFileID, nRet );
@@ -827,10 +827,10 @@ IMPL_LINK( PluginConnector, WorkOnNewMessageHdl,
Mediator*, /*pMediator*/ )
NPP instance= m_aInstances[ nInstance ]->instance;
sal_uInt32 nFileID = pMessage->GetUINT32();
NPStream* pStream = m_aNPWrapStreams[ nFileID ];
-int32 offset= pMessage->GetUINT32();
+int32_t offset= pMessage->GetUINT32();
sal_uLong len;
char* buffer= (char*)pMessage->GetBytes( len );
-int32 nRet = aPluginFuncs.write( instance, pStream, offset,
len, buffer );
+int32_t nRet = aPluginFuncs.write( instance, pStream, offset,
len, buffer );
medDebug( 1,"pluginapp: NPP_Write( %p, %p, %d, %d, %p )
returns %d\n"
"stream = { pdata = %p, ndata = %p, url = %s, end =
%d, lastmodified = %d, notifyData = %p }\n",
diff --git a/extensions/source/plugin/unx/nppapi.cxx
b/extensions/source/plugin/unx/nppapi.cxx
index 87baa29..9826721 100644
--- a/extensions/source/plugin/unx/nppapi.cxx
+++ b/extensions/source/plugin/un
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/SdiTarget.mk |2 -- 1 file changed, 2 deletions(-) New commits: commit 0a096fd9739088a4425cf66c774742aa095b98b0 Author: Michael Stahl Date: Wed Nov 9 10:22:37 2011 +0100 Allow full deps on WNT since it seems that it works diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 195e068..611ba9f 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -72,10 +72,8 @@ define gb_SdiTarget_SdiTarget $(call gb_SdiTarget_get_target,$(1)) : INCLUDE := $$(subst -I. ,-I$$(dir $(SRCDIR)/$(1)) ,$$(SOLARINC)) $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi ifeq ($(gb_FULLDEPS),$(true)) -ifneq ($(OS),WNT) -include $(call gb_SdiTarget_get_dep_target,$(1)) endif -endif endef define gb_SdiTarget_set_include ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
