[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 49f2a0aed4b0549222cf32ef903a0507aac01893
Author: Caolán McNamara caol...@redhat.com
Date: Wed May 16 13:52:12 2012 +0100
WaE: fVal may be used uninitialized
Change-Id: Ifee8b1f44868813cc7d1c02539517e8d2bf0675d
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 8cccb61..82032bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1561,7 +1561,7 @@ short ScInterpreter::IsEven()
{
nFuncFmtType = NUMBERFORMAT_LOGICAL;
short nRes = 0;
-double fVal;
+double fVal = 0;
switch ( GetStackType() )
{
case svDoubleRef :
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_global.cxx | 27 ---
binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc| 55 --
binfilter/bf_sc/source/ui/dbgui/makefile.mk |2
binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.cxx | 214
binfilter/bf_sc/source/ui/dbgui/sc_asciiopt.src | 66 ---
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx |2
binfilter/bf_sc/source/ui/inc/asciiopt.hxx | 105 ---
binfilter/bf_sc/source/ui/inc/csvgrid.hxx |1
binfilter/bf_sc/source/ui/inc/csvtablebox.hxx | 48 -
binfilter/bf_sc/source/ui/inc/imoptdlg.hxx |4
binfilter/inc/bf_sc/global.hxx |1
11 files changed, 1 insertion(+), 524 deletions(-)
New commits:
commit d8a4706e91bf5ca518af96434394e24d10a5e0e6
Author: Caolán McNamara caol...@redhat.com
Date: Fri Apr 6 22:37:45 2012 +0100
callcatcher: recently unused code
diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx
b/binfilter/bf_sc/source/core/data/sc_global.cxx
index 96da4ca..c952081 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -545,33 +545,6 @@ void global_InitAppOptions();
//
// static
-/*N*/ CharSet ScGlobal::GetCharsetValue( const String rCharSet )
-/*N*/ {
-/*N*/ // new TextEncoding values
-/*N*/ if ( CharClass::isAsciiNumeric( rCharSet ) )
-/*N*/ {
-/*?*/ sal_Int32 nVal = rCharSet.ToInt32();
-/*?*/ if ( !nVal || nVal == RTL_TEXTENCODING_DONTKNOW )
-/*?*/ return osl_getThreadTextEncoding();
-/*?*/ return (CharSet) nVal;
-/*N*/ }
-/*N*/ // old CharSet values for compatibility
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(ANSI) ) return
RTL_TEXTENCODING_MS_1252;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(MAC) ) return
RTL_TEXTENCODING_APPLE_ROMAN;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC)) return
RTL_TEXTENCODING_IBM_850;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_437)) return
RTL_TEXTENCODING_IBM_437;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_850)) return
RTL_TEXTENCODING_IBM_850;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_860)) return
RTL_TEXTENCODING_IBM_860;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_861)) return
RTL_TEXTENCODING_IBM_861;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_863)) return
RTL_TEXTENCODING_IBM_863;
-/*N*/ else if (rCharSet.EqualsIgnoreCaseAscii(IBMPC_865)) return
RTL_TEXTENCODING_IBM_865;
-/*N*/ //else if (rCharSet.EqualsIgnoreCaseAscii(SYSTEM) ) return
osl_getThreadTextEncoding();
-/*N*/ else return osl_getThreadTextEncoding();
-/*N*/ }
-
-//
-
-// static
/*N*/ String ScGlobal::GetCharsetString( CharSet eVal )
/*N*/ {
/*N*/ const sal_Char* pChar;
diff --git a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
b/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
deleted file mode 100644
index e734e1c..000
--- a/binfilter/bf_sc/source/ui/dbgui/asciiopt.hrc
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-#include bf_sc.hrc
-//#define RID_SCDLG_ASCII 256
-#define RB_SEPARATED 1
-#define RB_FIXED 2
-#define FT_CHARSET 3
-#define LB_CHARSET 4
-#define FL_SEPOPT 5
-#define FT_FIELDSEP 6
-#define CB_FIELDSEP 7
-#define FT_TEXTSEP 8
-#define CB_TEXTSEP 9
-#define FL_FIELDOPT 10
-#define FT_TYPE 12
-#define FT_PREVIEW 13
-#define LB_TYPE1 23
-#define FL_WIDTH 30
-#define BTN_OK 31
-#define BTN_CANCEL 32
-#define BTN_HELP 33
-#define CTR_TABLEBOX 41
-#define CKB_TAB 51
-#define CKB_SPACE 52
-#define CKB_SEMICOLON 53
-#define CKB_COMMA 54
-#define CKB_OTHER 55
-#define ED_OTHER 56
-#define FT_AT_ROW 59
-#define NF_AT_ROW 60
-#define CB_ASONCE
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/ui/docshell/makefile.mk |1
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 94 ---
binfilter/bf_sc/source/ui/docshell/sc_impex.cxx | 569
binfilter/bf_sc/source/ui/inc/impex.hxx | 126 -
4 files changed, 3 insertions(+), 787 deletions(-)
New commits:
commit 79a1602c0a460cb85413f872d3a8574d23c51b42
Author: Eike Rathke er...@redhat.com
Date: Thu Apr 5 21:33:41 2012 +0200
removed dead code that used to handle Calc text imports
diff --git a/binfilter/bf_sc/source/ui/docshell/makefile.mk
b/binfilter/bf_sc/source/ui/docshell/makefile.mk
index 400d470..a462a94 100644
--- a/binfilter/bf_sc/source/ui/docshell/makefile.mk
+++ b/binfilter/bf_sc/source/ui/docshell/makefile.mk
@@ -51,7 +51,6 @@ SLOFILES = \
$(SLO)$/sc_arealink.obj\
$(SLO)$/sc_dbdocfun.obj\
$(SLO)$/sc_dbdocimp.obj\
-$(SLO)$/sc_impex.obj \
$(SLO)$/sc_docfunc.obj \
$(SLO)$/sc_pntlock.obj \
$(SLO)$/sc_sizedev.obj \
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 88b1c31..468f2bb 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -54,7 +54,6 @@
#include filter.hxx
#include scmod.hxx
#include docfunc.hxx
-#include impex.hxx
#include scresid.hxx
#include bf_sc.hrc
#include globstr.hrc
@@ -536,96 +535,6 @@ static const sal_Char pFilterRtf[] = Rich Text
Format (StarCalc);
/*?*/ else
/*?*/ OSL_FAIL(Calc3/4: kein Storage);
/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterAscii))
-/*N*/ {
-/*N*/ SfxItemSet* pSet = rMedium.GetItemSet();
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ ScAsciiOptions aOptions;
-/*N*/ BOOL bOptInit = FALSE;
-/*N*/
-/*N*/ if ( pSet SFX_ITEM_SET ==
-/*N*/pSet-GetItemState( SID_FILE_FILTEROPTIONS, TRUE, pItem
) )
-/*N*/ {
-/*N*/ aOptions.ReadFromString( ((const
SfxStringItem*)pItem)-GetValue() );
-/*N*/ bOptInit = TRUE;
-/*N*/ }
-/*N*/
-/*N*/ if ( !bOptInit )
-/*N*/ {
-/*?*/ // default for ascii import (from API without options):
-/*?*/ // ISO8859-1/MS_1252 encoding, comma, double quotes
-/*?*/
-/*?*/ aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 );
-/*?*/ aOptions.SetFieldSeps( (sal_Unicode) ',' );
-/*?*/ aOptions.SetTextSep( (sal_Unicode) '' );
-/*N*/ }
-/*N*/
-/*N*/ FltError eError = eERR_OK;
-/*N*/ BOOL bOverflow = FALSE;
-/*N*/
-/*N*/ if( ! rMedium.IsStorage() )
-/*N*/ {
-/*N*/ ScImportExport aImpEx( aDocument );
-/*N*/ aImpEx.SetExtOptions( aOptions );
-/*N*/
-/*N*/ SvStream* pInStream = rMedium.GetInStream();
-/*N*/ if (pInStream)
-/*N*/ {
-/*N*/ pInStream-SetStreamCharSet( aOptions.GetCharSet() );
-/*N*/ pInStream-Seek( 0 );
-/*N*/ bRet = aImpEx.ImportStream( *pInStream );
-/*N*/ eError = bRet ? eERR_OK : SCERR_IMPORT_CONNECT;
-/*N*/ aDocument.StartAllListeners();
-/*N*/ aDocument.SetDirty();
-/*N*/ bOverflow = aImpEx.IsOverflow();
-/*N*/ }
-/*N*/ else
-/*N*/ OSL_FAIL( No Stream );
-/*N*/ }
-/*N*/
-/*N*/ if (eError != eERR_OK)
-/*N*/ {
-/*N*/ if (!GetError())
-/*N*/ SetError(eError);
-/*N*/ }
-/*N*/ else if ( bOverflow )
-/*N*/ {
-/*N*/ if (!GetError())
-/*N*/ SetError(SCWARN_IMPORT_RANGE_OVERFLOW);
-/*N*/ }
-/*N*/ bSetColWidths = TRUE;
-/*N*/ bSetSimpleTextColWidths = TRUE;
-/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterDif))
-/*N*/ {
-/*?*/ bSetColWidths = TRUE;
-/*?*/ bSetSimpleTextColWidths = TRUE;
-/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterSylk))
-/*N*/ {
-/*?*/ FltError eError = SCERR_IMPORT_UNKNOWN;
-/*?*/ if( !rMedium.IsStorage() )
-/*?*/ {
-/*?*/ ScImportExport aImpEx( aDocument );
-/*?*/
-/*?*/ SvStream* pInStream = rMedium.GetInStream();
-/*?*/ if (pInStream)
-/*?*/ {
-/*?*/ pInStream-Seek( 0 );
-/*?*/ bRet = aImpEx.ImportStream( *pInStream,
SOT_FORMATSTR_ID_SYLK );
-/*?*/ eError = bRet ? eERR_OK : SCERR_IMPORT_UNKNOWN;
-/*?*/ aDocument.StartAllListeners();
-/*?*/ aDocument.SetDirty();
-/*?*/ }
-/*?*/ else
-/*?*/ OSL_FAIL( No
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_svtools binfilter/inc
binfilter/bf_sc/source/core/inc/ddelink.hxx|3 -
binfilter/bf_sc/source/core/tool/sc_rechead.cxx| 31 --
binfilter/bf_svtools/source/memtools/tl_unqidx.cxx | 62 -
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 23 ---
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 23 +++
binfilter/inc/bf_sc/cell.hxx |3 -
binfilter/inc/bf_sc/chgtrack.hxx |9 ---
binfilter/inc/bf_sc/column.hxx |2
binfilter/inc/bf_sc/conditio.hxx |5 -
binfilter/inc/bf_sc/dbcolect.hxx |4 -
binfilter/inc/bf_sc/dpobject.hxx |1
binfilter/inc/bf_sc/olinetab.hxx |3 -
binfilter/inc/bf_sc/pivot.hxx |2
binfilter/inc/bf_sc/rangenam.hxx |4 -
binfilter/inc/bf_sc/rechead.hxx| 14
binfilter/inc/bf_sc/validat.hxx|2
binfilter/inc/bf_tools/string.hxx |1
17 files changed, 23 insertions(+), 169 deletions(-)
New commits:
commit 3419df8d8ad9c2e514a19dfb681d8a5ee009
Author: Caolán McNamara caol...@redhat.com
Date: Thu Mar 1 09:32:12 2012 +
drop ScMultipleWriteHeader
diff --git a/binfilter/bf_sc/source/core/inc/ddelink.hxx
b/binfilter/bf_sc/source/core/inc/ddelink.hxx
index 4c09e17..5db1af8 100644
--- a/binfilter/bf_sc/source/core/inc/ddelink.hxx
+++ b/binfilter/bf_sc/source/core/inc/ddelink.hxx
@@ -36,7 +36,6 @@ namespace binfilter {
class ScDocument;
class ScMatrix;
class ScMultipleReadHeader;
-class ScMultipleWriteHeader;
class ScDdeLink : public ::binfilter::SvBaseLink, public SfxBroadcaster
{
@@ -63,8 +62,6 @@ public:
ScDdeLink( ScDocument* pD, SvStream rStream,
ScMultipleReadHeader rHdr );
virtual ~ScDdeLink();
-void Store( SvStream, ScMultipleWriteHeader ) const {}
-
// von SvBaseLink ueberladen:
virtual voidDataChanged( const String rMimeType,
const ::com::sun::star::uno::Any rValue );
diff --git a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
index 695d22a..ce966ee 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rechead.cxx
@@ -181,37 +181,6 @@ namespace binfilter {
/*N*/ return 0;
/*N*/ }
-// ---
-
-/*N*/ ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream rNewStream,
sal_uInt32 nDefault) :
-/*N*/ rStream( rNewStream ),
-/*N*/ aMemStream( 4096, 4096 )
-/*N*/ {
-/*N*/ nDataSize = nDefault;
-/*N*/ rStream nDataSize;
-/*N*/
-/*N*/ nDataPos = rStream.Tell();
-/*N*/ nEntryStart = nDataPos;
-/*N*/ }
-
-/*N*/ ScMultipleWriteHeader::~ScMultipleWriteHeader()
-/*N*/ {
-/*N*/ ULONG nDataEnd = rStream.Tell();
-/*N*/
-/*N*/ rStream (USHORT) SCID_SIZES;
-/*N*/ rStream static_castsal_uInt32(aMemStream.Tell());
-/*N*/ rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
-/*N*/
-/*N*/ if ( nDataEnd - nDataPos != nDataSize ) // Default
getroffen?
-/*N*/ {
-/*N*/ nDataSize = nDataEnd - nDataPos;
-/*N*/ ULONG nPos = rStream.Tell();
-/*N*/ rStream.Seek(nDataPos-sizeof(sal_uInt32));
-/*N*/ rStream nDataSize; // Groesse am
Anfang eintragen
-/*N*/ rStream.Seek(nPos);
-/*N*/ }
-/*N*/ }
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
index 3356ccd..66ebdf8 100644
--- a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
@@ -98,31 +98,6 @@ sal_uIntPtr UniqueIndex::Insert( void* p )
/*
|*
-|*UniqueIndex::Insert()
-|*
-*/
-
-sal_uIntPtr UniqueIndex::Insert( sal_uIntPtr nIndex, void* p )
-{
-// NULL-Pointer ist nicht erlaubt
-if ( !p )
-return UNIQUEINDEX_ENTRY_NOTFOUND;
-
-sal_uIntPtr nContIndex = nIndex - nStartIndex;
-// Ist Array voll, dann expandieren
-if ( nContIndex = Container::GetSize() )
-SetSize( nContIndex + nReSize );
-
-// Object im Array speichern
-Container::Replace( p, nContIndex );
-
-// Anzahl der Eintraege erhoehen und Index zurueckgeben
-nCount++;
-return nIndex;
-}
-
-/*
-|*
|*UniqueIndex::Remove()
|*
*/
@@ -146,22 +121,6 @@ void* UniqueIndex::Remove( sal_uIntPtr nIndex )
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sw binfilter/inc
binfilter/bf_sc/source/core/tool/sc_interpr5.cxx|2 +-
binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx|2 +-
binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx |1 -
binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx |2 +-
binfilter/inc/bf_svx/numitem.hxx|4 +---
5 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit d09cf17a6c791228370f3f534ba058325cc0c4f5
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 27 12:43:23 2012 +
some windows warnings
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
index 99a8ef6..d59dd4d 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr5.cxx
@@ -2443,7 +2443,7 @@ void ScInterpreter::ScRGP()
return;
}
BYTE nCase; // 1 = normal, 2,3 = mehrfach
-USHORT nCX, nRX, nCY, nRY, M, N;
+USHORT nCX, nRX, nCY, nRY, M(0), N(0);
pMatY-GetDimensions(nCY, nRY);
ULONG nCountY = (ULONG) nCY * nRY;
for ( ULONG i = 0; i nCountY; i++ )
diff --git a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
index a0c8573..531a923 100644
--- a/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_rangeutl.cxx
@@ -107,7 +107,7 @@ namespace binfilter {
/*N*/ {
/*N*/ BOOL bResult=FALSE;
/*N*/ ScRangeUtil aRangeUtil;
-/*N*/ USHORT nTab, nColStart, nColEnd, nRowStart, nRowEnd;
+/*N*/ USHORT nTab(0), nColStart(0), nColEnd(0), nRowStart(0),
nRowEnd(0);
/*N*/
/*N*/ if( eScope==RUTL_NAMES )
/*N*/ {
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
index 17972e6..1730d6b 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_miscuno.cxx
@@ -320,7 +320,6 @@ sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( )
throw(::com::sun::star::uno
return xNameAccess-getByName( aNames.getConstArray()[nIndex] );
throw lang::IndexOutOfBoundsException();
-return uno::Any();
}
// XElementAccess
diff --git a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
index 8ebf9e9..66a62fb 100644
--- a/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
+++ b/binfilter/bf_sw/source/filter/excel/sw_excimpop.cxx
@@ -170,7 +170,7 @@ void SwExcelParser::Label25()
// -- 0x06
void SwExcelParser::Formula25()
{
-UINT16 nRow, nCol, nXF, nFormLen;
+UINT16 nRow, nCol, nXF(0), nFormLen;
double fCurVal;
BYTE nAttr0, nFlag0;
diff --git a/binfilter/inc/bf_svx/numitem.hxx b/binfilter/inc/bf_svx/numitem.hxx
index 2159420..f21c0a5 100644
--- a/binfilter/inc/bf_svx/numitem.hxx
+++ b/binfilter/inc/bf_svx/numitem.hxx
@@ -140,13 +140,11 @@ class SvxNumberFormat : public SvxNumberType
BitmapEx* pScaledImageCache; // Image scaled to aGraphicSize,
only cached for WINDOW/VDEV
-// void GetCharStr( ULONG nNo, String rStr ) const;
-// void GetCharStrN( ULONG nNo, String rStr ) const;
public:
SvxNumberFormat(sal_Int16 nNumberingType);
SvxNumberFormat(const SvxNumberFormat rFormat);
SvxNumberFormat(SvStream rStream);
-~SvxNumberFormat();
+virtual ~SvxNumberFormat();
SvStream Store(SvStream rStream, FontToSubsFontConverter) { return
rStream; }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sch binfilter/bf_sd binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw
binfilter/bf_sc/source/core/data/sc_documen2.cxx |2 +-
binfilter/bf_sc/source/core/data/sc_document.cxx |2 +-
binfilter/bf_sc/source/core/tool/sc_autoform.cxx |2 +-
binfilter/bf_sch/source/core/sch_chtmode2.cxx|2 +-
binfilter/bf_sch/source/core/sch_memchrt.cxx |6 ++
binfilter/bf_sd/source/core/sd_anminfo.cxx |2 +-
binfilter/bf_sd/source/core/sd_cusshow.cxx |4 ++--
binfilter/bf_sd/source/core/sd_drawdoc.cxx |4 ++--
binfilter/bf_sd/source/core/sd_sdpage2.cxx |4 ++--
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx|4 ++--
binfilter/bf_so3/source/data/pseudo.cxx | 11 ---
binfilter/bf_so3/source/inplace/client.cxx |6 ++
binfilter/bf_so3/source/inplace/embobj.cxx |9 ++---
binfilter/bf_so3/source/inplace/ipclient.cxx | 10 ++
binfilter/bf_so3/source/inplace/ipobj.cxx| 10 ++
binfilter/bf_so3/source/misc/iface.cxx |8 ++--
binfilter/bf_so3/source/persist/persist.cxx | 12
binfilter/bf_so3/source/persist/svstor.cxx | 17 -
binfilter/bf_svtools/source/items/svt_style.cxx |6 ++
binfilter/bf_svx/source/editeng/svx_editobj.cxx |2 +-
binfilter/bf_svx/source/items/svx_bulitem.cxx|2 +-
binfilter/bf_svx/source/items/svx_textitem.cxx |2 +-
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx | 16
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx |2 +-
binfilter/bf_svx/source/svdraw/svx_svdview.cxx |4 ++--
binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx |3 +--
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |9 +++--
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx |6 ++
binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx |5 ++---
29 files changed, 61 insertions(+), 111 deletions(-)
New commits:
commit 258ba2fb484d5e1bb4a3aca3991b3b66ea915a10
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Jan 21 15:29:29 2012 +0100
Removed some unused parameters.
diff --git a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
index 14b4809..930e0a3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen2.cxx
@@ -580,7 +580,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG )
/*N*/ rStream cGUI cSet;
/*N*/ eSrcSet = (CharSet) cSet;
/*N*/ rStream.SetStreamCharSet(
::GetSOLoadTextEncoding(
-/*N*/ eSrcSet, (USHORT)rStream.GetVersion() ) );
+/*N*/ eSrcSet ) );
/*N*/ }
/*N*/ break;
/*?*/ case SCID_LINKUPMODE: //Link Update Mode
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 1f00d00..26187a7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -2428,7 +2428,7 @@ namespace binfilter {
/*N*/ rStream cGUI cSet;
/*N*/ eSrcSet = (CharSet) cSet;
/*N*/ rStream.SetStreamCharSet(
::GetSOLoadTextEncoding(
-/*N*/ eSrcSet, (USHORT)rStream.GetVersion() ) );
+/*N*/ eSrcSet ) );
/*N*/ }
/*N*/ break;
/*N*/ case SCID_DOCPOOL:
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index e911df3..1dbc3b6 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -653,7 +653,7 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ DBG_ERRORFILE( Der Header enthaelt mehr/neuere Daten
);
/*N*/ rStream.Seek( nPos + nCnt );
/*N*/ }
-/*N*/ rStream.SetStreamCharSet( GetSOLoadTextEncoding(
nChrSet, nFileVers ) );
+/*N*/ rStream.SetStreamCharSet( GetSOLoadTextEncoding( nChrSet
) );
/*N*/ rStream.SetVersion( nFileVers );
/*N*/ }
/*N*/
diff --git a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
index 1de45ba..2a7aef4 100644
--- a/binfilter/bf_sch/source/core/sch_chtmode2.cxx
+++ b/binfilter/bf_sch/source/core/sch_chtmode2.cxx
@@ -1150,7 +1150,7 @@ enum ChartStyleV0
/*N*/
/*N*/ // aInfo is a member of SdrModel
/*N*/ // the SdrModel was read before this, so the value is set
-/*N*/ rtl_TextEncoding eSysSet = ::GetSOLoadTextEncoding(
aInfo.eLastReadCharSet, rIn.GetVersion());
+/*N*/ rtl_TextEncoding eSysSet = ::GetSOLoadTextEncoding(
aInfo.eLastReadCharSet );
/*N*/ rIn.SetStreamCharSet( eSysSet );
/*N*/ // Note: The CharSet is stored in
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff
binfilter/bf_sc/source/core/data/sc_document.cxx |5 --
binfilter/bf_sc/source/core/tool/sc_addincol.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_compiler.cxx |4 -
binfilter/bf_sc/source/core/tool/sc_interpr1.cxx | 10 +---
binfilter/bf_sc/source/core/tool/sc_interpr4.cxx |2
binfilter/bf_sc/source/core/tool/sc_userlist.cxx |7 +--
binfilter/bf_sc/source/ui/unoobj/sc_funcuno.cxx |2
binfilter/bf_sfx2/source/bastyp/sfx2_fltfnc.cxx |2
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx | 18
binfilter/bf_svtools/source/numbers/svt_zforlist.cxx |2
binfilter/bf_svtools/source/numbers/svt_zformat.cxx |6 +-
binfilter/bf_svtools/source/numbers/svt_zforscan.cxx | 40 +--
binfilter/bf_svx/source/items/svx_svxfont.cxx|6 +-
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 18 +++-
binfilter/bf_sw/source/core/doc/sw_docdde.cxx|8 +--
binfilter/bf_sw/source/core/doc/sw_docfld.cxx|2
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx |2
17 files changed, 65 insertions(+), 73 deletions(-)
New commits:
commit a4a9f044294ae2afad3ecee138c771a3654add98
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 6 23:09:49 2012 +
track changes to CharClass
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index dc9b4ea..1f00d00 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -132,15 +132,14 @@ namespace binfilter {
/*N*/ BOOL ScDocument::GetTable( const String rName, USHORT rTab ) const
/*N*/ {
-/*N*/ String aUpperName = rName;
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperName);
+/*N*/ String aUpperName = ScGlobal::pCharClass-uppercase(rName);
/*N*/ String aCompName;
/*N*/
/*N*/ for (USHORT i=0; i=MAXTAB; i++)
/*N*/ if (pTab[i])
/*N*/ {
/*N*/ pTab[i]-GetName( aCompName );
-/*N*/ ScGlobal::pCharClass-toUpper(aCompName);
+/*N*/ aCompName = ScGlobal::pCharClass-uppercase(aCompName);
/*N*/ if (aUpperName == aCompName)
/*N*/ {
/*N*/ rTab = i;
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 0fbac52..f409574 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -170,8 +170,8 @@ public:
/*N*/ else
/*N*/ pArgDescs = NULL;
/*N*/
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperName);
-/*N*/ ScGlobal::pCharClass-toUpper(aUpperLocal);
+/*N*/ aUpperName = ScGlobal::pCharClass-uppercase(aUpperName);
+/*N*/ aUpperLocal = ScGlobal::pCharClass-uppercase(aUpperLocal);
/*N*/ }
/*N*/ ScUnoAddInFuncData::~ScUnoAddInFuncData()
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index e67a51f..3653762 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -1467,7 +1467,7 @@ namespace binfilter {
/*N*/ bMayBeFuncName = TRUE; // operators and other
opcodes
/*N*/
/*N*/ String aOrg( cSymbol ); // evtl. Dateinamen in IsReference
erhalten
-/*N*/ String aUpper( ScGlobal::pCharClass-upper( aOrg ) );
+/*N*/ String aUpper( ScGlobal::pCharClass-uppercase( aOrg ) );
/*N*/ // Spalte DM konnte nicht referiert werden, IsReference vor
IsValue
/*N*/ // #42016# italian ARCTAN.2 gab #REF! = IsOpCode vor
IsReference
/*N*/ if ( !(bMayBeFuncName IsOpCode( aUpper ))
@@ -1482,7 +1482,7 @@ namespace binfilter {
/*N*/ SetError( errNoName );
/*N*/ if ( bAutoCorrect )
/*N*/ { // provide single token information and continue
-/*?*/ ScGlobal::pCharClass-toLower( aUpper );
+/*?*/ aUpper = ScGlobal::pCharClass-lowercase( aUpper );
/*?*/ aToken.SetString( aUpper.GetBuffer() );
/*?*/ aToken.NewOpCode( ocBad );
/*?*/ pRawToken = aToken.Clone();
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
index 5b33047..9eb51bd 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr1.cxx
@@ -1657,8 +1657,7 @@ void ScInterpreter::ScTrim()
void ScInterpreter::ScUpper()
{
-String aString = GetString();
-ScGlobal::pCharClass-toUpper(aString);
+String aString = ScGlobal::pCharClass-uppercase(GetString());
PushString(aString);
}
@@ -1672,8 +1671,8 @@ void ScInterpreter::ScPropper()
// (would crash now that the empty string is const)
if ( nLen 0 )
{
-String aUpr(
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 64926061f538f0a6e2cd1f6b824b9b864db744c1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 20 15:20:26 2011 +
WaE: possibly uninitialized
diff --git a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
index 6f6b2d0..c05989f 100644
--- a/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
+++ b/binfilter/bf_sc/source/filter/xml/sc_XMLExportDatabaseRanges.cxx
@@ -146,7 +146,7 @@ void ScXMLExportDatabaseRanges::WriteImportDescriptor(const
uno::Sequence beans
sal_Int32 nProperties = aImportDescriptor.getLength();
::rtl::OUString sDatabaseName;
::rtl::OUString sSourceObject;
-sheet::DataImportMode nSourceType;
+sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE;
sal_Bool bNative = sal_False;
for (sal_Int16 i = 0; i nProperties; i++)
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_svtools binfilter/inc
binfilter/bf_sc/source/filter/xml/xmlfilti.hxx|2
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx |1
binfilter/inc/bf_sc/chgtrack.hxx |2
binfilter/inc/bf_starmath/parse.hxx |2
binfilter/inc/bf_tools/stack.hxx | 107 ++
5 files changed, 110 insertions(+), 4 deletions(-)
New commits:
commit f10b863248237e9878bb7e3603016d21f1868b93
Author: Eike Rathke er...@redhat.com
Date: Mon Dec 5 21:46:05 2011 +0100
moved tools/inc/tools/stack.hxx to binfilter/inc/bf_tools/
* in stack.hxx, included bf_tools/contnr.hxx instead of tools/contnr.hxx
* in stack.hxx, placed class Stack in namespace binfilter
* changed include tools/stack.hxx to bf_tools/stack.hxx
diff --git a/binfilter/bf_sc/source/filter/xml/xmlfilti.hxx
b/binfilter/bf_sc/source/filter/xml/xmlfilti.hxx
index cca2708..7f356dc 100644
--- a/binfilter/bf_sc/source/filter/xml/xmlfilti.hxx
+++ b/binfilter/bf_sc/source/filter/xml/xmlfilti.hxx
@@ -28,13 +28,13 @@
#ifndef SC_XMLFILTI_HXX
#define SC_XMLFILTI_HXX
+#include bf_tools/stack.hxx
#include bf_xmloff/xmlictxt.hxx
#include bf_xmloff/xmlimp.hxx
#include com/sun/star/table/CellAddress.hpp
#include com/sun/star/table/CellRangeAddress.hpp
#include com/sun/star/sheet/FilterOperator.hpp
#include com/sun/star/sheet/TableFilterField.hpp
-#include tools/stack.hxx
#include xmldrani.hxx
#include xmldpimp.hxx
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
index eee90f4..92e47a0 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -40,7 +40,6 @@
#include sot/object.hxx
#include boost/shared_ptr.hpp
#include tools/debug.hxx
-#include tools/stack.hxx
#include tools/table.hxx
#include vcl/graph.hxx
#include vcl/virdev.hxx
diff --git a/binfilter/inc/bf_sc/chgtrack.hxx b/binfilter/inc/bf_sc/chgtrack.hxx
index ed7870b..195c4ef 100644
--- a/binfilter/inc/bf_sc/chgtrack.hxx
+++ b/binfilter/inc/bf_sc/chgtrack.hxx
@@ -36,8 +36,8 @@
#include tools/datetime.hxx
#include tools/table.hxx
-#include tools/stack.hxx
#include tools/mempool.hxx
+#include bf_tools/stack.hxx
#include bf_svtools/lstner.hxx
#include bigrange.hxx
diff --git a/binfilter/inc/bf_starmath/parse.hxx
b/binfilter/inc/bf_starmath/parse.hxx
index 0ccd4a8..e670b91 100644
--- a/binfilter/inc/bf_starmath/parse.hxx
+++ b/binfilter/inc/bf_starmath/parse.hxx
@@ -28,11 +28,11 @@
#ifndef PARSE_HXX
#define PARSE_HXX
+#include bf_tools/stack.hxx
#include bf_svtools/bf_solar.h
#include vcl/svapp.hxx
-#include tools/stack.hxx
#include vector
namespace binfilter {
diff --git a/binfilter/inc/bf_tools/stack.hxx b/binfilter/inc/bf_tools/stack.hxx
new file mode 100644
index 000..5d76b53
--- /dev/null
+++ b/binfilter/inc/bf_tools/stack.hxx
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#ifndef _BF_STACK_HXX
+#define _BF_STACK_HXX
+
+#include bf_tools/contnr.hxx
+
+namespace binfilter {
+
+// -
+// - Stack -
+// -
+
+#define STACK_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
+
+class Stack : private Container
+{
+public:
+using Container::Clear;
+using Container::Count;
+using Container::GetObject;
+using Container::GetPos;
+
+Stack( sal_uInt16 _nInitSize = 16, sal_uInt16 _nReSize = 16 ) :
+Container( CONTAINER_MAXBLOCKSIZE, _nInitSize, _nReSize ) {}
+Stack( const Stack rStack ) : Container( rStack ) {}
+
+voidPush( void* p ) { Container::Insert( p, CONTAINER_APPEND ); }
+void* Pop() { return Container::Remove( Count()-1 ); }
+
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_so3 binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/bf_xmloff binfilter/inc
binfilter/bf_sc/source/core/data/sc_attrib.cxx |2 +-
binfilter/bf_sc/source/core/data/sc_global2.cxx |2 +-
binfilter/bf_sc/source/core/data/sc_stlpool.cxx |2 +-
binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx|5 +
binfilter/bf_sc/source/core/tool/sc_editutil.cxx|3 +++
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx|6 +++---
binfilter/bf_sc/source/filter/xml/sc_xmlimprt.cxx |4 ++--
binfilter/bf_sc/source/ui/view/sc_printfun.cxx |2 +-
binfilter/bf_sfx2/source/appl/appimp.hxx|2 ++
binfilter/bf_sfx2/source/doc/sfx2_docfile.cxx |2 +-
binfilter/bf_sfx2/source/doc/sfx2_docinf.cxx|6 +-
binfilter/bf_sfx2/source/doc/sfx2_objcont.cxx |2 +-
binfilter/bf_sfx2/source/doc/sfx2_objmisc.cxx |2 +-
binfilter/bf_sfx2/source/doc/sfx2_xmlversion.cxx|2 +-
binfilter/bf_sfx2/source/doc/timestamp.cxx |4 ++--
binfilter/bf_sfx2/source/inc/objshimp.hxx |2 +-
binfilter/bf_so3/source/persist/persist.cxx |3 ++-
binfilter/bf_svtools/source/items1/svt_dateitem.cxx |2 +-
binfilter/bf_svtools/source/items1/svt_dtritem.cxx |2 +-
binfilter/bf_svtools/source/items1/svt_frqitem.cxx |6 --
binfilter/bf_svtools/source/numbers/svt_zforfind.cxx|4 ++--
binfilter/bf_svx/source/engine3d/svx_scene3d.cxx|2 +-
binfilter/bf_svx/source/items/svx_flditem.cxx |4 ++--
binfilter/bf_svx/source/svdraw/svx_svdmodel.cxx |8 ++--
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx |1 +
binfilter/bf_svx/source/svdraw/svx_svdotxln.cxx |1 +
binfilter/bf_sw/source/core/doc/sw_docnum.cxx |4 ++--
binfilter/bf_sw/source/core/fields/sw_flddat.cxx|8
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx |6 +++---
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx |4 ++--
binfilter/bf_sw/source/core/swg/sw_rdflds.cxx |4 ++--
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx |3 ++-
binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx |9
++---
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx |2 +-
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx |2 +-
binfilter/bf_xmloff/source/forms/xmloff_propertyexport.cxx |4 ++--
binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx |2 +-
binfilter/bf_xmloff/source/meta/xmloff_xmlmetai.cxx |4 ++--
binfilter/inc/bf_sc/chgviset.hxx|4
39 files changed, 84 insertions(+), 53 deletions(-)
New commits:
commit 3a6e9e2dd7fb6c0e71eed13d4f70b05b9f832ace
Author: Eike Rathke er...@redhat.com
Date: Thu Dec 1 19:07:16 2011 +0100
get rid of class Date and Time default ctor with system time penalty
diff --git a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
index d1cf0f1..a88fbd0 100644
--- a/binfilter/bf_sc/source/core/data/sc_attrib.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_attrib.cxx
@@ -689,7 +689,7 @@ using namespace ::com::sun::star;
/*N*/ while ((nPos = aStr.Search(pCommands[2])) != STRING_NOTFOUND)
/*N*/ {
/*N*/ ESelection aSel( nPar,nPos, nPar,nPos+pCommands[2].Len() );
-/*N*/ rEng.QuickInsertField(
SvxFieldItem(SvxDateField(Date(),SVXDATETYPE_VAR)), aSel );
+/*N*/ rEng.QuickInsertField( SvxFieldItem(SvxDateField(Date(
Date::SYSTEM),SVXDATETYPE_VAR)), aSel );
/*N*/ lcl_SetSpace(aStr, aSel ); bChange = TRUE;
/*N*/ }
/*N*/ while ((nPos = aStr.Search(pCommands[3])) != STRING_NOTFOUND)
diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx
b/binfilter/bf_sc/source/core/data/sc_global2.cxx
index a186de3..5ebe7a0 100644
--- a/binfilter/bf_sc/source/core/data/sc_global2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx
@@ -824,7 +824,7 @@ namespace binfilter {
/*N*/ void ScPostIt::AutoSetText( const String rNewText )
/*N*/ {
/*N*/ aStrText = rNewText;
-/*N*/ aStrDate = ScGlobal::pLocaleData-getDate( Date() );
+/*N*/ aStrDate = ScGlobal::pLocaleData-getDate( Date( Date::SYSTEM ) );
/*N*/
/*N*/ SvtUserOptions aUserOpt;
/*N*/ aStrAuthor = aUserOpt.GetID();
diff --git a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
index 4040eb9..2f13acc 100644
--- a/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_stlpool.cxx
@@ -378,7 +378,7 @@ namespace binfilter {
/*N*/
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svtools
binfilter/bf_sc/source/core/tool/sc_interpr2.cxx|2 +-
binfilter/bf_sfx2/source/doc/timestamp.cxx |2 +-
binfilter/bf_svtools/source/items1/svt_dateitem.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1f9150ab1bbb121c59014fba7c7cd229aceeeb66
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 30 02:06:12 2011 +0100
renamed Date::IsValid() to IsValidAndGregorian() to prevent misassumptions
diff --git a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
index e585be3..edb639f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_interpr2.cxx
@@ -75,7 +75,7 @@ namespace binfilter {
/*N*/ }
/*N*/ Date aDate(1, nM, nY);
/*N*/ aDate += nDay - 1;
-/*N*/ if (aDate.IsValid())
+/*N*/ if (aDate.IsValidAndGregorian())
/*N*/ return (double) (aDate - *(pFormatter-GetNullDate()));
/*N*/ else
/*N*/ {
diff --git a/binfilter/bf_sfx2/source/doc/timestamp.cxx
b/binfilter/bf_sfx2/source/doc/timestamp.cxx
index 6c42d1e..233ec59 100644
--- a/binfilter/bf_sfx2/source/doc/timestamp.cxx
+++ b/binfilter/bf_sfx2/source/doc/timestamp.cxx
@@ -186,7 +186,7 @@ BOOL TimeStamp::IsValid () const
// The name can have a defaultvalue!
// And its better to safe this result in a local variable ... for better
debug! (to see value)
BOOL bResult = ( m_aModifiedDateTime != TIMESTAMP_INVALID_DATETIME ) ;
-return bResult m_aModifiedDateTime.IsValid();
+return bResult m_aModifiedDateTime.IsValidAndGregorian();
}
diff --git a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
index 61f74b7..38abd6b 100644
--- a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx
@@ -137,7 +137,7 @@ SfxItemPresentation SfxDateTimeItem::GetPresentation
) const
{
DBG_CHKTHIS(SfxDateTimeItem, 0);
-if (aDateTime.IsValid())
+if (aDateTime.IsValidAndGregorian())
if (pIntlWrapper)
{
rText = pIntlWrapper-getLocaleData()-getDate(aDateTime);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sfx2 binfilter/bf_svx binfilter/inc
binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx |2 +-
binfilter/bf_sfx2/source/view/sfx2_printer.cxx |4 ++--
binfilter/bf_svx/source/items/svx_paperinf.cxx |2 +-
binfilter/inc/bf_sfx2/printer.hxx| 10 +-
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 7ed11d215072e770cdf9b67eb576abb88d73ac5e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Nov 21 10:07:32 2011 +
fix build error
diff --git a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
index 7482982..1f4256a 100644
--- a/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
+++ b/binfilter/bf_sc/source/ui/unoobj/sc_styleuno.cxx
@@ -1692,7 +1692,7 @@ void ScStyleObj::SetOnePropertyValue( const
SfxItemPropertyMap* pMap, const uno:
Printer* pPrinter =
pDocShell-GetPrinter();
if (pPrinter)
{
-String aNameStr = aName;
+rtl::OUString aNameStr = aName;
USHORT nCount =
pPrinter-GetPaperBinCount();
for (USHORT i=0; inCount; i++)
if ( aNameStr ==
pPrinter-GetPaperBinName(i) )
diff --git a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
index f78891b..b03061f 100644
--- a/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
+++ b/binfilter/bf_sfx2/source/view/sfx2_printer.cxx
@@ -52,7 +52,7 @@ namespace binfilter {
//
-/*N*/ SfxFont::SfxFont( const FontFamily eFontFamily, const String aFontName,
+/*N*/ SfxFont::SfxFont( const FontFamily eFontFamily, const rtl::OUString
aFontName,
/*N*/ const FontPitch eFontPitch, const CharSet eFontCharSet ):
/*N*/ aName( aFontName ),
/*N*/ eFamily( eFontFamily ),
@@ -130,7 +130,7 @@ namespace binfilter {
//
/*N*/ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions,
-/*N*/ const String rPrinterName ) :
+/*N*/ const rtl::OUString rPrinterName ) :
/*N*/
/*N*/ Printer ( rPrinterName ),
/*N*/ pOptions( pTheOptions ),
diff --git a/binfilter/bf_svx/source/items/svx_paperinf.cxx
b/binfilter/bf_svx/source/items/svx_paperinf.cxx
index ec82c60..4c9e631 100644
--- a/binfilter/bf_svx/source/items/svx_paperinf.cxx
+++ b/binfilter/bf_svx/source/items/svx_paperinf.cxx
@@ -115,7 +115,7 @@ static const int nTabSize = SAL_N_ELEMENTS(aDinTab);
/*?*/ inline BOOL IsValidPrinter( const Printer* pPtr )
/*?*/ {
-/*?*/ return pPtr-GetName().Len() ? TRUE : FALSE;
+/*?*/ return pPtr-GetName().getLength() ? TRUE : FALSE;
/*?*/ }
/*
diff --git a/binfilter/inc/bf_sfx2/printer.hxx
b/binfilter/inc/bf_sfx2/printer.hxx
index 519f1d4..9862249 100644
--- a/binfilter/inc/bf_sfx2/printer.hxx
+++ b/binfilter/inc/bf_sfx2/printer.hxx
@@ -59,7 +59,7 @@ struct SfxPrinter_Impl;
class SfxFont
{
private:
-String aName;
+rtl::OUString aName;
FontFamily eFamily;
FontPitch ePitch;
CharSet eCharSet;
@@ -68,11 +68,11 @@ private:
public:
SfxFont( const FontFamily eFam,
- const String aName,
+ const rtl::OUString aName,
const FontPitch eFontPitch = PITCH_DONTKNOW,
const CharSet eFontCharSet = RTL_TEXTENCODING_DONTKNOW );
// ZugriffsMethoden:
-inline const StringGetName() const { return aName; }
+inline const rtl::OUString GetName() const { return aName; }
inline FontFamily GetFamily() const { return eFamily; }
inline FontPitchGetPitch() const { return ePitch; }
inline CharSet GetCharSet() const { return eCharSet; }
@@ -92,11 +92,11 @@ private:
public:
SfxPrinter( SfxItemSet *pTheOptions );
SfxPrinter( SfxItemSet *pTheOptions,
-const String rPrinterName );
+const rtl::OUString rPrinterName );
SfxPrinter( SfxItemSet *pTheOptions,
const JobSetup rTheOrigJobSetup );
SfxPrinter( SfxItemSet *pTheOptions,
-const String rPrinterName,
+const rtl::OUString rPrinterName,
const JobSetup rTheOrigJobSetup );
~SfxPrinter();
___
[Libreoffice-commits] .: binfilter/bf_sc binfilter/bf_sw
binfilter/bf_sc/source/core/data/sc_document.cxx |2
binfilter/bf_sw/source/core/inc/drawfont.hxx | 50 ++
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 12 ++---
3 files changed, 58 insertions(+), 6 deletions(-)
New commits:
commit 37dd9a00cfb13825b9f3dfd6683db66b8aa84d09
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Nov 21 12:58:27 2011 +0100
Fix --enable-debug --disable-dbgutil.
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 649a5f7..b1f7521 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -844,6 +844,8 @@ namespace binfilter {
/*N*/ BOOL /*bKeepScenarioFlags*/, BOOL
/*bIncludeObjects*/)
/*N*/ {
/*N*/ DBG_ASSERT( bAllTabs || pMarks, CopyToClip: ScMarkData fehlt );
+(void) bAllTabs; // avoid warnings
+(void) pMarks; // avoid warnings
/*N*/
/*N*/ if (!bIsClip)
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/inc/drawfont.hxx
b/binfilter/bf_sw/source/core/inc/drawfont.hxx
index f7db89e..cf9260e 100644
--- a/binfilter/bf_sw/source/core/inc/drawfont.hxx
+++ b/binfilter/bf_sw/source/core/inc/drawfont.hxx
@@ -337,13 +337,17 @@ public:
OutputDevice GetOut() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bOut, DrawTextInfo: Undefined Outputdevice );
+#endif
return *pOut;
}
OutputDevice *GetpOut() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bOut, DrawTextInfo: Undefined Outputdevice );
+#endif
return pOut;
}
@@ -354,98 +358,130 @@ public:
const Point GetPos() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bPos, DrawTextInfo: Undefined Position );
+#endif
return *pPos;
}
xub_StrLen *GetHyphPos() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bHyph, DrawTextInfo: Undefined Hyph Position );
+#endif
return pHyphPos;
}
const XubString GetText() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bText, DrawTextInfo: Undefined String );
+#endif
return *pText;
}
const SwWrongList* GetWrong() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bWrong, DrawTextInfo: Undefined WrongList );
+#endif
return pWrong;
}
const Size GetSize() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSize, DrawTextInfo: Undefined Size );
+#endif
return *pSize;
}
SwFont* GetFont() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bFnt, DrawTextInfo: Undefined Font );
+#endif
return pFnt;
}
SwUnderlineFont* GetUnderFnt() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSpec, DrawTextInfo: Undefined Underlinefont );
+#endif
return pUnderFnt;
}
xub_StrLen GetIdx() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bIdx, DrawTextInfo: Undefined Index );
+#endif
return nIdx;
}
xub_StrLen GetLen() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bLen, DrawTextInfo: Undefined Length );
+#endif
return nLen;
}
xub_StrLen GetOfst() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bOfst, DrawTextInfo: Undefined Offset );
+#endif
return nOfst;
}
xub_StrLen GetEnd() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bIdx, DrawTextInfo: Undefined Index );
OSL_ENSURE( bLen, DrawTextInfo: Undefined Length );
+#endif
return nIdx + nLen;
}
long GetLeft() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bLeft, DrawTextInfo: Undefined left range );
+#endif
return nLeft;
}
long GetRight() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bRight, DrawTextInfo: Undefined right range );
+#endif
return nRight;
}
long GetKanaDiff() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bKana, DrawTextInfo: Undefined kana difference );
+#endif
return nKanaDiff;
}
USHORT GetWidth() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bWidth, DrawTextInfo: Undefined Width );
+#endif
return nWidth;
}
USHORT GetAscent() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bAscent, DrawTextInfo: Undefined Ascent );
+#endif
return nAscent;
}
@@ -456,19 +492,25 @@ public:
short GetSperren() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSperr, DrawTextInfo: Undefined Sperren );
+#endif
return nSperren;
}
short GetKern() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bKern, DrawTextInfo: Undefined Kerning );
+#endif
return nKern;
}
short GetSpace() const
{
+#if OSL_DEBUG_LEVEL 1
OSL_ENSURE( bSpace, DrawTextInfo: Undefined Spacing );
+#endif
return nSpace;
}
@@ -479,25 +521,33 @@ public:
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/ui/app/sc_scmod.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c60ac253ae83a74186033f0abc87b57bb4e4823d
Author: Caolán McNamara caol...@redhat.com
Date: Tue Oct 25 14:39:45 2011 +0100
INPUT_MOUSEANDKEYBOARD-VCL_INPUT_MOUSEANDKEYBOARD
diff --git a/binfilter/bf_sc/source/ui/app/sc_scmod.cxx
b/binfilter/bf_sc/source/ui/app/sc_scmod.cxx
index fafdac5..750af57 100644
--- a/binfilter/bf_sc/source/ui/app/sc_scmod.cxx
+++ b/binfilter/bf_sc/source/ui/app/sc_scmod.cxx
@@ -353,7 +353,7 @@ static USHORT nIdleCount = 0;
/*N*/ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
/*N*/ {
-/*N*/ if ( Application::AnyInput( INPUT_MOUSEANDKEYBOARD ) )
+/*N*/ if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) )
/*N*/ {
/*N*/ aIdleTimer.Start(); // Timeout unveraendert
/*N*/ return 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/core/tool/sc_chartlis.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 910838ecc9e64e89ebc0519dc3524824a687a3a6
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Oct 21 22:47:36 2011 +0200
Adapted to renamed VCL_INPUT_KEYBOARD.
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index f6186d7..a2f33eb 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -274,7 +274,7 @@ using namespace ::com::sun::star;
/*N*/ IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, EMPTYARG )
/*N*/ {
-/*N*/ if ( Application::AnyInput( INPUT_KEYBOARD ) )
+/*N*/ if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) )
/*N*/ {
/*?*/ aTimer.Start();
/*?*/ return 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_dpshttab.cxx |7
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 40 ---
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 18 --
binfilter/bf_sc/source/core/tool/sc_consoli.cxx | 31 -
binfilter/inc/bf_sc/collect.hxx | 23 +
binfilter/inc/bf_sc/column.hxx |1
binfilter/inc/bf_sc/document.hxx |1
binfilter/inc/bf_sc/dptabdat.hxx |2 -
8 files changed, 10 insertions(+), 113 deletions(-)
New commits:
commit c49dde7cea0c533da696752a064213c2d091e834
Author: Joseph Powers jpower...@cox.net
Date: Sun Oct 2 06:10:59 2011 -0700
Class TypedStrCollection is not really used, so I'm deleting it.
Plus some miscellanous DBG_BF_ASSERT cleanup.
diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
index 9aa89be..d3396c0 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
@@ -52,7 +52,6 @@ namespace binfilter {
/*N*/ longnColCount;
/*N*/ BOOLbIgnoreEmptyRows;
/*N*/ BOOLbRepeatIfEmpty;
-/*N*/ TypedStrCollection**ppStrings;
/*N*/ BOOL* pDateDim;
/*N*/ USHORT nNextRow; // for iterator, within range
/*N*/
@@ -72,10 +71,7 @@ namespace binfilter {
/*M*/ pImpl-bIgnoreEmptyRows = FALSE;
/*M*/ pImpl-bRepeatIfEmpty = FALSE;
/*M*/ pImpl-nColCount = nCount;
-/*M*/ pImpl-ppStrings = new TypedStrCollection*[nCount];
/*M*/ pImpl-pDateDim = NULL;
-/*M*/ for (long i=0; inCount; i++)
-/*M*/ pImpl-ppStrings[i] = NULL;
/*M*/
/*M*/ pImpl-nNextRow = pImpl-aRange.aStart.Row() + 1;
/*M*/
@@ -106,9 +102,6 @@ namespace binfilter {
/*N*/ ScSheetDPData::~ScSheetDPData()
/*N*/ {
-/*N*/ for (long i=0; ipImpl-nColCount; i++)
-/*N*/ delete pImpl-ppStrings[i];
-/*N*/ delete[] pImpl-ppStrings;
/*N*/ delete[] pImpl-pDateDim;
/*N*/ delete pImpl;
/*M*/ delete[] pSpecial;
diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
index 2ce86f7..773e5ba 100644
--- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
@@ -193,13 +193,6 @@ namespace binfilter {
/*N*/ }
//
-
-/*N*/ DataObject* Collection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP); return NULL;
-/*N*/ }
-
-//
// SortedCollection
//
@@ -261,17 +254,6 @@ namespace binfilter {
//
-
-//
-
-
-//
-
-// IsEqual - komplette Inhalte vergleichen
-
-
-//
-
/*N*/ DataObject* StrData::Clone() const
/*N*/ {
return new StrData(*this); // #i49161# this is needed
@@ -292,13 +274,6 @@ namespace binfilter {
//
-/*N*/ DataObject* StrCollection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP); return NULL;
-/*N*/ }
-
-//
-
/*N*/ void StrCollection::Load( SvStream rStream ) // Changetracking.sdc
/*N*/ {
/*N*/ ScReadHeader aHdr( rStream );
@@ -318,8 +293,6 @@ namespace binfilter {
/*N*/ }
//
-// TypedStrCollection
-//
/*N*/ TypedStrData::TypedStrData( ScDocument* pDoc, USHORT nCol, USHORT nRow,
USHORT nTab,
/*N*/ BOOL bAllStrings )
@@ -345,19 +318,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ short TypedStrCollection::Compare( DataObject* /*pKey1*/, DataObject*
/*pKey2*/ ) const
-/*N*/ {
-/*N*/ short nResult = 0;
-DBG_BF_ASSERT(0, STRIP);
-/*N*/ return nResult;
-/*N*/ }
-
-
-// Gross-/Kleinschreibung anpassen
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index dbb3a44..e67a51f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -767,9 +767,9 @@ namespace binfilter {
/*N*/ bFound = ScGlobal::GetFuncCollection()-SearchFunc(cSymbol,
nIndex);
/*N*/ if( bFound )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP); /*N*/ ScRawToken
[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
binfilter/bf_sc/source/core/data/sc_documen5.cxx |2 -
binfilter/bf_sc/source/core/data/sc_document.cxx |6 ---
binfilter/bf_sc/source/core/tool/sc_chartlis.cxx | 45 ---
binfilter/inc/bf_sc/chartlis.hxx | 14 +--
4 files changed, 2 insertions(+), 65 deletions(-)
New commits:
commit 7cb861abf2f817eefd5ca4435639182fe477a095
Author: Joseph Powers jpower...@cox.net
Date: Sun Oct 2 08:37:05 2011 -0700
Cleanup class ScChartListenerCollection
diff --git a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
index 2230ac5..4bda4a3 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen5.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen5.cxx
@@ -163,8 +163,6 @@ void ScDocument::UpdateChartArea( const String rChartName,
aArray.SetRangeList( rNewList );
aArray.SetHeaders( bColHeaders, bRowHeaders );
}
-pChartListenerCollection-ChangeListening(
-rChartName, aArray.GetRangeList() );
SchMemChart* pMemChart = aArray.CreateMemChart();
ScChartArray::CopySettings( *pMemChart, *pChartData );
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx
b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 26643cd..f2d43b7 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -283,9 +283,6 @@ namespace binfilter {
/*N*/ // update conditional formats after table is inserted
/*N*/ if ( pCondFormList )
/*N*/ pCondFormList-UpdateReference( URM_INSDEL, aRange,
0,0,1 );
-/*N*/ // #81844# sheet names of references are not valid until
sheet is inserted
-/*N*/ if ( pChartListenerCollection )
-/*N*/
pChartListenerCollection-UpdateScheduledSeriesRanges();
/*N*/
/*N*/ SetDirty();
/*N*/ bValid = TRUE;
@@ -351,7 +348,6 @@ namespace binfilter {
/*N*/ SetDirty();
/*N*/ }
/*N*/ // #81844# sheet names of references are not valid until
sheet is deleted
-/*N*/ pChartListenerCollection-UpdateScheduledSeriesRanges();
/*N*/ SetAutoCalc( bOldAutoCalc );
/*N*/ bValid = TRUE;
/*N*/ }
@@ -383,8 +379,6 @@ namespace binfilter {
/*N*/ if (bValid)
/*N*/ {
/*N*/ pTab[nTab]-SetName(rName);
-/*N*/ if ( pChartListenerCollection )
-/*N*/
pChartListenerCollection-UpdateSeriesRangesContainingTab( nTab );
/*N*/ }
/*N*/ }
/*N*/ return bValid;
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
index 48cb6de..f6186d7 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartlis.cxx
@@ -112,16 +112,10 @@ using namespace ::com::sun::star;
/*N*/ delete pUnoData;
/*N*/ }
-/*N*/ DataObject* ScChartListener::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP);return NULL;
-/*N*/ }
-
/*N*/ void ScChartListener::SetUno(
/*N*/ const uno::Reference chart::XChartDataChangeEventListener
rListener,
/*N*/ const uno::Reference chart::XChartData rSource )
/*N*/ {
-/*N*/ //DBG_ASSERT( rListener.is() rSource.is(), Nullpointer bei
SetUno );
/*N*/ delete pUnoData;
/*N*/ pUnoData = new ScChartUnoData( rListener, rSource );
/*N*/ }
@@ -237,18 +231,6 @@ using namespace ::com::sun::star;
/*N*/ FreeAll();
/*N*/ }
-/*N*/ DataObject* ScChartListenerCollection::Clone() const
-/*N*/ {
-DBG_BF_ASSERT(0, STRIP);return NULL;
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::ChangeListening( const String /*rName*/,
-/*N*/ const ScRangeListRef /*rRangeListRef*/, BOOL /*bDirty*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-
/*N*/ void ScChartListenerCollection::FreeUnused()
/*N*/ {
/*N*/ // rueckwaerts wg. Pointer-Aufrueckerei im Array
@@ -325,33 +307,6 @@ using namespace ::com::sun::star;
/*N*/ }
-
-
-
-
-/*N*/ void ScChartListenerCollection::UpdateScheduledSeriesRanges()
-/*N*/ {
-/*N*/ for ( USHORT nIndex = 0; nIndex nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-/*N*/ }
-
-
-/*N*/ void ScChartListenerCollection::UpdateSeriesRangesContainingTab( USHORT
nTab )
-/*N*/ {
-/*N*/ ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab );
-/*N*/ for ( USHORT nIndex = 0; nIndex nCount; nIndex++ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, STRIP);
-/*N*/ }
-/*N*/ }
-
-
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/chartlis.hxx b/binfilter/inc/bf_sc/chartlis.hxx
index a40e7f9..5edda6d 100644
--- a/binfilter/inc/bf_sc/chartlis.hxx
+++
