ooo-build r15234 - in trunk: . patches/dev300
- From: kyoshida svn gnome org
- To: svn-commits-list gnome org
- Subject: ooo-build r15234 - in trunk: . patches/dev300
- Date: Thu, 29 Jan 2009 05:27:16 +0000 (UTC)
Author: kyoshida
Date: Thu Jan 29 05:27:16 2009
New Revision: 15234
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15234&view=rev
Log:
2009-01-29 Kohei Yoshida <kyoshida novell com>
* patches/dev300/sc-copy-source-border-m39.diff:
* patches/dev300/sc-copy-source-border.diff:
* patches/dev300/sc-datapilot-dynamic-range-m39.diff:
* patches/dev300/sc-datapilot-dynamic-range.diff:
* patches/dev300/calc-formula-variable-separators-sc.diff:
* patches/dev300/chart-odf-always-calc-a1.diff:
* patches/dev300/apply: fixed build breakage in sc (for dev300-m40).
Added:
trunk/patches/dev300/sc-copy-source-border-m39.diff
- copied unchanged from r15233, /trunk/patches/dev300/sc-copy-source-border.diff
trunk/patches/dev300/sc-datapilot-dynamic-range-m39.diff
- copied unchanged from r15233, /trunk/patches/dev300/sc-datapilot-dynamic-range.diff
Modified:
trunk/ChangeLog
trunk/patches/dev300/apply
trunk/patches/dev300/calc-formula-variable-separators-sc.diff
trunk/patches/dev300/chart-odf-always-calc-a1.diff
trunk/patches/dev300/sc-copy-source-border.diff
trunk/patches/dev300/sc-datapilot-dynamic-range.diff
Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply (original)
+++ trunk/patches/dev300/apply Thu Jan 29 05:27:16 2009
@@ -804,7 +804,12 @@
# been generated.
sc-datapilot-dynamic-range-m38.diff, i#23658, kohei
-[ CalcFixes > dev300-m38 ]
+[ CalcFixes > dev300-m38 <= dev300-m39 ]
+# Support modification of data source range in DataPilot after table output has
+# been generated.
+sc-datapilot-dynamic-range-m39.diff, i#23658, kohei
+
+[ CalcFixes > dev300-m39 ]
# Support modification of data source range in DataPilot after table output has
# been generated.
sc-datapilot-dynamic-range.diff, i#23658, kohei
@@ -890,9 +895,15 @@
# Paste clipboard when ENTER is pressed, then clear clipboard.
sc-paste-on-enter.diff, n#358545, i#28535, jonp
+[ CalcFixes <= dev300-m39 ]
+# Place a border around the Copy source cell(s).
+sc-copy-source-border-m39.diff, n#367489, jonp
+
+[ CalcFixes > dev300-m39 ]
# Place a border around the Copy source cell(s).
sc-copy-source-border.diff, n#367489, jonp
+[ CalcFixes ]
# Allow 'june-2007' to be properly parsed as June 1 2007 in en-US locales.
sc-date-fix.diff, n#358750, jonp
Modified: trunk/patches/dev300/calc-formula-variable-separators-sc.diff
==============================================================================
--- trunk/patches/dev300/calc-formula-variable-separators-sc.diff (original)
+++ trunk/patches/dev300/calc-formula-variable-separators-sc.diff Thu Jan 29 05:27:16 2009
@@ -41,7 +41,7 @@
#include "scdllapi.h"
#include "optutil.hxx"
-+#include "grammar.hxx"
++#include "formula/grammar.hxx"
+
class SC_DLLPUBLIC ScDocOptions
{
@@ -50,7 +50,7 @@
BOOL bDoAutoSpell; // Auto-Spelling
BOOL bLookUpColRowNames; // Spalten-/Zeilenbeschriftungen automagisch suchen
BOOL bFormulaRegexEnabled; // regular expressions in formulas enabled
-+ ScGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax
++ ::formula::FormulaGrammar::Grammar eFormulaGrammar; // formula grammar used to switch different formula syntax
+
+ ::rtl::OUString aFormulaSepArg;
+ ::rtl::OUString aFormulaSepArrayRow;
@@ -63,8 +63,8 @@
void SetFormulaRegexEnabled( BOOL bVal ) { bFormulaRegexEnabled = bVal; }
BOOL IsFormulaRegexEnabled() const { return bFormulaRegexEnabled; }
+
-+ void SetFormulaSyntax( ScGrammar::Grammar eGram ) { eFormulaGrammar = eGram; }
-+ ScGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; }
++ void SetFormulaSyntax( ::formula::FormulaGrammar::Grammar eGram ) { eFormulaGrammar = eGram; }
++ ::formula::FormulaGrammar::Grammar GetFormulaSyntax() const { return eFormulaGrammar; }
+
+ void SetFormulaSepArg(const ::rtl::OUString& rSep) { aFormulaSepArg = rSep; }
+ ::rtl::OUString GetFormulaSepArg() const { return aFormulaSepArg; }
@@ -211,7 +211,7 @@
bDoAutoSpell = FALSE;
bLookUpColRowNames = TRUE;
bFormulaRegexEnabled= TRUE;
-+ eFormulaGrammar = ScGrammar::GRAM_NATIVE;
++ eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE;
+
+ do
+ {
@@ -346,7 +346,7 @@
+ {
+ case SCFORMULAOPT_GRAMMAR:
+ {
-+ ScGrammar::Grammar eGram = ScGrammar::GRAM_DEFAULT;
++ ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
+
+ do
+ {
@@ -357,13 +357,13 @@
+ switch (nIntVal)
+ {
+ case 0: // Calc A1
-+ eGram = ScGrammar::GRAM_NATIVE;
++ eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
+ break;
+ case 1: // Excel A1
-+ eGram = ScGrammar::GRAM_NATIVE_XL_A1;
++ eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
+ break;
+ case 2: // Excel R1C1
-+ eGram = ScGrammar::GRAM_NATIVE_XL_R1C1;
++ eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
+ break;
+ }
+ }
@@ -419,8 +419,8 @@
+ sal_Int32 nVal = 0;
+ switch (GetFormulaSyntax())
+ {
-+ case ScGrammar::GRAM_NATIVE_XL_A1: nVal = 1; break;
-+ case ScGrammar::GRAM_NATIVE_XL_R1C1: nVal = 2; break;
++ case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1: nVal = 1; break;
++ case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1: nVal = 2; break;
+ }
+ pValues[nProp] <<= nVal;
+ }
@@ -690,7 +690,7 @@
+#include "tpformula.hxx"
+#include "optdlg.hrc"
+#include "scresid.hxx"
-+#include "grammar.hxx"
++#include "formula/grammar.hxx"
+#include "docoptio.hxx"
+#include "global.hxx"
+
@@ -869,17 +869,17 @@
+
+BOOL ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
+{
-+ ScGrammar::Grammar eGram = ScGrammar::GRAM_DEFAULT;
++ ::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
+ switch (maLbFormulaSyntax.GetSelectEntryPos())
+ {
+ case 0:
-+ eGram = ScGrammar::GRAM_NATIVE;
++ eGram = ::formula::FormulaGrammar::GRAM_NATIVE;
+ break;
+ case 1:
-+ eGram = ScGrammar::GRAM_NATIVE_XL_A1;
++ eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1;
+ break;
+ case 2:
-+ eGram = ScGrammar::GRAM_NATIVE_XL_R1C1;
++ eGram = ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1;
+ break;
+ }
+
@@ -900,16 +900,16 @@
+
+void ScTpFormulaOptions::Reset(const SfxItemSet& /*rCoreSet*/)
+{
-+ ScGrammar::Grammar eGram = mpNewOptions->GetFormulaSyntax();
++ ::formula::FormulaGrammar::Grammar eGram = mpNewOptions->GetFormulaSyntax();
+ switch (eGram)
+ {
-+ case ScGrammar::GRAM_NATIVE:
++ case ::formula::FormulaGrammar::GRAM_NATIVE:
+ maLbFormulaSyntax.SelectEntryPos(0);
+ break;
-+ case ScGrammar::GRAM_NATIVE_XL_A1:
++ case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:
+ maLbFormulaSyntax.SelectEntryPos(1);
+ break;
-+ case ScGrammar::GRAM_NATIVE_XL_R1C1:
++ case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:
+ maLbFormulaSyntax.SelectEntryPos(2);
+ break;
+ default:
Modified: trunk/patches/dev300/chart-odf-always-calc-a1.diff
==============================================================================
--- trunk/patches/dev300/chart-odf-always-calc-a1.diff (original)
+++ trunk/patches/dev300/chart-odf-always-calc-a1.diff Thu Jan 29 05:27:16 2009
@@ -18,7 +18,7 @@
ScAddress& rAddress,
const ::rtl::OUString& rAddressStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
@@ -26,7 +26,7 @@
ScRange& rRange,
const ::rtl::OUString& rRangeStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
@@ -34,7 +34,7 @@
ScRangeList& rRangeList,
const ::rtl::OUString& rRangeListStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
@@ -42,7 +42,7 @@
ScArea& rArea,
const ::rtl::OUString& rRangeStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
@@ -50,7 +50,7 @@
::com::sun::star::table::CellAddress& rAddress,
const ::rtl::OUString& rAddressStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
@@ -58,7 +58,7 @@
::com::sun::star::table::CellRangeAddress& rRange,
const ::rtl::OUString& rRangeStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
@@ -66,7 +66,7 @@
::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq,
const ::rtl::OUString& rRangeListStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_Unicode cQuote = '\'');
@@ -74,7 +74,7 @@
::rtl::OUString& rString,
const ScAddress& rAddress,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
@@ -82,7 +82,7 @@
::rtl::OUString& rString,
const ScRange& rRange,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
@@ -90,7 +90,7 @@
::rtl::OUString& rString,
const ScRangeList* pRangeList,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D));
@@ -98,7 +98,7 @@
::rtl::OUString& rString,
const ScArea& rArea,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
@@ -106,7 +106,7 @@
::rtl::OUString& rString,
const ::com::sun::star::table::CellAddress& rAddress,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
@@ -114,7 +114,7 @@
::rtl::OUString& rString,
const ::com::sun::star::table::CellRangeAddress& rRange,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_Bool bAppendStr = sal_False,
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
@@ -122,7 +122,7 @@
::rtl::OUString& rString,
const ::com::sun::star::uno::Sequence< ::com::sun::star::table::CellRangeAddress >& rRangeSeq,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator = ' ',
sal_uInt16 nFormatFlags = (SCA_VALID | SCA_TAB_3D) );
};
@@ -134,7 +134,7 @@
ScAddress& rAddress,
const OUString& rAddressStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator,
sal_Unicode cQuote )
@@ -147,7 +147,7 @@
+ if ((rAddress.Parse( sToken, const_cast<ScDocument*>(pDocument), eConv ) & SCA_VALID) == SCA_VALID)
+ return true;
+#if CHART_ADDRESS_CONV_WORKAROUND
-+ ScAddress::Convention eConvUI = pDocument->GetAddressConvention();
++ ::formula::FormulaGrammar::AddressConvention eConvUI = pDocument->GetAddressConvention();
+ if (eConv != eConvUI)
+ return ((rAddress.Parse(sToken, const_cast<ScDocument*>(pDocument), eConvUI) & SCA_VALID) == SCA_VALID);
+#endif
@@ -159,14 +159,14 @@
ScRange& rRange,
const OUString& rRangeStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator,
sal_Unicode cQuote )
{
OUString sToken;
sal_Bool bResult(sal_False);
-+ ScAddress::Convention eConvUI = pDocument->GetAddressConvention();
++ ::formula::FormulaGrammar::AddressConvention eConvUI = pDocument->GetAddressConvention();
GetTokenByOffset( sToken, rRangeStr, nOffset, cSeperator, cQuote );
if( nOffset >= 0 )
{
@@ -220,7 +220,7 @@
ScRangeList& rRangeList,
const OUString& rRangeListStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_Unicode cQuote )
{
@@ -237,7 +237,7 @@
ScArea& rArea,
const OUString& rRangeStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator,
sal_Unicode cQuote )
@@ -253,7 +253,7 @@
table::CellAddress& rAddress,
const OUString& rAddressStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator,
sal_Unicode cQuote )
@@ -269,7 +269,7 @@
table::CellRangeAddress& rRange,
const OUString& rRangeStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Int32& nOffset,
sal_Unicode cSeperator,
sal_Unicode cQuote )
@@ -285,7 +285,7 @@
uno::Sequence< table::CellRangeAddress >& rRangeSeq,
const OUString& rRangeListStr,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_Unicode cQuote )
{
@@ -302,7 +302,7 @@
OUString& rString,
const ScAddress& rAddress,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_Bool bAppendStr,
sal_uInt16 nFormatFlags )
@@ -319,7 +319,7 @@
OUString& rString,
const ScRange& rRange,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_Bool bAppendStr,
sal_uInt16 nFormatFlags )
@@ -335,7 +335,7 @@
OUString& rString,
const ScRangeList* pRangeList,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_uInt16 nFormatFlags )
{
@@ -352,7 +352,7 @@
OUString& rString,
const ScArea& rArea,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_Bool bAppendStr,
sal_uInt16 nFormatFlags )
@@ -367,7 +367,7 @@
OUString& rString,
const table::CellAddress& rAddress,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_Bool bAppendStr,
sal_uInt16 nFormatFlags )
@@ -381,7 +381,7 @@
OUString& rString,
const table::CellRangeAddress& rRange,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_Bool bAppendStr,
sal_uInt16 nFormatFlags )
@@ -396,7 +396,7 @@
OUString& rString,
const uno::Sequence< table::CellRangeAddress >& rRangeSeq,
const ScDocument* pDocument,
-+ ScAddress::Convention eConv,
++ ::formula::FormulaGrammar::AddressConvention eConv,
sal_Unicode cSeperator,
sal_uInt16 nFormatFlags )
{
@@ -918,7 +918,7 @@
}
+static bool lcl_parseSingleRangeToken(
-+ ScRange& rRange, const rtl::OUString& rToken, ScDocument* pDoc, ScAddress::Convention eConv,
++ ScRange& rRange, const rtl::OUString& rToken, ScDocument* pDoc, ::formula::FormulaGrammar::AddressConvention eConv,
+ const sal_Unicode cSep, const sal_Unicode cQuote)
+{
+ sal_Int32 nSepPos = ScRangeStringConverter::IndexOf(rToken, ':', 0, cQuote);
@@ -956,7 +956,7 @@
+ if (m_pDocument)
+ {
-+ ScAddress::Convention eConvUI = m_pDocument->GetAddressConvention();
++ ::formula::FormulaGrammar::AddressConvention eConvUI = m_pDocument->GetAddressConvention();
+ ScRange aRange;
+
+ rtl::OUString aRetStr;
Modified: trunk/patches/dev300/sc-copy-source-border.diff
==============================================================================
--- trunk/patches/dev300/sc-copy-source-border.diff (original)
+++ trunk/patches/dev300/sc-copy-source-border.diff Thu Jan 29 05:27:16 2009
@@ -110,7 +110,7 @@
+ sdr::overlay::OverlayObjectCell::RangeVector aRanges;
+ ConvertPixelRectsToRangeVector( aPixelRects, &aRanges, rDrawMode );
+
-+ ScOverlayType eType = SC_OVERLAY_TRANSPARENT;
++ ScOverlayType eType = SC_OVERLAY_BORDER_TRANSPARENT;
+
+ Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor();
+ sdr::overlay::OverlayObjectCell* pOverlay = new sdr::overlay::OverlayObjectCell( eType, aHighlight, aRanges );
Modified: trunk/patches/dev300/sc-datapilot-dynamic-range.diff
==============================================================================
--- trunk/patches/dev300/sc-datapilot-dynamic-range.diff (original)
+++ trunk/patches/dev300/sc-datapilot-dynamic-range.diff Thu Jan 29 05:27:16 2009
@@ -494,8 +494,8 @@
+
+ // DP source selection
+ FixedText aFtInArea;
-+ ScRefEdit aEdInPos;
-+ ScRefButton aRbInPos;
++ ::formula::RefEdit aEdInPos;
++ ::formula::RefButton aRbInPos;
+
+ // DP output location
ListBox aLbOutPos;
@@ -505,7 +505,7 @@
size_t nDnDFromIndex;
BOOL bIsDrag;
-+ ScRefEdit* pEditActive;
++ ::formula::RefEdit* pEditActive;
+
Rectangle aRectPage;
Rectangle aRectRow;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
