[Libreoffice-commits] .: 7 commits - binfilter/bf_basic binfilter/bf_forms binfilter/bf_sch binfilter/bf_starmath binfilter/bf_sw binfilter/inc filter/source
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Nov 12 05:37:22 PST 2010
binfilter/bf_basic/source/basmgr/basmgr.cxx | 21 ++--
binfilter/bf_forms/source/component/forms_Time.cxx | 2
binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx | 2
binfilter/bf_starmath/source/starmath_mathml.cxx | 17 ---
binfilter/bf_starmath/source/starmath_symbol.cxx | 6 -
binfilter/bf_sw/source/core/bastyp/sw_init.cxx | 1
binfilter/bf_sw/source/core/edit/makefile.mk | 1
binfilter/bf_sw/source/core/edit/sw_autofmt.cxx | 71 ---------------
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx | 3
binfilter/inc/bf_starmath/smmod.hxx | 4
binfilter/inc/bf_sw/editsh.hxx | 2
binfilter/inc/bf_sw/fldbas.hxx | 4
binfilter/inc/bf_xmloff/shapeexport.hxx | 2
binfilter/inc/bf_xmloff/txtparae.hxx | 4
filter/source/msfilter/msdffimp.cxx | 12 +-
18 files changed, 36 insertions(+), 126 deletions(-)
New commits:
commit 76431a0907f15b2f389651c103f8c4352e5f9d4c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 13:09:09 2010 +0000
remove useless file
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
index 1efd15b..13825ef 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_init.cxx
@@ -735,7 +735,6 @@ public:
/*N*/ delete SwSelPaintRects::pMapMode;
/*N*/ delete SwFntObj::pPixMap;
/*N*/
-/*N*/ delete SwEditShell::pAutoFmtFlags;
/*N*/ delete SwNumRule::pDefBulletFont;
/*N*/
/*N*/ #ifdef DBG_UTIL
diff --git a/binfilter/bf_sw/source/core/edit/makefile.mk b/binfilter/bf_sw/source/core/edit/makefile.mk
index a952620..4740451 100644
--- a/binfilter/bf_sw/source/core/edit/makefile.mk
+++ b/binfilter/bf_sw/source/core/edit/makefile.mk
@@ -44,7 +44,6 @@ INC+= -I$(PRJ)$/inc$/bf_sw
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/sw_autofmt.obj \
$(SLO)$/sw_edatmisc.obj \
$(SLO)$/sw_edfld.obj \
$(SLO)$/sw_ednumber.obj \
diff --git a/binfilter/bf_sw/source/core/edit/sw_autofmt.cxx b/binfilter/bf_sw/source/core/edit/sw_autofmt.cxx
deleted file mode 100644
index 580f80a..0000000
--- a/binfilter/bf_sw/source/core/edit/sw_autofmt.cxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- 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.
- *
- ************************************************************************/
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#define ITEMID_BOXINFO SID_ATTR_BORDER_INNER
-#define _SVSTDARR_LONGS
-#define _SVSTDARR_USHORTS
-
-#include <ctype.h>
-#include <hintids.hxx>
-
-
-
-#include <horiornt.hxx>
-
-#include <editsh.hxx>
-
-#include <statstr.hrc>
-#include <comcore.hrc>
-
-namespace binfilter {
-
-//-------------------------------------------------------------------
-
-//JP 16.12.99: definition:
-// from pos cPosEnDash to cPosEmDash all chars changed to endashes,
-// from pos cPosEmDash to cPosEnd all chars changed to emdashes
-// all other chars are changed to the user configuration
-
-
-
-
-/*N*/ SvxSwAutoFmtFlags* SwEditShell::pAutoFmtFlags = 0;
-
-// Anzahl von Num-/Bullet-Absatzvorlagen. MAXLEVEL wird demnaechst auf
-// x erhoeht, die Anzahl Vorlagen aber nicht (Ueberbleibsel aus <= 4.0)
-
- static BOOL m_bAskForCancelUndoWhileBufferOverflow;
- static short m_nActionWhileAutoformatUndoBufferOverflow;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/editsh.hxx b/binfilter/inc/bf_sw/editsh.hxx
index 221346e..89479b7 100644
--- a/binfilter/inc/bf_sw/editsh.hxx
+++ b/binfilter/inc/bf_sw/editsh.hxx
@@ -169,8 +169,6 @@ SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0, 5 )
class SwEditShell: public SwCrsrShell
{
- static SvxSwAutoFmtFlags* pAutoFmtFlags;
-
// fuer die privaten Methoden DelRange und die vom AutoCorrect
friend void _InitCore();
friend void _FinitCore();
commit 44a98c2e1d7bd0b7989b543fce5ca87eaa24b804
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 12:50:46 2010 +0000
remove some dead objects and fix some warnings
diff --git a/binfilter/bf_starmath/source/starmath_mathml.cxx b/binfilter/bf_starmath/source/starmath_mathml.cxx
index 82b2f2b..af56832 100644
--- a/binfilter/bf_starmath/source/starmath_mathml.cxx
+++ b/binfilter/bf_starmath/source/starmath_mathml.cxx
@@ -1845,14 +1845,6 @@ void SmXMLOperatorContext_Impl::StartElement(const uno::Reference<
}
}
-
-
-static __FAR_DATA SvXMLTokenMapEntry aMathElemTokenMap[] =
-{
- { XML_NAMESPACE_MATH, XML_MATH, XML_TOK_MATH },
- XML_TOKEN_MAP_END
-};
-
class SmXMLSpaceContext_Impl : public SmXMLImportContext
{
public:
@@ -2325,13 +2317,6 @@ static __FAR_DATA SvXMLTokenMapEntry aColorTokenMap[] =
};
-//const SvXMLTokenMap& SmXMLImport::GetMathElemTokenMap()
-//{
-// if(!pMathElemTokenMap)
-// pMathElemTokenMap = new SvXMLTokenMap(aMathElemTokenMap);
-// return *pMathElemTokenMap;
-//}
-
const SvXMLTokenMap& SmXMLImport::GetPresLayoutElemTokenMap()
{
if(!pPresLayoutElemTokenMap)
@@ -3268,7 +3253,7 @@ void SmXMLImport::SetViewSettings(const Sequence<PropertyValue>& aViewProps)
sal_Int32 nCount = aViewProps.getLength();
const PropertyValue *pValue = aViewProps.getConstArray();
- long nTmp;
+ long nTmp = 0;
sal_Bool bShowDeletes = sal_False, bShowInserts = sal_False, bShowFooter = sal_False, bShowHeader = sal_False;
for (sal_Int32 i = 0; i < nCount ; i++)
diff --git a/binfilter/bf_starmath/source/starmath_symbol.cxx b/binfilter/bf_starmath/source/starmath_symbol.cxx
index f6579d7..2b347ba 100644
--- a/binfilter/bf_starmath/source/starmath_symbol.cxx
+++ b/binfilter/bf_starmath/source/starmath_symbol.cxx
@@ -79,12 +79,12 @@ long SF_Ident = SF_IDENT;
/*N*/ SmSym::SmSym() :
/*N*/ Name(C2S("unknown")),
-/*N*/ Character('\0'),
+/*N*/ aSetName(C2S("unknown")),
/*N*/ pHashNext(0),
/*N*/ pSymSetManager(0),
+/*N*/ Character('\0'),
/*N*/ bPredefined(FALSE),
-/*N*/ bDocSymbol(FALSE),
-/*N*/ aSetName(C2S("unknown"))
+/*N*/ bDocSymbol(FALSE)
/*N*/ {
/*N*/ aExportName = Name;
/*N*/ Face.SetTransparent(TRUE);
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
index 8c4b9c9..03323cf 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlexpit.cxx
@@ -839,6 +839,8 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
aOut.append( GetXMLToken(XML_BOTTOM) );
bOk = sal_True;
break;
+ default:
+ break;
}
if( bOk )
@@ -862,6 +864,8 @@ sal_Bool SvXMLExportItemMapper::QueryXMLValue(
case GPOS_RB:
aOut.append( GetXMLToken(XML_RIGHT) );
break;
+ default:
+ break;
}
}
break;
diff --git a/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx b/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx
index ae019ac..56a541e 100644
--- a/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx
+++ b/binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx
@@ -197,8 +197,7 @@ void SwXMLExport::_ExportAutoStyles()
// only master pages are exported => styles for frames bound
// to frames (but none for frames bound to pages) need to be
// collected.
- GetTextParagraphExport()->collectFramesBoundToFrameAutoStyles(
- bShowProgress );
+ GetTextParagraphExport()->collectFramesBoundToFrameAutoStyles();
}
else
{
diff --git a/binfilter/inc/bf_starmath/smmod.hxx b/binfilter/inc/bf_starmath/smmod.hxx
index 5b97702..b7f57f7 100644
--- a/binfilter/inc/bf_starmath/smmod.hxx
+++ b/binfilter/inc/bf_starmath/smmod.hxx
@@ -74,8 +74,8 @@ class SmRectCache;
/*N*/ public:
/*N*/ SmNamesArray( LanguageType nLang, int nRID ) :
/*N*/ Resource( SmResId(RID_LOCALIZED_NAMES) ),
-/*N*/ nLanguage (nLang),
-/*N*/ aNamesAry (SmResId(nRID))
+/*N*/ aNamesAry (SmResId(nRID)),
+/*N*/ nLanguage (nLang)
/*N*/ {
/*N*/ FreeResource();
/*N*/ }
diff --git a/binfilter/inc/bf_xmloff/shapeexport.hxx b/binfilter/inc/bf_xmloff/shapeexport.hxx
index 6575fad..25dbddb 100644
--- a/binfilter/inc/bf_xmloff/shapeexport.hxx
+++ b/binfilter/inc/bf_xmloff/shapeexport.hxx
@@ -149,7 +149,7 @@ struct ImplXMLShapeExportInfo
sal_Int32 mnFamily;
XmlShapeType meShapeType;
- ImplXMLShapeExportInfo() : meShapeType( XmlShapeTypeNotYetSet ), mnFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID ) {}
+ ImplXMLShapeExportInfo() : mnFamily( XML_STYLE_FAMILY_SD_GRAPHICS_ID ), meShapeType( XmlShapeTypeNotYetSet ) {}
};
/** a vector for shape style and type cache information */
diff --git a/binfilter/inc/bf_xmloff/txtparae.hxx b/binfilter/inc/bf_xmloff/txtparae.hxx
index fd52deb..4616325 100644
--- a/binfilter/inc/bf_xmloff/txtparae.hxx
+++ b/binfilter/inc/bf_xmloff/txtparae.hxx
@@ -562,10 +562,8 @@ public:
// This method prepares the collection of auto styles for frames
// that are bound to a frame.
- void collectFramesBoundToFrameAutoStyles( sal_Bool bProgressIn = sal_False )
+ void collectFramesBoundToFrameAutoStyles()
{
- // unused
- bProgressIn;
collectFrames( sal_True );
}
commit 5936c7102b33bb00ddbdb4c743d6aa205fc00fc0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 12:20:24 2010 +0000
silence warning
diff --git a/binfilter/bf_forms/source/component/forms_Time.cxx b/binfilter/bf_forms/source/component/forms_Time.cxx
index 01d453f..152680d 100644
--- a/binfilter/bf_forms/source/component/forms_Time.cxx
+++ b/binfilter/bf_forms/source/component/forms_Time.cxx
@@ -253,7 +253,7 @@ void OTimeModel::_loaded(const EventObject& rEvent)
m_bDateTimeField = sal_False;
try
{
- sal_Int32 nFieldType;
+ sal_Int32 nFieldType = 0;
xField->getPropertyValue(PROPERTY_FIELDTYPE) >>= nFieldType;
m_bDateTimeField = (nFieldType == DataType::TIMESTAMP);
}
commit 47a15380214522f5b3a306e82008edd5b1eeb3dc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 12:18:07 2010 +0000
silence a few warnings in passing
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
index 89df293..6dd2b79 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx
@@ -468,7 +468,7 @@ sal_Unicode Sw3IoImp::ConvStarMathCharToStarSymbol( sal_Char c )
/*N*/ for( xub_StrLen nPos = nStart; nPos < nEnd; nPos++ )
/*N*/ {
/*N*/ sal_Char c = rText8.GetChar( nPos );
-/*N*/ sal_Unicode cNew;
+/*N*/ sal_Unicode cNew(0);
/*N*/ if( '\xff' == c )
/*N*/ {
/*N*/ if( 0 != ( pTAttr = lcl_sw3io_hasTxtAttr(
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
index f5ce4b6..3d4570a 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx
@@ -476,7 +476,7 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
/*N*/ BYTE cFlags;
/*N*/
/*N*/ SwFrmFmt* pFmt = rLine.GetFrmFmt();
-/*N*/ UINT16 nFmtId;
+/*N*/ UINT16 nFmtId(0);
/*N*/ if( IsSw31Or40Export() )
/*N*/ {
/*N*/ cFlags = 0x04; // keine Flags, Fmt-Id, Anzahl Boxen
@@ -644,7 +644,7 @@ BOOL lcl_sw3io_CollectLineFmts( const SwTableLine*& rpLine, void* pPara );
/*N*/
/*N*/ BYTE cFlags;
/*N*/
-/*N*/ UINT16 nFmtId;
+/*N*/ UINT16 nFmtId(0);
/*N*/ SwFrmFmt* pFmt = rBox.GetFrmFmt();
/*N*/ if( IsSw31Or40Export() )
/*N*/ {
diff --git a/binfilter/inc/bf_sw/fldbas.hxx b/binfilter/inc/bf_sw/fldbas.hxx
index f0c0933..a48566c 100644
--- a/binfilter/inc/bf_sw/fldbas.hxx
+++ b/binfilter/inc/bf_sw/fldbas.hxx
@@ -287,8 +287,8 @@ public:
// nur in abgeleiteten Klassen
virtual const String& GetName() const;
virtual SwFieldType* Copy() const = 0;
- virtual BOOL QueryValue( ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMId*/ ) const{DBG_BF_ASSERT(0, "STRIP"); return NULL;}
- virtual BOOL PutValue( const ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMId*/ ){DBG_BF_ASSERT(0, "STRIP"); return NULL;}
+ virtual BOOL QueryValue( ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMId*/ ) const{DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
+ virtual BOOL PutValue( const ::com::sun::star::uno::Any& /*rVal*/, BYTE /*nMId*/ ){DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
USHORT Which() const { return nWhich; }
commit ac729f078b9dbdedcda9141eec30288c8c263d9e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:32:42 2010 +0000
RTL_CONSTASCII_USTRINGPARAM used with nonarray
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx
index a463740..cc1b0e1 100644
--- a/binfilter/bf_basic/source/basmgr/basmgr.cxx
+++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx
@@ -91,17 +91,16 @@ typedef WeakImplHelper1< XStarBasicAccess > StarBasicAccessHelper;
// Version 2
// + BOOL bReference
-static const char* szStdLibName = "Standard";
-static const char* szBasicStorage = "StarBASIC";
-static const char* szOldManagerStream = "BasicManager";
-static const char* szManagerStream = "BasicManager2";
-static const char* szImbedded = "LIBIMBEDDED";
-static const char* szCryptingKey = "CryptedBasic";
-static const char* szScriptLanguage = "StarBasic";
-
-static const String BasicStreamName( String::CreateFromAscii(szBasicStorage) );
-static const String ManagerStreamName( String::CreateFromAscii(szManagerStream) );
-
+static const char szStdLibName[] = "Standard";
+static const char szBasicStorage[] = "StarBASIC";
+static const char szOldManagerStream[] = "BasicManager";
+static const char szManagerStream[] = "BasicManager2";
+static const char szImbedded[] = "LIBIMBEDDED";
+static const char szCryptingKey[] = "CryptedBasic";
+static const char szScriptLanguage[] = "StarBasic";
+
+static const String BasicStreamName( RTL_CONSTASCII_USTRINGPARAM(szBasicStorage) );
+static const String ManagerStreamName( RTL_CONSTASCII_USTRINGPARAM(szManagerStream) );
#define DEFINE_CONST_UNICODE(CONSTASCII) UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
commit 0ec3dcb508858f278bc32498e6ae038ab3274fca
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:32:00 2010 +0000
RTL_CONSTASCII_USTRINGPARAM used with nonarray
diff --git a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
index 8c85f92..a8e6a97 100644
--- a/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
+++ b/binfilter/bf_sch/source/ui/unoidl/sch_ChXChartObject.cxx
@@ -1364,7 +1364,7 @@ void ChXChartObject::GetPropertyValue (const SfxItemPropertyMap & rProperty,
case SFX_ITEM_UNKNOWN:
{
OUString sMessage (RTL_CONSTASCII_USTRINGPARAM ( "ChXChartObject::getPropertyValues: unknown property "));
- sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM (rProperty.pName));
+ sMessage += OUString::createFromAscii(rProperty.pName);
throw UnknownPropertyException (sMessage, (::cppu::OWeakObject*)this);
}
commit af8676a5ce6b44f7a2d17c617b2884036a5d08cf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Nov 12 11:31:20 2010 +0000
RTL_CONSTASCII_STRINGPARAM -> RTL_CONSTASCII_USTRINGPARAM
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index c1ba826..e9f3337 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -7063,12 +7063,12 @@ BOOL SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData, Rect
aFileName.Append( String::CreateFromInt32( nCount++ ) );
switch( nInst &~ 1 )
{
- case 0x216 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".wmf" ) ) ); break;
- case 0x3d4 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".emf" ) ) ); break;
- case 0x542 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".pct" ) ) ); break;
- case 0x46a : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".jpg" ) ) ); break;
- case 0x6e0 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".png" ) ) ); break;
- case 0x7a8 : aFileName.Append( String( RTL_CONSTASCII_STRINGPARAM( ".bmp" ) ) ); break;
+ case 0x216 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".wmf" ) ) ); break;
+ case 0x3d4 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".emf" ) ) ); break;
+ case 0x542 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".pct" ) ) ); break;
+ case 0x46a : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".jpg" ) ) ); break;
+ case 0x6e0 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".png" ) ) ); break;
+ case 0x7a8 : aFileName.Append( String( RTL_CONSTASCII_USTRINGPARAM( ".bmp" ) ) ); break;
}
String aURLStr;
More information about the Libreoffice-commits
mailing list