[Libreoffice-commits] .: 2 commits - smoketestoo_native/makefile.mk solenv/gbuild
smoketestoo_native/makefile.mk |2 ++ solenv/gbuild/BuildDirs.mk |9 - 2 files changed, 2 insertions(+), 9 deletions(-) New commits: commit 0f1b0e5b7ad813069630e7ae719a800ecab640a8 Author: Jan Holesovsky ke...@suse.cz Date: Wed Nov 30 16:20:11 2011 +0100 Don't overwrite OUTDIR friends. diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk index 6a0933b..828546f 100644 --- a/solenv/gbuild/BuildDirs.mk +++ b/solenv/gbuild/BuildDirs.mk @@ -35,15 +35,6 @@ ifeq ($(strip $(SOLARENV)),) $(error SOLARENV variable is empty, no environment set, aborting) endif -# HACK -# unixify windoze paths -ifeq ($(OS_FOR_BUILD),WNT) -override WORKDIR := $(shell cygpath -u $(WORKDIR)) -override OUTDIR := $(shell cygpath -u $(OUTDIR)) -override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD)) -override SRCDIR := $(shell cygpath -u $(SRCDIR)) -endif - REPODIR := $(patsubst %/,%,$(dir $(SRCDIR))) # vim: set noet sw=4: commit 5d5df8c6615be1a382f660283dd0f251d1b3b278 Author: Jan Holesovsky ke...@suse.cz Date: Fri Dec 2 10:35:16 2011 +0100 Fix build on Windows. diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 333d646..bbfa24d 100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -47,7 +47,9 @@ SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk +.IF $(RUN_SMOKETEST) == YES .INCLUDE: installationtest.mk +.END .IF $(depend) == $(RUN_SMOKETEST) == YES # disable smoketest when cross-compiling for now; we can use wine at some stage (?) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sal/inc
sal/inc/rtl/strbuf.hxx | 38 ++
sal/inc/rtl/ustrbuf.hxx | 38 ++
2 files changed, 76 insertions(+)
New commits:
commit 0b14a86f8a1c77683db2e81cb4604c077b572cf7
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 2 11:07:51 2011 +0100
Mark rtl::O[U]StringBuffer::{charAt,setCharAt} as SAL_DEPRECATED.
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index 3ea6bc0..2f92b0f 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -281,6 +281,7 @@ public:
@param index the index of the desired character.
@return the character at the specified index of this string buffer.
*/
+SAL_DEPRECATED(use rtl::OStringBuffer::operator [] instead)
sal_Char charAt( sal_Int32 index )
{
assert(index = 0 index pData-length);
@@ -297,6 +298,7 @@ public:
@param index the index of the character to modify.
@param ch the new character.
*/
+SAL_DEPRECATED(use rtl::OStringBuffer::operator [] instead)
OStringBuffer setCharAt(sal_Int32 index, sal_Char ch)
{
assert(index = 0 index pData-length);
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index b4d4871..d9c3893 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -260,6 +260,7 @@ public:
@param index the index of the desired character.
@return the character at the specified index of this string buffer.
*/
+SAL_DEPRECATED(use rtl::OUStringBuffer::operator [] instead)
sal_Unicode charAt( sal_Int32 index ) const
{
assert(index = 0 index pData-length);
@@ -276,6 +277,7 @@ public:
@param index the index of the character to modify.
@param ch the new character.
*/
+SAL_DEPRECATED(use rtl::OUStringBuffer::operator [] instead)
OUStringBuffer setCharAt(sal_Int32 index, sal_Unicode ch)
{
assert(index = 0 index pData-length);
commit 05fddab006719d9d023787d7e6ee9b979907c048
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Dec 2 08:43:50 2011 +0100
Revert Remove charAt/setCharAt once and for all
For backwards compatibility, they should not be removed before LO 4.
They should be marked as SAL_DEPRECATED, however.
This reverts commit 1820e7f575dffe53062f50f08cebf0efa37e2cc2.
diff --git a/sal/inc/rtl/strbuf.hxx b/sal/inc/rtl/strbuf.hxx
index e3ae74b..3ea6bc0 100644
--- a/sal/inc/rtl/strbuf.hxx
+++ b/sal/inc/rtl/strbuf.hxx
@@ -269,6 +269,42 @@ public:
}
/**
+Returns the character at a specific index in this string buffer.
+
+The first character of a string buffer is at index
+code0/code, the next at index code1/code, and so on, for
+array indexing.
+p
+The index argument must be greater than or equal to
+code0/code, and less than the length of this string buffer.
+
+@param index the index of the desired character.
+@return the character at the specified index of this string buffer.
+*/
+sal_Char charAt( sal_Int32 index )
+{
+assert(index = 0 index pData-length);
+return pData-buffer[ index ];
+}
+
+/**
+The character at the specified index of this string buffer is set
+to codech/code.
+
+The index argument must be greater than or equal to
+code0/code, and less than the length of this string buffer.
+
+@param index the index of the character to modify.
+@param ch the new character.
+ */
+OStringBuffer setCharAt(sal_Int32 index, sal_Char ch)
+{
+assert(index = 0 index pData-length);
+pData-buffer[ index ] = ch;
+return *this;
+}
+
+/**
Return a null terminated character array.
*/
const sal_Char* getStr() const { return pData-buffer; }
diff --git a/sal/inc/rtl/ustrbuf.hxx b/sal/inc/rtl/ustrbuf.hxx
index 624b6f0..b4d4871 100644
--- a/sal/inc/rtl/ustrbuf.hxx
+++ b/sal/inc/rtl/ustrbuf.hxx
@@ -248,6 +248,42 @@ public:
}
/**
+Returns the character at a specific index in this string buffer.
+
+The first character of a string buffer is at index
+code0/code, the next at index code1/code, and so on, for
+array indexing.
+p
+The index argument must be greater than or equal to
+code0/code, and less than the length of this string buffer.
+
+@param index the index of the desired character.
+@return the character at the specified index of this string buffer.
+ */
+sal_Unicode charAt( sal_Int32 index ) const
+{
+assert(index = 0 index pData-length);
+return pData-buffer[ index ];
+}
+
+/**
+The character at the specified index of this string buffer is set
+to codech/code.
+
+The
[Libreoffice-commits] .: tools/inc
tools/inc/tools/debug.hxx | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 98aa85350460a0f1326b99007ae4b2c4ac425d50 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Dec 2 11:28:17 2011 +0100 Also demote DBG_ASSERTWARNING to SAL_INFO, to reduce output clutter. diff --git a/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx index 4fde7b5..3746350 100644 --- a/tools/inc/tools/debug.hxx +++ b/tools/inc/tools/debug.hxx @@ -42,10 +42,10 @@ steps taken while executing some protocol) should use the facilities provided by sal/log.hxx. -Because the assertion macros (DBG_ASSERTWARNING, DBG_ASSERT, DBG_BF_ASSERT) -have been used for true assertions as well as for logged warnings, they map -to SAL_WARN instead of standard assert. The warning and error macros -(DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING5, DBG_WARNINGFILE, +Because the assertion macros (DBG_ASSERT, DBG_BF_ASSERT) have been used for +true assertions as well as to log warnings, they map to SAL_WARN instead of +standard assert. The warning and error macros (DBG_ASSERTWARNING, +DBG_WARNING, DBG_WARNING1, ..., DBG_WARNING5, DBG_WARNINGFILE, DBG_ERRORFILE) all map to SAL_INFO. */ @@ -467,7 +467,7 @@ public: (const void*)pObj, (DbgUsr)fTest ) #define DBG_ASSERTWARNING( sCon, aWarning ) \ -SAL_DETAIL_WARN_IF_FORMAT(!(sCon), legacy.tools, aWarning) +SAL_DETAIL_INFO_IF_FORMAT(!(sCon), legacy.tools, aWarning) #define DBG_ASSERT( sCon, aError ) \ SAL_DETAIL_WARN_IF_FORMAT(!(sCon), legacy.tools, aError) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - desktop/util desktop/win32 desktop/WinResTarget_quickstart.mk desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/Win
desktop/WinResTarget_quickstart.mk |2 desktop/WinResTarget_sbase.mk |4 - desktop/WinResTarget_scalc.mk |4 - desktop/WinResTarget_sdraw.mk |4 - desktop/WinResTarget_simpress.mk|4 - desktop/WinResTarget_smath.mk |4 - desktop/WinResTarget_soffice.mk |4 - desktop/WinResTarget_sweb.mk|4 - desktop/WinResTarget_swriter.mk |4 - desktop/util/officeloader.rc| 14 ++-- desktop/win32/source/QuickStart/OOQuickStart.rc |8 +- desktop/win32/source/applauncher/launcher.rc|2 dev/null|binary sysui/desktop/icons/makefile.mk | 71 ++-- sysui/prj/d.lst |2 15 files changed, 38 insertions(+), 93 deletions(-) New commits: commit da0db8b03cd19af585133691689c1d752cc8c970 Author: Andras Timar ati...@suse.com Date: Fri Dec 2 13:43:18 2011 +0100 remove unused OOo Windows icons diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index 9c3ec14..0c28ece 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -32,7 +32,7 @@ $(eval $(call gb_WinResTarget_set_include,quickstart/src,\ )) $(eval $(call gb_WinResTarget_add_dependency,quickstart/src,\ -sysui/desktop/icons/ooo3_main_app.ico \ +sysui/desktop/icons/main_app.ico \ )) $(eval $(call gb_WinResTarget_add_file,quickstart/src,desktop/win32/source/QuickStart/OOQuickStart)) diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk index 506bb64..fe519bf 100644 --- a/desktop/WinResTarget_sbase.mk +++ b/desktop/WinResTarget_sbase.mk @@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,sbase/src,\ $(eval $(call gb_WinResTarget_set_defs,sbase/src,\ $$(DEFS) \ -DRES_APP_NAME=sbase \ --DRES_APP_ICON=icons/ooo3_base_app.ico \ +-DRES_APP_ICON=icons/base_app.ico \ -DVERVARIANT=$(BUILD) \ )) $(eval $(call gb_WinResTarget_add_dependency,sbase/src,\ -sysui/desktop/icons/ooo3_base_app.ico \ +sysui/desktop/icons/base_app.ico \ )) $(eval $(call gb_WinResTarget_add_file,sbase/src,desktop/win32/source/applauncher/launcher)) diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk index 4113746..bd710ea 100644 --- a/desktop/WinResTarget_scalc.mk +++ b/desktop/WinResTarget_scalc.mk @@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,scalc/src,\ $(eval $(call gb_WinResTarget_set_defs,scalc/src,\ $$(DEFS) \ -DRES_APP_NAME=scalc \ --DRES_APP_ICON=icons/ooo3_calc_app.ico \ +-DRES_APP_ICON=icons/calc_app.ico \ -DVERVARIANT=$(BUILD) \ )) $(eval $(call gb_WinResTarget_add_dependency,scalc/src,\ -sysui/desktop/icons/ooo3_calc_app.ico \ +sysui/desktop/icons/calc_app.ico \ )) $(eval $(call gb_WinResTarget_add_file,scalc/src,desktop/win32/source/applauncher/launcher)) diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk index 694c7da..b96a420 100644 --- a/desktop/WinResTarget_sdraw.mk +++ b/desktop/WinResTarget_sdraw.mk @@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,sdraw/src,\ $(eval $(call gb_WinResTarget_set_defs,sdraw/src,\ $$(DEFS) \ -DRES_APP_NAME=sdraw \ --DRES_APP_ICON=icons/ooo3_draw_app.ico \ +-DRES_APP_ICON=icons/draw_app.ico \ -DVERVARIANT=$(BUILD) \ )) $(eval $(call gb_WinResTarget_add_dependency,sdraw/src,\ -sysui/desktop/icons/ooo3_draw_app.ico \ +sysui/desktop/icons/draw_app.ico \ )) $(eval $(call gb_WinResTarget_add_file,sdraw/src,desktop/win32/source/applauncher/launcher)) diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk index 9a4b08f..a0a5a38 100644 --- a/desktop/WinResTarget_simpress.mk +++ b/desktop/WinResTarget_simpress.mk @@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,simpress/src,\ $(eval $(call gb_WinResTarget_set_defs,simpress/src,\ $$(DEFS) \ -DRES_APP_NAME=simpress \ --DRES_APP_ICON=icons/ooo3_impress_app.ico \ +-DRES_APP_ICON=icons/impress_app.ico \ -DVERVARIANT=$(BUILD) \ )) $(eval $(call gb_WinResTarget_add_dependency,simpress/src,\ -sysui/desktop/icons/ooo3_impress_app.ico \ +sysui/desktop/icons/impress_app.ico \ )) $(eval $(call gb_WinResTarget_add_file,simpress/src,desktop/win32/source/applauncher/launcher)) diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk index d531ae6..ac6ae36 100644 --- a/desktop/WinResTarget_smath.mk +++ b/desktop/WinResTarget_smath.mk @@ -33,12 +33,12 @@ $(eval $(call gb_WinResTarget_set_include,smath/src,\ $(eval $(call gb_WinResTarget_set_defs,smath/src,\ $$(DEFS) \ -DRES_APP_NAME=smath \ --DRES_APP_ICON=icons/ooo3_math_app.ico \ +-DRES_APP_ICON=icons/math_app.ico \
[Libreoffice-commits] .: sysui/desktop
dev/null|binary sysui/desktop/icons/base_app.ico|binary sysui/desktop/icons/calc_app.ico|binary sysui/desktop/icons/draw_app.ico|binary sysui/desktop/icons/impress_app.ico |binary sysui/desktop/icons/main_app.ico|binary sysui/desktop/icons/math_app.ico|binary sysui/desktop/icons/open.ico|binary sysui/desktop/icons/writer_app.ico |binary 9 files changed New commits: commit c5ca69b5d61f1d28f6069346c426c2fd3402a5f0 Author: Andras Timar ati...@suse.com Date: Fri Dec 2 14:03:09 2011 +0100 remove ooo3_ from Windows icon names diff --git a/sysui/desktop/icons/base_app.ico b/sysui/desktop/icons/base_app.ico new file mode 100644 index 000..02cf7a4 Binary files /dev/null and b/sysui/desktop/icons/base_app.ico differ diff --git a/sysui/desktop/icons/calc_app.ico b/sysui/desktop/icons/calc_app.ico new file mode 100644 index 000..a9dd646 Binary files /dev/null and b/sysui/desktop/icons/calc_app.ico differ diff --git a/sysui/desktop/icons/draw_app.ico b/sysui/desktop/icons/draw_app.ico new file mode 100644 index 000..5297dae Binary files /dev/null and b/sysui/desktop/icons/draw_app.ico differ diff --git a/sysui/desktop/icons/impress_app.ico b/sysui/desktop/icons/impress_app.ico new file mode 100644 index 000..9e96c3e Binary files /dev/null and b/sysui/desktop/icons/impress_app.ico differ diff --git a/sysui/desktop/icons/main_app.ico b/sysui/desktop/icons/main_app.ico new file mode 100644 index 000..20e665f Binary files /dev/null and b/sysui/desktop/icons/main_app.ico differ diff --git a/sysui/desktop/icons/math_app.ico b/sysui/desktop/icons/math_app.ico new file mode 100644 index 000..fb2f651 Binary files /dev/null and b/sysui/desktop/icons/math_app.ico differ diff --git a/sysui/desktop/icons/ooo3_base_app.ico b/sysui/desktop/icons/ooo3_base_app.ico deleted file mode 100644 index 02cf7a4..000 Binary files a/sysui/desktop/icons/ooo3_base_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_calc_app.ico b/sysui/desktop/icons/ooo3_calc_app.ico deleted file mode 100644 index a9dd646..000 Binary files a/sysui/desktop/icons/ooo3_calc_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_draw_app.ico b/sysui/desktop/icons/ooo3_draw_app.ico deleted file mode 100644 index 5297dae..000 Binary files a/sysui/desktop/icons/ooo3_draw_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_impress_app.ico b/sysui/desktop/icons/ooo3_impress_app.ico deleted file mode 100644 index 9e96c3e..000 Binary files a/sysui/desktop/icons/ooo3_impress_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_main_app.ico b/sysui/desktop/icons/ooo3_main_app.ico deleted file mode 100644 index 20e665f..000 Binary files a/sysui/desktop/icons/ooo3_main_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_math_app.ico b/sysui/desktop/icons/ooo3_math_app.ico deleted file mode 100644 index fb2f651..000 Binary files a/sysui/desktop/icons/ooo3_math_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_open.ico b/sysui/desktop/icons/ooo3_open.ico deleted file mode 100644 index 20e665f..000 Binary files a/sysui/desktop/icons/ooo3_open.ico and /dev/null differ diff --git a/sysui/desktop/icons/ooo3_writer_app.ico b/sysui/desktop/icons/ooo3_writer_app.ico deleted file mode 100644 index cb08cc5..000 Binary files a/sysui/desktop/icons/ooo3_writer_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/open.ico b/sysui/desktop/icons/open.ico new file mode 100644 index 000..20e665f Binary files /dev/null and b/sysui/desktop/icons/open.ico differ diff --git a/sysui/desktop/icons/writer_app.ico b/sysui/desktop/icons/writer_app.ico new file mode 100644 index 000..cb08cc5 Binary files /dev/null and b/sysui/desktop/icons/writer_app.ico differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/source
starmath/source/cursor.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2292904f85ab6c360c30914e8621e516f8ae1388
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Dec 2 17:21:15 2011 +0400
visual formula editor: fix insertion of -
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index 1b66fa1..f1eeb0d 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1040,7 +1040,7 @@ void SmCursor::InsertElement(SmFormulaElement element){
SmToken token;
token.eType = TMINUS;
token.cMathChar = MS_MINUS;
-token.nGroup = MS_PLUS;
+token.nGroup = TGUNOPER | TGSUM;
token.nLevel = 5;
token.aText.AssignAscii(-);
pNewNode = new SmMathSymbolNode(token);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sysui/desktop
dev/null |binary 1 file changed New commits: commit 10f977981d2cfb6ba0ccd0185ccb12e212010bc2 Author: Andras Timar ati...@suse.com Date: Fri Dec 2 15:17:24 2011 +0100 remove unused Windows icon diff --git a/sysui/desktop/icons/main.ico b/sysui/desktop/icons/main.ico deleted file mode 100644 index 20e665f..000 Binary files a/sysui/desktop/icons/main.ico and /dev/null differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/smoketest/smoketest.scp | 13 + 1 file changed, 13 insertions(+) New commits: commit ccad45fef484065ae303825a179326542f01b063 Author: Petr Mladek pmla...@suse.cz Date: Fri Dec 2 17:09:03 2011 +0100 define missing directories for smoketest on MAC note that the smoketest is not packaged for MAC at this stage diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp index aaed44f..9465b87 100644 --- a/scp2/source/smoketest/smoketest.scp +++ b/scp2/source/smoketest/smoketest.scp @@ -55,6 +55,19 @@ Directory gid_Test_Dir_Brand_Root #endif Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE); End + +Directory gid_Test_Dir_Bundle +ParentID = PD_PROGDIR; +HostName = %PRODUCTNAME.app; +LangPackHostName = %PRODUCTNAME Language Pack.app; +PatchHostName = %PRODUCTNAME Patch.app; +End + +Directory gid_Test_Dir_Bundle_Contents +ParentID = gid_Test_Dir_Bundle; +HostName = Contents; +Styles = (OFFICEDIRECTORY); +End #endif Directory gid_Test_Brand_Dir_Program ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/source
starmath/source/cursor.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit c1baeb25ad3a5d6afb59f9329a634f742a7a9e5a
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Dec 2 20:54:38 2011 +0400
visual formula editor: fix insertion of symbols from catalog
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index f1eeb0d..2f50532 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -1113,7 +1113,6 @@ void SmCursor::InsertSpecial(XubString aString) {
Delete();
aString = comphelper::string::strip(aString, ' ');
-aString = comphelper::string::stripStart(aString, '%');
//Create instance of special node
SmToken token;
@@ -1121,7 +1120,7 @@ void SmCursor::InsertSpecial(XubString aString) {
token.cMathChar = '\0';
token.nGroup = 0;
token.nLevel = 5;
-token.aText = aString; //Don't know if leading % should be removed
+token.aText = aString;
SmSpecialNode* pSpecial = new SmSpecialNode(token);
//Prepare the special node
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scp2/source
scp2/source/smoketest/smoketest.scp |2 ++ 1 file changed, 2 insertions(+) New commits: commit a28635374613e556a0093c242823ea90a3704f74 Author: Petr Mladek pmla...@suse.cz Date: Fri Dec 2 21:26:53 2011 +0100 another attempt to define test dirs on MAC sigh, it is hard to fix build on MAC without MAC diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp index 9465b87..5105681 100644 --- a/scp2/source/smoketest/smoketest.scp +++ b/scp2/source/smoketest/smoketest.scp @@ -55,7 +55,9 @@ Directory gid_Test_Dir_Brand_Root #endif Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE); End +#endif +#if MACOSX Directory gid_Test_Dir_Bundle ParentID = PD_PROGDIR; HostName = %PRODUCTNAME.app; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: nlpsolver/help nlpsolver/src nlpsolver/ThirdParty
0 files changed New commits: commit 4bfec0e8393901aad5ccc790a5080842f64019a7 Author: Miklos Vajna vmik...@frugalware.org Date: Sat Dec 3 02:22:10 2011 +0100 nlpsolver: remove unneeded exec bits diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/DEPSAgent.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/AbsGTBehavior.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/DEGTBehavior.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/deps/behavior/PSGTBehavior.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalElement.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/EvalStruct.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/encode/IEncodeEngine.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicArray.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicBound.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/BasicTag.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/CompareValue.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalCompare.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalString.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/IUpdateCycleEngine.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/OutputMethods.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/RandomGenerator.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/ACRComparator.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/BCHComparator.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/IGoodnessCompareEngine.java old mode 100755 new mode 100644 diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/goodness/PenaltyComparator.java old mode 100755 new mode 100644 diff --git
[Libreoffice-commits] .: avmedia/source
avmedia/source/framework/mediaitem.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2c09f5071fe940881293615dad95b4b046a03a70
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Dec 2 22:00:47 2011 -0500
Fixed build breakage, and remove warning.
OUString never understands generic int type; it thinks it's too
ambiguous, depending on 32-bit or 64-bit build environment.
diff --git a/avmedia/source/framework/mediaitem.cxx
b/avmedia/source/framework/mediaitem.cxx
index d38548a..cb29637 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -422,7 +422,7 @@ lcl_CreateStream(uno::Referenceembed::XStorage const
xStorage,
do
{
++count;
-filename = basename + ::rtl::OUString::valueOf(count) + suffix;
+filename = basename +
::rtl::OUString::valueOf(static_castsal_Int32(count)) + suffix;
}
while (xStorage-hasByName(filename));
}
@@ -496,7 +496,7 @@ bool EmbedMedia(uno::Referenceframe::XModel const xModel,
o_rEmbeddedURL = buf.makeStringAndClear();
return true;
}
-catch (uno::Exception const e)
+catch (uno::Exception const)
{
SAL_WARN(avmedia,
Exception while trying to embed media);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
