[ooo-build-commit] 2 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Aug 13 05:08:22 PDT 2009
patches/dev300/autocorrect-accidental-caps-lock-svx.diff | 16 +++++++--------
patches/dev300/layout-parallel-build.diff | 8 ++-----
2 files changed, 11 insertions(+), 13 deletions(-)
New commits:
commit b73115e28fe0675dc5439d7e9a055e9fa5d17df9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Aug 13 15:06:16 2009 +0300
Adapt autocorrect-accidental-caps-lock-svx.diff for dev300-m54
* patches/dev300/autocorrect-accidental-caps-lock-svx.diff: Some
source files are now in svx/source/cui and not svx/source/dialog.
diff --git a/patches/dev300/autocorrect-accidental-caps-lock-svx.diff b/patches/dev300/autocorrect-accidental-caps-lock-svx.diff
index 147fee5..ec371b1 100644
--- a/patches/dev300/autocorrect-accidental-caps-lock-svx.diff
+++ b/patches/dev300/autocorrect-accidental-caps-lock-svx.diff
@@ -86,8 +86,8 @@
static long GetDefaultFlags();
// returns TRUE for charcters where the function
---- svx/source/dialog/autocdlg.cxx.old 2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/autocdlg.cxx 2009-04-06 16:42:14.000000000 +0000
+--- svx/source/cui/autocdlg.cxx
++++ svx/source/cui/autocdlg.cxx
@@ -233,7 +233,8 @@ OfaAutocorrOptionsPage::OfaAutocorrOptio
sNoDblSpaces (SVX_RES(STR_NO_DBL_SPACES )),
sHalf (SVX_RES(ST_FRACTION )),
@@ -164,8 +164,8 @@
aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr );
aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) );
aCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber );
---- svx/source/dialog/autocdlg.hrc.old 2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/autocdlg.hrc 2009-04-06 16:42:14.000000000 +0000
+--- svx/source/cui/autocdlg.hrc
++++ svx/source/cui/autocdlg.hrc
@@ -152,6 +152,7 @@
#define ST_DASH 208
#define FT_LANG 209
@@ -174,8 +174,8 @@
#define CB_SMARTTAGS 220
#define FT_SMARTTAGS 221
---- svx/source/dialog/autocdlg.hxx.old 2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/autocdlg.hxx 2009-04-06 16:42:14.000000000 +0000
+--- svx/source/cui/autocdlg.hxx
++++ svx/source/cui/autocdlg.hxx
@@ -119,6 +119,7 @@ private:
String sHalf;
String sDash;
@@ -192,8 +192,8 @@
String sFraction;
String sDetectURL;
String sDash;
---- svx/source/dialog/autocdlg.src.old 2009-04-02 11:03:28.000000000 +0000
-+++ svx/source/dialog/autocdlg.src 2009-04-06 16:42:14.000000000 +0000
+--- svx/source/cui/autocdlg.src
++++ svx/source/cui/autocdlg.src
@@ -140,7 +140,11 @@ TabDialog RID_OFA_AUTOCORR_DLG
String ST_DASH \
{ \
commit 7c22df4bdbc7e599d5efb5617a80967ae58d9638
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Aug 13 15:02:08 2009 +0300
Adapt layout-parallel-build.diff for dev300-m54
* patches/dev300/layout-parallel-build.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/layout-parallel-build.diff b/patches/dev300/layout-parallel-build.diff
index ea0085c..68b51f7 100644
--- a/patches/dev300/layout-parallel-build.diff
+++ b/patches/dev300/layout-parallel-build.diff
@@ -1,6 +1,6 @@
---- solenv/inc/layout.mk 2009-04-06 17:12:29.000000000 +0200
-+++ solenv/inc/layout.mk 2009-04-06 21:26:53.000000000 +0200
-@@ -2,33 +2,28 @@ TRALAY=tralay
+--- solenv/inc/layout.mk
++++ solenv/inc/layout.mk
+@@ -2,31 +2,28 @@ TRALAY=tralay
XML_DEST=$(DLLDEST)
XML_LANGS=$(alllangiso)
@@ -24,8 +24,6 @@
ZIP1LIST=$(ALL_XMLS:s@$(XML_DEST)/@@)
+ZIP1DEPS=localize.sdf $(XML_DEPS)
--%.xml: localize.sdf
--
-$(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
- -$(MKDIR) $(@:d)
- @echo $(foreach,i,$(XML_LANGS) $(XML_DEST)/$i/%.xml): %.xml
More information about the ooo-build-commit
mailing list