[ooo-build-commit] .: patches/dev300
Noel Power
noelp at kemper.freedesktop.org
Fri Jun 25 07:40:46 PDT 2010
patches/dev300/apply | 2
patches/dev300/buildfix-instsetoo_native-targets.diff | 15 +------
patches/dev300/calc-distributed-cell-text-sc.diff | 18 ++++----
patches/dev300/calc-html-csv-import-force-text-cell.diff | 31 +++++++++------
patches/dev300/sc-fit-to-width-height-skip-breaks.diff | 20 +++++----
5 files changed, 45 insertions(+), 41 deletions(-)
New commits:
commit 0bb211b0a15bce0dd326cfdf43e3dbeda74b3c03
Author: Noel Power <noel.power at novell.com>
Date: Fri Jun 25 15:40:35 2010 +0100
get build to instsetoo_native
* patches/dev300/apply:
* patches/dev300/buildfix-instsetoo_native-targets.diff:
* patches/dev300/calc-distributed-cell-text-sc.diff:
* patches/dev300/calc-html-csv-import-force-text-cell.diff:
* patches/dev300/sc-fit-to-width-height-skip-breaks.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index e01ce25..a9bc98c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -270,7 +270,7 @@ sc-cellsuno-avoid-early-destruction.diff, i#90076, pmladek
# FIXME dev300-m77 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
# add the .archive flag to some instsetoo_native/util/makefile.mk rules
-# FIXME dev300-m83 probably not needed? buildfix-instsetoo_native-targets.diff, i#111813, jholesov
+buildfix-instsetoo_native-targets.diff, i#111813, jholesov
[ TemporaryHacks and not MacOSXOnly ]
diff --git a/patches/dev300/buildfix-instsetoo_native-targets.diff b/patches/dev300/buildfix-instsetoo_native-targets.diff
index a9aebc6..19a08b6 100644
--- a/patches/dev300/buildfix-instsetoo_native-targets.diff
+++ b/patches/dev300/buildfix-instsetoo_native-targets.diff
@@ -1,12 +1,6 @@
----
- instsetoo_native/util/makefile.mk | 22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git instsetoo_native/util/makefile.mk instsetoo_native/util/makefile.mk
-index 885fba2..b20ea15 100644
---- instsetoo_native/util/makefile.mk
-+++ instsetoo_native/util/makefile.mk
-@@ -213,32 +213,32 @@ openoffice_%{$(PKGFORMAT:^".") .archive} :
+--- instsetoo_native/util/makefile.mk 2010-06-25 15:19:33.000000000 +0100
++++ instsetoo_native/util/makefile.mk 2010-06-25 15:36:17.000000000 +0100
+@@ -213,32 +213,32 @@ openoffice_%{$(PKGFORMAT:^".") .archive}
$(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
$(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
@@ -72,6 +66,3 @@ index 885fba2..b20ea15 100644
+$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
.ELSE # "$(alllangiso)"!=""
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-distributed-cell-text-sc.diff b/patches/dev300/calc-distributed-cell-text-sc.diff
index 6d8c413..ff85816 100644
--- a/patches/dev300/calc-distributed-cell-text-sc.diff
+++ b/patches/dev300/calc-distributed-cell-text-sc.diff
@@ -1,4 +1,3 @@
----
sc/inc/autoform.hxx | 1 +
sc/inc/scitems.hxx | 138 +++---
sc/inc/unonames.hxx | 2 +
@@ -39,10 +38,10 @@
sc/source/ui/vba/vbaformat.cxx | 22 +-
sc/source/ui/view/formatsh.cxx | 1 +
sc/source/ui/view/gridwin.cxx | 1 +
- sc/source/ui/view/output2.cxx | 555 ++++++++++++++++---------
+ sc/source/ui/view/output2.cxx | 557 ++++++++++++++++---------
sc/source/ui/view/viewdata.cxx | 1 +
sc/source/ui/view/viewfunc.cxx | 1 +
- 43 files changed, 705 insertions(+), 328 deletions(-)
+ 43 files changed, 706 insertions(+), 329 deletions(-)
diff --git sc/inc/autoform.hxx sc/inc/autoform.hxx
index 1fce4cb..3e4a94d 100644
@@ -1402,7 +1401,7 @@ index f5bd98d..fd10804 100644
#include <editeng/editobj.hxx>
#include <sfx2/dispatch.hxx>
diff --git sc/source/ui/view/output2.cxx sc/source/ui/view/output2.cxx
-index 13c404f..c004309 100644
+index 13c404f..05fae51 100644
--- sc/source/ui/view/output2.cxx
+++ sc/source/ui/view/output2.cxx
@@ -48,6 +48,7 @@
@@ -1885,7 +1884,7 @@ index 13c404f..c004309 100644
SCCOL nXForPos = nX;
if ( nXForPos < nX1 )
-@@ -2324,31 +2589,17 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
+@@ -2324,36 +2589,22 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
//
Size aPaperSize = Size( 1000000, 1000000 );
@@ -1920,6 +1919,12 @@ index 13c404f..c004309 100644
}
if (bPixelToLogic)
{
+ Size aLogicSize = pRefDevice->PixelToLogic(aPaperSize);
+- if ( bBreak && !bAsianVertical && pRefDevice != pFmtDevice )
++ if ( aAlignParam.mbBreak && !aAlignParam.mbAsianVertical && pRefDevice != pFmtDevice )
+ {
+ // #i85342# screen display and formatting for printer,
+ // use same GetEditArea call as in ScViewData::SetEditEngine
@@ -2372,12 +2623,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic)
// Fill the EditEngine (cell attributes and text)
//
@@ -2289,6 +2294,3 @@ index 3384fd6..a6aa9b8 100644
#include <sfx2/bindings.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
---
-1.7.0.1
-
diff --git a/patches/dev300/calc-html-csv-import-force-text-cell.diff b/patches/dev300/calc-html-csv-import-force-text-cell.diff
index cca627f..7c9adf9 100644
--- a/patches/dev300/calc-html-csv-import-force-text-cell.diff
+++ b/patches/dev300/calc-html-csv-import-force-text-cell.diff
@@ -1,15 +1,14 @@
----
sc/inc/column.hxx | 4 +-
sc/inc/document.hxx | 3 +-
- sc/inc/stringutil.hxx | 35 +++++++++++++++++++++++++
+ sc/inc/stringutil.hxx | 35 +++++++++++++++++++++++
sc/inc/table.hxx | 4 +-
- sc/source/core/data/column3.cxx | 49 ++++++++++++++++++++---------------
+ sc/source/core/data/column3.cxx | 55 ++++++++++++++++++++---------------
sc/source/core/data/document.cxx | 4 +-
sc/source/core/data/table2.cxx | 4 +-
sc/source/core/tool/stringutil.cxx | 9 ++++++
- sc/source/filter/rtf/eeimpars.cxx | 13 ++++++++-
- sc/source/ui/docshell/impex.cxx | 23 ++++++++++++++++-
- 10 files changed, 115 insertions(+), 33 deletions(-)
+ sc/source/filter/rtf/eeimpars.cxx | 13 +++++++-
+ sc/source/ui/docshell/impex.cxx | 23 ++++++++++++++-
+ 10 files changed, 118 insertions(+), 36 deletions(-)
diff --git sc/inc/column.hxx sc/inc/column.hxx
index 6a9ef60..1968815 100644
@@ -123,7 +122,7 @@ index 114f71e..87320cf 100644
void SetError( SCCOL nCol, SCROW nRow, USHORT nError);
diff --git sc/source/core/data/column3.cxx sc/source/core/data/column3.cxx
-index 4c062a6..ee7a8d7 100644
+index 4c062a6..3b2965b 100644
--- sc/source/core/data/column3.cxx
+++ sc/source/core/data/column3.cxx
@@ -52,6 +52,7 @@
@@ -182,7 +181,7 @@ index 4c062a6..ee7a8d7 100644
}
do
-@@ -1338,15 +1340,9 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
+@@ -1338,23 +1340,17 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
if (bIsText)
break;
@@ -199,7 +198,18 @@ index 4c062a6..ee7a8d7 100644
+ if (!aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
break;
- if ( pLangFormatter )
+- if ( pLangFormatter )
++ if ( aParam.mpNumFormatter )
+ {
+ // convert back to the original language if a built-in format was detected
+- const SvNumberformat* pOldFormat = pFormatter->GetEntry( nOldIndex );
++ const SvNumberformat* pOldFormat = aParam.mpNumFormatter->GetEntry( nOldIndex );
+ if ( pOldFormat )
+- nIndex = pFormatter->GetFormatForLanguageIfBuiltIn( nIndex, pOldFormat->GetLanguage() );
++ nIndex = aParam.mpNumFormatter->GetFormatForLanguageIfBuiltIn( nIndex, pOldFormat->GetLanguage() );
+ }
+
+ pNewCell = new ScValueCell( nVal );
@@ -1365,21 +1361,21 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString,
// Exception: If the new format is boolean, always apply it.
@@ -401,6 +411,3 @@ index 5bf49e8..9c839f5 100644
else
{
bMultiLine = true;
---
-1.7.0.1
-
diff --git a/patches/dev300/sc-fit-to-width-height-skip-breaks.diff b/patches/dev300/sc-fit-to-width-height-skip-breaks.diff
index fca0213..93ae632 100644
--- a/patches/dev300/sc-fit-to-width-height-skip-breaks.diff
+++ b/patches/dev300/sc-fit-to-width-height-skip-breaks.diff
@@ -1,12 +1,19 @@
----
- sc/source/core/data/table5.cxx | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ sc/source/core/data/table5.cxx | 10 ++++++++++
+ 1 files changed, 10 insertions(+), 0 deletions(-)
diff --git sc/source/core/data/table5.cxx sc/source/core/data/table5.cxx
-index bf4f50c..dfe13ea 100644
+index bf4f50c..915b4f2 100644
--- sc/source/core/data/table5.cxx
+++ sc/source/core/data/table5.cxx
-@@ -152,6 +152,15 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+@@ -135,6 +135,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
+
+ bool bSkipColBreaks = false;
+ bool bSkipRowBreaks = false;
++ bool bSkipBreaks = false;
+
+ if ( pStyleSet->GetItemState( ATTR_PAGE_SCALETOPAGES, FALSE, &pItem ) == SFX_ITEM_SET )
+ {
+@@ -152,6 +153,15 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
bSkipRowBreaks = true;
}
@@ -22,6 +29,3 @@ index bf4f50c..dfe13ea 100644
//--------------------------------------------------------------------------
long nPageSizeX = aPageSizeTwips.Width();
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list