[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk |2 +- binfilter/bf_svtools/util/makefile.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 4781be1277dfb218b66fb787e5ec9a2ed7d9011d Author: David Ostrovsky da...@ostrovsky.org Date: Fri Oct 12 08:50:07 2012 -0700 rename jpeg_filter to prevent the hiding of global jpeg library Change-Id: I7bef1a2976a8305f8ad7d9a086b3621e9f709e93 Reviewed-on: https://gerrit.libreoffice.org/861 Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk index 4d3a3fb..affbbd6 100644 --- a/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk +++ b/binfilter/bf_svtools/source/filter.vcl/jpeg/makefile.mk @@ -19,7 +19,7 @@ PRJ=..$/..$/..$/.. PRJNAME=binfilter -TARGET=jpeg +TARGET=jpeg_filter # --- Settings --- diff --git a/binfilter/bf_svtools/util/makefile.mk b/binfilter/bf_svtools/util/makefile.mk index 05488e3..fc1059c 100644 --- a/binfilter/bf_svtools/util/makefile.mk +++ b/binfilter/bf_svtools/util/makefile.mk @@ -41,7 +41,7 @@ LIB1FILES=\ $(SLB)$/unoiface.lib \ $(SLB)$/filter.lib \ $(SLB)$/igif.lib \ -$(SLB)$/jpeg.lib \ +$(SLB)$/jpeg_filter.lib\ $(SLB)$/ixpm.lib \ $(SLB)$/ixbm.lib \ $(SLB)$/numbers.lib\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/misc/svt_ehdl.cxx | 54 --
binfilter/inc/bf_svtools/ehdl.hxx |8 +--
2 files changed, 30 insertions(+), 32 deletions(-)
New commits:
commit a8de7ee56a3c8375c585db364dac5f67d72ea97a
Author: Michael Stahl mst...@redhat.com
Date: Wed Oct 10 00:29:59 2012 +0200
binfilter: adapt to latest OUString refactoring
Change-Id: I087416db74a61d46196532ad42afeda05e7703ef
diff --git a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
index dc42cda..6be42d1 100644
--- a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
@@ -37,8 +37,8 @@ namespace binfilter
static USHORT aWndFunc(
Window *pWin,// Parent des Dialoges
USHORT nFlags,
-const ::String rErr, // Fehlertext
-const ::String rAction) // Actiontext
+const OUString rErr, // Fehlertext
+const OUString rAction) // Actiontext
/* [Beschreibung]
@@ -171,7 +171,7 @@ SfxErrorHandler::~SfxErrorHandler()
//-
BOOL SfxErrorHandler::CreateString(
-const ErrorInfo *pErr, ::String rStr, USHORT nFlags) const
+const ErrorInfo *pErr, OUString rStr, USHORT nFlags) const
/* [Beschreibung]
@@ -188,13 +188,12 @@ BOOL SfxErrorHandler::CreateString(
{
if(GetMessageString(nErrCode, rStr, nFlags))
{
-for (xub_StrLen i = 0; i rStr.Len();)
+for (xub_StrLen i = 0; i rStr.getLength();)
{
-i = rStr.SearchAndReplace(String::CreateFromAscii( $(ARG1) ),
- pMsgInfo-GetMessageArg(), i);
-if (i == STRING_NOTFOUND)
+if( rStr.indexOf(OUString($(ARG1)), i) == -1 )
break;
-i = i + pMsgInfo-GetMessageArg().Len();
+rStr = rStr.replaceAll($(ARG1), pMsgInfo-GetMessageArg(),
i);
+i = i + pMsgInfo-GetMessageArg().getLength();
}
return TRUE;
}
@@ -203,32 +202,32 @@ BOOL SfxErrorHandler::CreateString(
{
StringErrorInfo *pStringInfo=PTR_CAST(StringErrorInfo,pErr);
if(pStringInfo)
-for (xub_StrLen i = 0; i rStr.Len();)
+for (xub_StrLen i = 0; i rStr.getLength();)
{
-i = rStr.SearchAndReplace(String::CreateFromAscii( $(ARG1) ),
- pStringInfo-GetErrorString(), i);
-if (i == STRING_NOTFOUND)
+if( rStr.indexOf($(ARG1), i) == -1 )
break;
-i = i + pStringInfo-GetErrorString().Len();
+rStr = rStr.replaceAll(rtl::OUString($(ARG1)),
+ pStringInfo-GetErrorString(), i);
+i = i + pStringInfo-GetErrorString().getLength();
}
else
{
TwoStringErrorInfo * pTwoStringInfo = PTR_CAST(TwoStringErrorInfo,
pErr);
if (pTwoStringInfo)
-for (USHORT i = 0; i rStr.Len();)
+for (USHORT i = 0; i rStr.getLength();)
{
-USHORT nArg1Pos = rStr.Search(String::CreateFromAscii(
$(ARG1) ), i);
-USHORT nArg2Pos = rStr.Search(String::CreateFromAscii(
$(ARG2) ), i);
+USHORT nArg1Pos = rStr.indexOf(String::CreateFromAscii(
$(ARG1) ), i);
+USHORT nArg2Pos = rStr.indexOf(String::CreateFromAscii(
$(ARG2) ), i);
if (nArg1Pos nArg2Pos)
{
-rStr.Replace(nArg1Pos, 7, pTwoStringInfo-GetArg1());
-i = nArg1Pos + pTwoStringInfo-GetArg1().Len();
+rStr = rStr.replaceAt(nArg1Pos, 7,
pTwoStringInfo-GetArg1());
+i = nArg1Pos + pTwoStringInfo-GetArg1().getLength();
}
else if (nArg2Pos nArg1Pos)
{
-rStr.Replace(nArg2Pos, 7, pTwoStringInfo-GetArg2());
-i = nArg2Pos + pTwoStringInfo-GetArg2().Len();
+rStr = rStr.replaceAt(nArg2Pos, 7,
pTwoStringInfo-GetArg2());
+i = nArg2Pos + pTwoStringInfo-GetArg2().getLength();
}
else break;
}
@@ -311,7 +310,7 @@ BOOL SfxErrorHandler::GetClassString(ULONG lClassId, String
rStr) const
//-
BOOL SfxErrorHandler::GetMessageString(
-ULONG lErrId, ::String rStr, USHORT nFlags) const
+ULONG lErrId, OUString rStr, USHORT nFlags) const
/* [Beschreibung]
@@ -341,7 +340,7 @@ BOOL SfxErrorHandler::GetMessageString(
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx |4
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx | 73 ++--
2 files changed, 68 insertions(+), 9 deletions(-)
New commits:
commit de9acff682c036f7e0f24427098a14042371b155
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 15 17:02:29 2012 +0100
merge in various filter work from core
Change-Id: I14ca1319e7e96941037450aee59d7a926d290c71
diff --git a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
index 511b1a2..5f3c5b8 100644
--- a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
@@ -44,6 +44,10 @@ GIFReader::GIFReader( SvStream rStm ) :
nLastPos( rStm.Tell() ),
nLogWidth100( 0UL ),
nLogHeight100 ( 0UL ),
+nGlobalWidth( 0 ),
+nGlobalHeight ( 0 ),
+nImageWidth ( 0 ),
+nImageHeight( 0 ),
nLoops ( 1 ),
eActAction ( GLOBAL_HEADER_READING ),
bGCTransparent ( FALSE ),
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
index d617a99..7934b87 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winwmf.cxx
@@ -18,6 +18,7 @@
*/
#include winmtf.hxx
+#include boost/scoped_array.hpp
#include rtl/crc.h
#include rtl/tencinfo.h
#include osl/endian.h
@@ -320,28 +321,54 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
case W_META_POLYPOLYGON:
{
-USHORT i, nPoly, nPoints;
-USHORT* pnPoints;
+bool bRecordOk = true;
+USHORT i, nPoly = 0, nPoints = 0;
Point* pPtAry;
// Anzahl der Polygone:
*pWMF nPoly;
// Anzahl der Punkte eines jeden Polygons holen, Gesammtzahl der
Punkte ermitteln:
-pnPoints = new USHORT[ nPoly ];
-nPoints = 0;
+boost::scoped_arrayUSHORT xPolygonPointCounts(new USHORT[nPoly]);
+USHORT* pnPoints = xPolygonPointCounts.get();
for( i = 0; i nPoly; i++ )
{
*pWMF pnPoints[i];
-nPoints = nPoints + pnPoints[i];
+
+if (pnPoints[i] SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+
+nPoints += pnPoints[i];
}
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has more
polygons than we can handle);
+
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
// Polygonpunkte holen:
-pPtAry = (Point*) new char[ nPoints * sizeof(Point) ];
+boost::scoped_arrayPoint xPolygonPoints(new Point[nPoints]);
+pPtAry = xPolygonPoints.get();
for ( i = 0; i nPoints; i++ )
pPtAry[ i ] = ReadPoint();
+
+bRecordOk = pWMF-good();
+
+if (!bRecordOk)
+{
+pWMF-SetError( SVSTREAM_FILEFORMAT_ERROR );
+break;
+}
+
// PolyPolygon Actions erzeugen
PolyPolygon aPolyPoly( nPoly, pnPoints, pPtAry );
pOut-DrawPolyPolygon( aPolyPoly );
-delete[] (char*) pPtAry;
-delete[] pnPoints;
}
break;
@@ -1171,16 +1198,44 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle
rPlaceableBound, SvStream* pSt
case W_META_POLYPOLYGON:
{
+bool bRecordOk = true;
USHORT i, nPoly, nPoints = 0;
*pStm nPoly;
for( i = 0; i nPoly; i++ )
{
-sal_uInt16 nP;
+sal_uInt16 nP = 0;
*pStm nP;
nPoints = nPoints + nP;
+if (nP SAL_MAX_UINT16 - nPoints)
+{
+bRecordOk = false;
+break;
+}
+nPoints += nP;
}
+
+SAL_WARN_IF(!bRecordOk, svtools, polypolygon record has
more polygons than we can handle);
+
+bRecordOk = pStm-good();
+
+if (!bRecordOk)
+{
+pStm-SetError( SVSTREAM_FILEFORMAT_ERROR );
+bRet = sal_False;
+break;
+}
+
for ( i = 0; i nPoints; i++ )
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/misc/tl_strascii.cxx | 77 --
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 261 ---
binfilter/inc/bf_tools/string.hxx| 22 -
3 files changed, 360 deletions(-)
New commits:
commit d1d1079c087329d647dee89627e8d830e2b496f0
Author: Thomas Arnhold tho...@arnhold.org
Date: Fri Aug 10 04:10:03 2012 +0200
callcatcher: strip string methods down
Change-Id: Ibbe214d69068cbfaf8ae667ba96fa677e7a9242a
diff --git a/binfilter/bf_svtools/source/misc/tl_strascii.cxx
b/binfilter/bf_svtools/source/misc/tl_strascii.cxx
index 853749a..4baf7ef 100644
--- a/binfilter/bf_svtools/source/misc/tl_strascii.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strascii.cxx
@@ -394,65 +394,6 @@ UniString UniString::InsertAscii( const char* pAsciiStr,
xub_StrLen nIndex )
// ---
-UniString UniString::ReplaceAscii( xub_StrLen nIndex, xub_StrLen nCount,
-const sal_Char* pAsciiStr, xub_StrLen
nStrLen )
-{
-DBG_CHKTHIS( UniString, DbgCheckUniString );
-DBG_ASSERT( pAsciiStr, UniString::ReplaceAscii() - pAsciiStr is NULL );
-
-// Wenn Index groessergleich Laenge ist, dann ist es ein Append
-if ( nIndex = mpData-mnLen )
-{
-AppendAscii( pAsciiStr, nStrLen );
-return *this;
-}
-
-// Ist es eine Zuweisung
-if ( (nIndex == 0) (nCount = mpData-mnLen) )
-{
-AssignAscii( pAsciiStr, nStrLen );
-return *this;
-}
-
-// Reicht ein Erase
-if ( nStrLen == STRING_LEN )
-nStrLen = ImplStringLen( pAsciiStr );
-if ( !nStrLen )
-return Erase( nIndex, nCount );
-
-// nCount darf nicht ueber das Stringende hinnausgehen
-if ( nCount mpData-mnLen - nIndex )
-nCount = static_cast xub_StrLen (mpData-mnLen-nIndex);
-
-// Reicht eine zeichenweise Zuweisung
-if ( nCount == nStrLen )
-{
-ImplCopyData();
-ImplCopyAsciiStr( mpData-maStr+nIndex, pAsciiStr, nStrLen );
-return *this;
-}
-
-// Ueberlauf abfangen
-sal_Int32 n = ImplGetCopyLen( mpData-mnLen-nCount, nStrLen );
-
-// Neue Daten anlegen
-STRINGDATA* pNewData = ImplAllocData( mpData-mnLen-nCount+n );
-
-// String kopieren
-memcpy( pNewData-maStr, mpData-maStr, nIndex*sizeof( STRCODE ) );
-ImplCopyAsciiStr( pNewData-maStr+nIndex, pAsciiStr, n );
-memcpy( pNewData-maStr+nIndex+n, mpData-maStr+nIndex+nCount,
-(mpData-mnLen-nIndex-nCount+1)*sizeof( STRCODE ) );
-
-// Alte Daten loeschen und Neue zuweisen
-STRING_RELEASE((STRING_TYPE *)mpData);
-mpData = pNewData;
-
-return *this;
-}
-
-// ---
-
StringCompare UniString::CompareToAscii( const sal_Char* pAsciiStr,
xub_StrLen nLen ) const
{
@@ -609,24 +550,6 @@ xub_StrLen UniString::SearchAndReplaceAscii( const
sal_Char* pAsciiStr, const Un
return nSPos;
}
-// ---
-
-void UniString::SearchAndReplaceAllAscii( const sal_Char* pAsciiStr, const
UniString rRepStr )
-{
-DBG_CHKTHIS( UniString, DbgCheckUniString );
-DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, STRING_LEN ),
-UniString::SearchAndReplaceAllAscii() - pAsciiStr include
characters 127 );
-
-xub_StrLen nCharLen = ImplStringLen( pAsciiStr );
-xub_StrLen nSPos = SearchAscii( pAsciiStr, 0 );
-while ( nSPos != STRING_NOTFOUND )
-{
-Replace( nSPos, nCharLen, rRepStr );
-nSPos = nSPos + rRepStr.Len();
-nSPos = SearchAscii( pAsciiStr, nSPos );
-}
-}
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index 65c7b3e..58ea369 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -125,32 +125,6 @@ double UniString::ToDouble() const
// ---
-xub_StrLen STRING::SearchChar( const STRCODE* pChars, xub_StrLen nIndex ) const
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-sal_Int32 nLen = mpData-mnLen;
-const STRCODE* pStr = mpData-maStr;
-pStr += nIndex;
-while ( nIndex nLen )
-{
-STRCODE c = *pStr;
-const STRCODE* pCompStr = pChars;
-while ( *pCompStr )
-{
-if ( *pCompStr == c )
-return nIndex;
-++pCompStr;
-}
-++pStr,
-++nIndex;
-}
-
-return STRING_NOTFOUND;
-}
-
-// ---
-
xub_StrLen STRING::SearchAndReplace( STRCODE c, STRCODE cRep, xub_StrLen
nIndex )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
@@
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx |1 -
binfilter/bf_svx/source/form/svx_fmpgeimp.cxx|2 +-
binfilter/inc/bf_sfx2/sfxuno.hxx |1 +
3 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit aebe4b7c2f1e779221424c1d86d5384e12d7c3db
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Jul 12 09:38:02 2012 +0200
Newly missing includes etc.
...apparently post some recent clean up.
Change-Id: I1df4005658713830545151edc890e97be5b0b50f
diff --git a/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
b/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
index cf3f117..e232530 100644
--- a/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_imageresourceaccess.cxx
@@ -46,7 +46,6 @@ namespace binfilter
//
using namespace ::utl;
-using namespace ::comphelper;
using namespace ::com::sun::star::io;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
index f3304dd..9174e8e 100644
--- a/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmpgeimp.cxx
@@ -50,7 +50,7 @@
#include vcl/stdtext.hxx
-
+#include comphelper/types.hxx
#include unotools/streamwrap.hxx
#include legacysmgr/legacy_binfilters_smgr.hxx
diff --git a/binfilter/inc/bf_sfx2/sfxuno.hxx b/binfilter/inc/bf_sfx2/sfxuno.hxx
index 3394b80..3ed5e0f 100644
--- a/binfilter/inc/bf_sfx2/sfxuno.hxx
+++ b/binfilter/inc/bf_sfx2/sfxuno.hxx
@@ -35,6 +35,7 @@
#include com/sun/star/uno/Reference.h
#include cppuhelper/factory.hxx
+#include cppuhelper/typeprovider.hxx
namespace binfilter {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/config/svt_lingucfg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c71ded60095a0fe3d1e639d77c9529c6f44cc2d8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jul 2 16:02:44 2012 +0100
ditch String::CreateFromAscii
Change-Id: Ifb41b0ab2c251e32fc8ba0124c7a8e4c077908d2
diff --git a/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
b/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
index ba7bf69..64ab9c8 100644
--- a/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
+++ b/binfilter/bf_svtools/source/config/svt_lingucfg.cxx
@@ -163,7 +163,7 @@ public:
SvtLinguConfigItem::SvtLinguConfigItem() :
-utl::ConfigItem( String::CreateFromAscii( Office.Linguistic ) )
+utl::ConfigItem( rtl::OUString( Office.Linguistic ) )
{
LoadOptions( GetPropertyNames() );
ClearModified();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 050939cfb8c5ab5ba4cc53359c24c307a491e6f7
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jun 28 12:14:11 2012 +0100
drop a UniString
Change-Id: Ia067ecaffa81c74a6fdad4ee0ba76db8c3d867c2
diff --git a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
index 3c07512..511b1a2 100644
--- a/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/igif/svt_gifread.cxx
@@ -49,7 +49,7 @@ GIFReader::GIFReader( SvStream rStm ) :
bGCTransparent ( FALSE ),
bImGraphicReady ( FALSE )
{
-maUpperName = UniString::CreateFromAscii( SVIGIF, 6 );
+maUpperName = rtl::OUString(SVIGIF);
pSrcBuf = new BYTE[ 256 ];
ClearImageExtensions();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx
binfilter/bf_svtools/source/items1/svt_dateitem.cxx |2 -- binfilter/bf_svx/source/items/svx_algitem.cxx |2 -- binfilter/bf_svx/source/items/svx_drawitem.cxx |2 -- binfilter/bf_svx/source/items/svx_postattr.cxx |2 -- binfilter/bf_svx/source/options/svx_optgrid.cxx |2 -- binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx|2 -- binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx|2 -- binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx|2 -- binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx|2 -- 9 files changed, 18 deletions(-) New commits: commit a4bcfd41e332202297dc0b45f5f3b0fba8e91e2e Author: Thomas Arnhold tho...@arnhold.org Date: Sat Jun 9 05:54:56 2012 +0200 Remove superfluous include comments Change-Id: If8c37d94bbb76e3e5a8060f378a768e4866da604 diff --git a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx index 6567d2b..5ae4017 100644 --- a/binfilter/bf_svtools/source/items1/svt_dateitem.cxx +++ b/binfilter/bf_svtools/source/items1/svt_dateitem.cxx @@ -26,8 +26,6 @@ * / -// include --- - #define _DATETIMEITEM_CXX #include bf_svtools/dateitem.hxx diff --git a/binfilter/bf_svx/source/items/svx_algitem.cxx b/binfilter/bf_svx/source/items/svx_algitem.cxx index 45435ed..97ee57a 100644 --- a/binfilter/bf_svx/source/items/svx_algitem.cxx +++ b/binfilter/bf_svx/source/items/svx_algitem.cxx @@ -26,8 +26,6 @@ * / -// include --- - #ifdef _MSC_VER #pragma hdrstop #endif diff --git a/binfilter/bf_svx/source/items/svx_drawitem.cxx b/binfilter/bf_svx/source/items/svx_drawitem.cxx index 854ae50..70eeef4 100644 --- a/binfilter/bf_svx/source/items/svx_drawitem.cxx +++ b/binfilter/bf_svx/source/items/svx_drawitem.cxx @@ -26,8 +26,6 @@ * / -// include --- - #ifdef _MSC_VER #pragma hdrstop #endif diff --git a/binfilter/bf_svx/source/items/svx_postattr.cxx b/binfilter/bf_svx/source/items/svx_postattr.cxx index 5289828..a9aa911 100644 --- a/binfilter/bf_svx/source/items/svx_postattr.cxx +++ b/binfilter/bf_svx/source/items/svx_postattr.cxx @@ -26,8 +26,6 @@ * / -// include --- - #ifdef _MSC_VER #pragma hdrstop #endif diff --git a/binfilter/bf_svx/source/options/svx_optgrid.cxx b/binfilter/bf_svx/source/options/svx_optgrid.cxx index fe2bcb8..9aec6f6 100644 --- a/binfilter/bf_svx/source/options/svx_optgrid.cxx +++ b/binfilter/bf_svx/source/options/svx_optgrid.cxx @@ -26,8 +26,6 @@ * / -// include --- - #define _SVX_OPTGRID_CXX #include svxids.hrc diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx index 5dcf801..e30f11c 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabdash.cxx @@ -26,8 +26,6 @@ * / -// include --- - #ifndef SVX_LIGHT #include XPropertyTable.hxx #include unotools/ucbstreamhelper.hxx diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx index ff64bef..28b8b62 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabgrdt.cxx @@ -26,8 +26,6 @@ * / -// include --- - #ifndef SVX_LIGHT #include XPropertyTable.hxx diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx index 034126c..0e7c8ba 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtabhtch.cxx @@ -26,8 +26,6 @@ * / -// include --- - #ifndef SVX_LIGHT #include XPropertyTable.hxx #include unotools/ucbstreamhelper.hxx diff --git a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx index 57eaf72..521907a 100644 --- a/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx +++ b/binfilter/bf_svx/source/xoutdev/svx_xtablend.cxx
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_sw binfilter/bf_xmloff
binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx |2 -
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx |1
binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx |2 -
binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx|4
+-
binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx|2 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterExportPropMapper.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_PageMasterImportPropMapper.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_XMLPageExport.cxx |2 -
binfilter/bf_xmloff/source/style/xmloff_xmlexppr.cxx | 20
+-
binfilter/bf_xmloff/source/style/xmloff_xmlnumfe.cxx |6
+--
binfilter/bf_xmloff/source/style/xmloff_xmlnumi.cxx|2 -
binfilter/bf_xmloff/source/style/xmloff_xmlstyle.cxx |2 -
binfilter/bf_xmloff/source/text/xmloff_txtexppr.cxx|2 -
binfilter/bf_xmloff/source/text/xmloff_txtimppr.cxx|2 -
binfilter/bf_xmloff/source/text/xmloff_txtparae.cxx|4
+-
15 files changed, 27 insertions(+), 28 deletions(-)
New commits:
commit 0b54eb6b70f1102a84ee9da01b2c6aea1aa50904
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon May 7 23:13:07 2012 +0200
Some cppcheck cleaning
Change-Id: Ib0dee8fed7c3ac54870024853d0bcdfcb964039d
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
index 1310b8c..e13b783 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/svt_winmtf.cxx
@@ -2126,7 +2126,7 @@ void WinMtfOutput::Push() // !! to
be able to access the o
void WinMtfOutput::Pop()
{
// Die aktuellen Daten vom Stack holen
-if( vSaveStack.size() )
+if( !vSaveStack.empty() )
{
// Die aktuelle Daten auf dem Stack sichern
SaveStructPtr pSave( vSaveStack.back() );
diff --git a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
index de2dc23..51814e8 100644
--- a/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
+++ b/binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx
@@ -383,7 +383,6 @@ void SwSearchProperties_Impl::FillItemSet(SfxItemSet rSet,
sal_Bool bIsValueSea
}
}
delete pBoxItem;
-delete pBreakItem;
delete pBreakItem ;
delete pAutoKernItem ;
delete pWLineItem;
diff --git a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
index d816c6c..e9b20a1 100644
--- a/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
+++ b/binfilter/bf_xmloff/source/chart/xmloff_SchXMLTableContext.cxx
@@ -445,7 +445,7 @@ void SchXMLTableHelper::applyTableSimple(
double fVal;
const sal_Bool bConstConvertNan = bConvertNaN;
-for( ++iRow, nRow = 0; iRow != rTable.aData.end(); iRow++, nRow++ )
+for( ++iRow, nRow = 0; iRow != rTable.aData.end(); ++iRow, nRow++ )
{
aCategories[ nRow ] = (*iRow)[ 0 ].aString;
for( nCol = 1; nCol nColumnCount; nCol++ )
diff --git a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
index 71f2587..12fdc17 100644
--- a/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
+++ b/binfilter/bf_xmloff/source/core/xmloff_attrlist.cxx
@@ -125,7 +125,7 @@ OUString SAL_CALL SvXMLAttributeList::getValueByName(const
OUString sName) thro
{
::std::vectorstruct SvXMLTagAttribute_Impl::iterator ii =
m_pImpl-vecAttribute.begin();
-for( ; ii != m_pImpl-vecAttribute.end() ; ii ++ ) {
+for( ; ii != m_pImpl-vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
return (*ii).sValue;
}
@@ -172,7 +172,7 @@ void SvXMLAttributeList::RemoveAttribute( const OUString
sName )
{
::std::vectorstruct SvXMLTagAttribute_Impl::iterator ii =
m_pImpl-vecAttribute.begin();
-for( ; ii != m_pImpl-vecAttribute.end() ; ii ++ ) {
+for( ; ii != m_pImpl-vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
m_pImpl-vecAttribute.erase( ii );
break;
diff --git a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
index 866686f..7d6238c 100644
--- a/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
+++ b/binfilter/bf_xmloff/source/draw/xmloff_XMLShapeStyleContext.cxx
@@ -130,7 +130,7 @@ void XMLShapeStyleContext::FillPropertySet( const
Reference beans::XPropertySet
// first, look for the old format, where we had a text:list-style-name
//
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/memtools/tl_contnr.cxx | 26 -
binfilter/inc/bf_tools/contnr.hxx |2 -
2 files changed, 28 deletions(-)
New commits:
commit baa2838ed4a0d1a9dd4b2ff88e5e033a37bf31cd
Author: Caolán McNamara caol...@redhat.com
Date: Thu Apr 19 17:29:48 2012 +0100
callcatcher: strip Container down
diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00..2719d61 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock,
sal_uInt16 nIndex )
|*
*/
-void Container::Insert( void* p )
-{
-ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Insert()
-|*
-*/
-
void Container::Insert( void* p, sal_uIntPtr nIndex )
{
if ( nCount = nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16
nIndex )
|*
*/
-void* Container::Remove()
-{
-// Wenn kein Item vorhanden ist, NULL zurueckgeben
-if ( !nCount )
-return NULL;
-else
-return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Remove()
-|*
-*/
-
void* Container::Remove( sal_uIntPtr nIndex )
{
// Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
diff --git a/binfilter/inc/bf_tools/contnr.hxx
b/binfilter/inc/bf_tools/contnr.hxx
index 6d7e70f..9267e5e 100644
--- a/binfilter/inc/bf_tools/contnr.hxx
+++ b/binfilter/inc/bf_tools/contnr.hxx
@@ -79,10 +79,8 @@ public:
Container( const Container rContainer );
~Container();
-voidInsert( void* p );
voidInsert( void* p, sal_uIntPtr nIndex );
-void* Remove();
void* Remove( sal_uIntPtr nIndex );
void* Remove( void* p )
{ return Remove( GetPos( p ) ); }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/config/svt_colorcfg.cxx|2 +- binfilter/bf_svtools/source/config/svt_viewoptions.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 07afc5b2071ff48beb3093536a7ea68273b4e967 Author: Julien Nabet serval2...@yahoo.fr Date: Mon Apr 9 14:06:58 2012 +0200 s/pathes/paths/ diff --git a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx index 45a090e..962954a 100644 --- a/binfilter/bf_svtools/source/config/svt_colorcfg.cxx +++ b/binfilter/bf_svtools/source/config/svt_colorcfg.cxx @@ -34,7 +34,7 @@ #include tools/color.hxx #include tools/debug.hxx #include unotools/configitem.hxx -#include unotools/configpathes.hxx +#include unotools/configpaths.hxx #include com/sun/star/uno/Sequence.h #include bf_svtools/poolitem.hxx //Any2Bool #include bf_svtools/smplhint.hxx diff --git a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx index 2b78f3a..4699e2d 100644 --- a/binfilter/bf_svtools/source/config/svt_viewoptions.cxx +++ b/binfilter/bf_svtools/source/config/svt_viewoptions.cxx @@ -38,7 +38,7 @@ #include com/sun/star/container/XNameAccess.hpp #include com/sun/star/beans/XPropertySet.hpp #include rtl/ustrbuf.hxx -#include unotools/configpathes.hxx +#include unotools/configpaths.hxx #include comphelper/configurationhelper.hxx #include comphelper/processfactory.hxx #include itemholder1.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/items/svt_rngitem.cxx |6 -- binfilter/bf_svtools/source/items1/svt_itemset.cxx |8 binfilter/bf_svtools/util/svt.flt |3 --- binfilter/inc/bf_svtools/nranges.hxx |4 binfilter/inc/bf_svtools/rngitem.hxx | 10 -- 5 files changed, 31 deletions(-) New commits: commit f89f0d123f9155e0832d1186eb1bd64bbfddd3f1 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 12 11:05:37 2012 + ditch SfxULongRanges from binfilter diff --git a/binfilter/bf_svtools/source/items/svt_rngitem.cxx b/binfilter/bf_svtools/source/items/svt_rngitem.cxx index 401926b..1964e71 100644 --- a/binfilter/bf_svtools/source/items/svt_rngitem.cxx +++ b/binfilter/bf_svtools/source/items/svt_rngitem.cxx @@ -36,12 +36,6 @@ #include bf_svtools/rngitem.hxx #include svt_rngitem_inc.cxx -#define NUMTYPE sal_uInt32 -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include bf_svtools/rngitem.hxx -#include svt_rngitem_inc.cxx - #else // We leave this condition just in case NUMTYPE has been defined externally to this diff --git a/binfilter/bf_svtools/source/items1/svt_itemset.cxx b/binfilter/bf_svtools/source/items1/svt_itemset.cxx index c525349..cfb3ada 100644 --- a/binfilter/bf_svtools/source/items1/svt_itemset.cxx +++ b/binfilter/bf_svtools/source/items1/svt_itemset.cxx @@ -66,14 +66,6 @@ DBG_NAME(SfxItemSet) #undef SvNums #undef SfxNumRanges -#define NUMTYPE ULONG -#define SvNums SvULongs -#define SfxNumRangesSfxULongRanges -#include svt_nranges.cxx -#undef NUMTYPE -#undef SvNums -#undef SfxNumRanges - // #ifdef DBG_UTIL diff --git a/binfilter/bf_svtools/util/svt.flt b/binfilter/bf_svtools/util/svt.flt index 693a888..5032849 100644 --- a/binfilter/bf_svtools/util/svt.flt +++ b/binfilter/bf_svtools/util/svt.flt @@ -53,9 +53,6 @@ Sdbyy_scan SfxListUndoAction SfxPointerEntry SfxUINT32s -SfxULongRangeItem -SfxULongRanges -SfxULongRangesItem SgfFontLst SgfFontOne SqlInternalNode diff --git a/binfilter/inc/bf_svtools/nranges.hxx b/binfilter/inc/bf_svtools/nranges.hxx index 194a158..9abd313 100644 --- a/binfilter/inc/bf_svtools/nranges.hxx +++ b/binfilter/inc/bf_svtools/nranges.hxx @@ -39,11 +39,7 @@ #define NUMTYPE USHORT #define SfxNumRanges SfxUShortRanges #include bf_svtools/nranges.hxx - #undef NUMTYPE -#define NUMTYPE ULONG -#define SfxNumRanges SfxULongRanges -#include bf_svtools/nranges.hxx #define _SFXNRANGES_HXX diff --git a/binfilter/inc/bf_svtools/rngitem.hxx b/binfilter/inc/bf_svtools/rngitem.hxx index 7768d23..39dfebb 100644 --- a/binfilter/inc/bf_svtools/rngitem.hxx +++ b/binfilter/inc/bf_svtools/rngitem.hxx @@ -38,16 +38,6 @@ #undef SfxXRangeItem #undef SfxXRangesItem -#ifndef _SFXITEMS_HXX -#define NUMTYPE ULONG -#define SfxXRangeItem SfxULongRangeItem -#define SfxXRangesItem SfxULongRangesItem -#include bf_svtools/rngitem.hxx -#undef NUMTYPE -#undef SfxXRangeItem -#undef SfxXRangesItem -#endif - #define _SFXRNGITEM_HXX #else ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/memtools/tl_contnr.cxx | 81 -
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 26 --
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 26 ++
binfilter/inc/bf_svx/svdetc.hxx|1
binfilter/inc/bf_svx/svdlayer.hxx |3
binfilter/inc/bf_svx/svdmark.hxx |2
binfilter/inc/bf_tools/contnr.hxx |9 --
binfilter/inc/bf_tools/stack.hxx |3
binfilter/inc/bf_tools/string.hxx |1
binfilter/inc/bf_tools/unqidx.hxx |2
10 files changed, 26 insertions(+), 128 deletions(-)
New commits:
commit 271e19336e594195ac6e40dd01ba62d2592f24e8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 13:41:31 2012 +
callcatcher: shrink unused inlines
diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00..f0b48a9 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock,
sal_uInt16 nIndex )
|*
*/
-void Container::Insert( void* p )
-{
-ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Insert()
-|*
-*/
-
void Container::Insert( void* p, sal_uIntPtr nIndex )
{
if ( nCount = nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16
nIndex )
|*
*/
-void* Container::Remove()
-{
-// Wenn kein Item vorhanden ist, NULL zurueckgeben
-if ( !nCount )
-return NULL;
-else
-return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Remove()
-|*
-*/
-
void* Container::Remove( sal_uIntPtr nIndex )
{
// Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
@@ -1133,23 +1107,6 @@ void Container::Clear()
/*
|*
-|*Container::GetCurObject()
-|*
-*/
-
-void* Container::GetCurObject() const
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-// NULL, wenn Container leer
-if ( !nCount )
-return NULL;
-else
-return pCurBlock-GetObject( nCurIndex );
-}
-
-/*
-|*
|*Container::GetCurPos()
|*
*/
@@ -1206,44 +1163,6 @@ void* Container::GetObject( sal_uIntPtr nIndex ) const
/*
|*
-|*Container::GetPos()
-|*
-*/
-
-sal_uIntPtr Container::GetPos( const void* p ) const
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-void** pNodes;
-CBlock* pTemp;
-sal_uIntPtr nTemp;
-sal_uInt16 nBlockCount;
-sal_uInt16 i;
-
-// Block suchen
-pTemp = pFirstBlock;
-nTemp = 0;
-while ( pTemp )
-{
-pNodes = pTemp-GetNodes();
-i = 0;
-nBlockCount = pTemp-Count();
-while ( i nBlockCount )
-{
-if ( p == *pNodes )
-return nTemp+i;
-pNodes++;
-i++;
-}
-nTemp += nBlockCount;
-pTemp = pTemp-GetNextBlock();
-}
-
-return CONTAINER_ENTRY_NOTFOUND;
-}
-
-/*
-|*
|*Container::Seek()
|*
*/
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 83ca2c0..5ced5bc 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -738,32 +738,6 @@ STRING STRING::ToLowerAscii()
// ---
-STRING STRING::ToUpperAscii()
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-sal_Int32 nIndex = 0;
-sal_Int32 nLen = mpData-mnLen;
-STRCODE*pStr = mpData-maStr;
-while ( nIndex nLen )
-{
-// Ist das Zeichen zwischen 'a' und 'z' dann umwandeln
-if ( (*pStr = 97) (*pStr = 122) )
-{
-// Daten kopieren, wenn noetig
-pStr = ImplCopyStringData( pStr );
-*pStr -= 32;
-
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/memtools/tl_unqidx.cxx | 20
binfilter/inc/bf_tools/unqidx.hxx |1 -
2 files changed, 21 deletions(-)
New commits:
commit 359bd679b9cc9849e9336c6b6fc289e900a18fdf
Author: Caolán McNamara caol...@redhat.com
Date: Fri Mar 2 08:18:16 2012 +
reduce UniqueIndex
diff --git a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
index 66ebdf8..9bba4c2 100644
--- a/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_unqidx.cxx
@@ -138,26 +138,6 @@ sal_uIntPtr UniqueIndex::GetCurIndex() const
/*
|*
-|*UniqueIndex::GetIndex()
-|*
-*/
-
-sal_uIntPtr UniqueIndex::GetIndex( const void* p ) const
-{
-// Wird ein NULL-Pointer uebergeben, dann wurde Pointer nicht gefunden
-if ( !p )
-return UNIQUEINDEX_ENTRY_NOTFOUND;
-
-sal_uIntPtr nIndex = Container::GetPos( p );
-
-if ( nIndex != CONTAINER_ENTRY_NOTFOUND )
-return nIndex+nStartIndex;
-else
-return UNIQUEINDEX_ENTRY_NOTFOUND;
-}
-
-/*
-|*
|*UniqueIndex::IsIndexValid()
|*
*/
diff --git a/binfilter/inc/bf_tools/unqidx.hxx
b/binfilter/inc/bf_tools/unqidx.hxx
index 273f670..3bf63ae 100644
--- a/binfilter/inc/bf_tools/unqidx.hxx
+++ b/binfilter/inc/bf_tools/unqidx.hxx
@@ -65,7 +65,6 @@ public:
sal_uIntPtr Count() const { return nCount; }
sal_uIntPtr GetCurIndex() const;
-sal_uIntPtr GetIndex( const void* p ) const;
sal_BoolIsIndexValid( sal_uIntPtr nIndex ) const;
void* Seek( sal_uIntPtr nIndex );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/misc/svt_ehdl.cxx |4 ++--
binfilter/bf_svtools/source/misc1/svt_svtdata.cxx |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0593ef5c57daa85f5982e57d11618b631aa5692d
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 23 17:03:47 2012 +0100
Get rid of CREATEVERSIONRESMGR_NAME
diff --git a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
index 7dceeaf..819ebe2 100644
--- a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
@@ -168,7 +168,7 @@ SfxErrorHandler::SfxErrorHandler(USHORT nIdP, ULONG
lStartP, ULONG lEndP, ResMgr
if( ! pMgr )
{
com::sun::star::lang::Locale aLocale =
Application::GetSettings().GetUILocale();
-pFreeMgr = pMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(ofa),
aLocale );
+pFreeMgr = pMgr = ResMgr::CreateResMgr(ofa, aLocale );
}
}
@@ -426,7 +426,7 @@ BOOL SfxErrorContext::GetString(ULONG nErrId, ::String
rStr)
if( ! pMgr )
{
com::sun::star::lang::Locale aLocale =
Application::GetSettings().GetUILocale();
-pFreeMgr = pMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(ofa),
aLocale );
+pFreeMgr = pMgr = ResMgr::CreateResMgr(ofa, aLocale );
}
if( pMgr )
{
diff --git a/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
b/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
index cbb72eb..26a8ba5 100644
--- a/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
+++ b/binfilter/bf_svtools/source/misc1/svt_svtdata.cxx
@@ -44,7 +44,7 @@ ImpSvtData::~ImpSvtData()
ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale)
{
if (!pResMgr)
-pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(bf_svt),
aLocale );
+pResMgr = ResMgr::CreateResMgr(bf_svt, aLocale );
return pResMgr;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 46 ---
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 46 +++
binfilter/inc/bf_tools/string.hxx|6 +--
3 files changed, 49 insertions(+), 49 deletions(-)
New commits:
commit 6c7344599885a7528a5c06a4e2a0b15e0adb35fd
Author: Caolán McNamara caol...@redhat.com
Date: Sat Feb 18 21:12:34 2012 +
ditch extra ByteString code
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index b0d7279..64eef56 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -383,52 +383,6 @@ STRING STRING::Assign( const STRCODE* pCharStr )
// ---
-STRING STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-DBG_ASSERT( pCharStr, String::Assign() - pCharStr is NULL );
-
-if ( nLen == STRING_LEN )
-nLen = ImplStringLen( pCharStr );
-
-#ifdef DBG_UTIL
-if ( DbgIsAssert() )
-{
-for ( xub_StrLen i = 0; i nLen; i++ )
-{
-if ( !pCharStr[i] )
-{
-OSL_FAIL( String::Assign() : nLen is wrong );
-}
-}
-}
-#endif
-
-if ( !nLen )
-{
-STRING_NEW((STRING_TYPE **)mpData);
-}
-else
-{
-// Wenn String genauso lang ist, wie der String, dann direkt kopieren
-if ( (nLen == mpData-mnLen) (mpData-mnRefCount == 1) )
-memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
-else
-{
-// Alte Daten loeschen
-STRING_RELEASE((STRING_TYPE *)mpData);
-
-// Daten initialisieren und String kopieren
-mpData = ImplAllocData( nLen );
-memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
-}
-}
-
-return *this;
-}
-
-// ---
-
STRING STRING::Assign( STRCODE c )
{
DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
index 4657cd8..803b36e 100644
--- a/binfilter/bf_svtools/source/misc/tl_tustring.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_tustring.cxx
@@ -627,6 +627,52 @@ STRING::STRING( const ::STRING rStr )
mpData = temp.mpData;
}
+// ---
+
+STRING STRING::Assign( const STRCODE* pCharStr, xub_StrLen nLen )
+{
+DBG_CHKTHIS( STRING, DBGCHECKSTRING );
+DBG_ASSERT( pCharStr, String::Assign() - pCharStr is NULL );
+
+if ( nLen == STRING_LEN )
+nLen = ImplStringLen( pCharStr );
+
+#ifdef DBG_UTIL
+if ( DbgIsAssert() )
+{
+for ( xub_StrLen i = 0; i nLen; i++ )
+{
+if ( !pCharStr[i] )
+{
+OSL_FAIL( String::Assign() : nLen is wrong );
+}
+}
+}
+#endif
+
+if ( !nLen )
+{
+STRING_NEW((STRING_TYPE **)mpData);
+}
+else
+{
+// Wenn String genauso lang ist, wie der String, dann direkt kopieren
+if ( (nLen == mpData-mnLen) (mpData-mnRefCount == 1) )
+memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
+else
+{
+// Alte Daten loeschen
+STRING_RELEASE((STRING_TYPE *)mpData);
+
+// Daten initialisieren und String kopieren
+mpData = ImplAllocData( nLen );
+memcpy( mpData-maStr, pCharStr, nLen*sizeof( STRCODE ) );
+}
+}
+
+return *this;
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 872136e..6036737 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -125,10 +125,11 @@ private:
sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making something to fit
ByteString( const sal_Unicode* pUniStr, xub_StrLen
nLen,
rtl_TextEncoding eTextEncoding,
-sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making somethiing to fit
+sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed
methods without compiler making something to fit
ByteString( const UniString rUniStr,
rtl_TextEncoding eTextEncoding,
-sal_uInt32 nCvtFlags =
UNISTRING_TO_BYTESTRING_CVTFLAGS );
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx | 31 --
1 file changed, 15 insertions(+), 16 deletions(-)
New commits:
commit b0035dae18266c4fd219b29dbc635497c0fa53ec
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 15 15:38:04 2012 +0100
Adapted to string function clean up
Also fixed some apparent misuses of RTL_CONSTASCII_USTRINGPARAM -
RTL_CONSTASCII_STRINGPARAM.
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index fd8bc49..e2bcfe0 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -1189,22 +1189,21 @@ void SgfFontOne::ReadOne( const rtl::OString rID,
ByteString Dsc )
if (!s.isEmpty())
{
s = s.toAsciiUpperCase();
-using comphelper::string::matchL;
-if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(BOLD)))
Bold=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ITAL)))
Ital=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SERF)))
Serf=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SANS)))
Sans=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(FIXD)))
Fixd=sal_True;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
-else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM(SYSTEM))) SVChSet
= osl_getThreadTextEncoding();
+if (s.matchL(RTL_CONSTASCII_STRINGPARAM(BOLD)))
Bold=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(ITAL)))
Ital=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SERF)))
Serf=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SANS)))
Sans=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(FIXD)))
Fixd=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SYSTEM))) SVChSet =
osl_getThreadTextEncoding();
else if (comphelper::string::isdigitAsciiString(s) )
SVWidth=sal::static_int_cast sal_uInt16 (s.toInt32());
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/misc/tl_strucvt.cxx | 16
binfilter/inc/bf_tools/string.hxx |2 --
2 files changed, 18 deletions(-)
New commits:
commit 34eccca5a0c9f2f7e0e1bc655ad0195a5d69c1ed
Author: Caolán McNamara caol...@redhat.com
Date: Mon Feb 13 10:20:54 2012 +
drop InitStringRes
diff --git a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
index d5bc082..00d2869 100644
--- a/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strucvt.cxx
@@ -31,22 +31,6 @@ namespace binfilter
// ===
-void UniString::InitStringRes( const char* pUTF8Str, sal_Int32 nLen )
-{
-DBG_CTOR( UniString, DbgCheckUniString );
-OSL_ENSURE(nLen = STRING_MAXLEN, Overflowing UniString);
-
-mpData = NULL;
-rtl_string2UString( (rtl_uString **)(mpData),
-pUTF8Str, nLen,
-RTL_TEXTENCODING_UTF8,
-RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE |
-RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
-RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT );
-}
-
-// ===
-
UniString::UniString( const ByteString rByteStr, rtl_TextEncoding
eTextEncoding, sal_uInt32 nCvtFlags )
{
DBG_CTOR( UniString, DbgCheckUniString );
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 3c2cd96..cb28021 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -354,8 +354,6 @@ class TOOLS_DLLPUBLIC UniString
{
friend class ByteString;
-TOOLS_DLLPRIVATE void InitStringRes( const sal_Char* pUTF8Str, sal_Int32
nLen );
-
private:
UniStringData* mpData;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4b0ad93aedebfb86cbdc93a1a1d761eb6f65d20a Author: Caolán McNamara caol...@redhat.com Date: Mon Feb 13 11:07:30 2012 + adapt hidden windows-only uses of toLower diff --git a/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx b/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx index 2e6..77c7594 100644 --- a/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx +++ b/binfilter/bf_svtools/source/misc/svt_restrictedpaths.cxx @@ -54,7 +54,7 @@ namespace binfilter #ifdef WNT // on windows, assume that the relevant file systems are case insensitive, // thus normalize the URL -m_sCheckURL = m_aSysLocale.GetCharClass().toLower( m_sCheckURL, 0, m_sCheckURL.Len() ); +m_sCheckURL = m_aSysLocale.GetCharClass().lowercase(m_sCheckURL); #endif } @@ -63,7 +63,7 @@ namespace binfilter #ifdef WNT // on windows, assume that the relevant file systems are case insensitive, // thus normalize the URL -String sApprovedURL( m_aSysLocale.GetCharClass().toLower( _rApprovedURL, 0, _rApprovedURL.Len() ) ); +String sApprovedURL( m_aSysLocale.GetCharClass().lowercase(_rApprovedURL) ); #else String sApprovedURL( _rApprovedURL ); #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/misc/svt_ehdl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 58f9f554d5fb9a3ca9a2b80038cdfa9d609a72d7
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jan 24 20:57:51 2012 +
String(String
diff --git a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
index 4db63b8..5b14396 100644
--- a/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
+++ b/binfilter/bf_svtools/source/misc/svt_ehdl.cxx
@@ -365,7 +365,7 @@ BOOL SfxErrorHandler::GetErrorString(
SolarMutexGuard aGuard;
BOOL bRet = FALSE;
-rStr=String(String(RTL_CONSTASCII_USTRINGPARAM($(CLASS)$(ERROR;
+rStr=rtl::OUString(RTL_CONSTASCII_USTRINGPARAM($(CLASS)$(ERROR)));
ResId *pResId = new ResId(nId, *pMgr);
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/config/svt_useroptions.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 1761e9c96eb2d673d77712c840a51c2679d169f1
Author: Caolán McNamara caol...@redhat.com
Date: Wed Nov 23 22:17:54 2011 +
remove EraseLeadingAndTrailingChars
diff --git a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
index 00f870a..976fa42 100644
--- a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
@@ -27,7 +27,7 @@
/
#include bf_svtools/useroptions.hxx
-
+#include comphelper/string.hxx
#include tools/debug.hxx
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Sequence.hxx
@@ -179,8 +179,7 @@ void SvtUserOptions_Impl::InitUserPropertyNames()
void SvtUserOptions_Impl::InitFullName()
{
-m_aFullName = GetFirstName();
-m_aFullName.EraseLeadingAndTrailingChars();
+m_aFullName = comphelper::string::strip(GetFirstName(), ' ');
if ( m_aFullName.Len() )
m_aFullName += ' ';
m_aFullName += GetLastName();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx |1
binfilter/inc/bf_starmath/dynary.hxx | 105 ++
binfilter/inc/bf_starmath/node.hxx|3
binfilter/inc/bf_starmath/symbol.hxx |2
4 files changed, 107 insertions(+), 4 deletions(-)
New commits:
commit da4705764d8192f5ee2a02fe19fd31d5ebf955bd
Author: Michael Stahl mst...@redhat.com
Date: Sat Nov 19 18:00:17 2011 +0100
binfilter: move dynary.hxx from tools here
should fix breakage from 89a783cde071d63120bfa63768b4680dd2e58fee
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
index 31b2235..eee90f4 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -42,7 +42,6 @@
#include tools/debug.hxx
#include tools/stack.hxx
#include tools/table.hxx
-#include tools/dynary.hxx
#include vcl/graph.hxx
#include vcl/virdev.hxx
#include tools/poly.hxx
diff --git a/binfilter/inc/bf_starmath/dynary.hxx
b/binfilter/inc/bf_starmath/dynary.hxx
new file mode 100644
index 000..7e17455
--- /dev/null
+++ b/binfilter/inc/bf_starmath/dynary.hxx
@@ -0,0 +1,105 @@
+/* -*- 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 _DYNARY_HXX
+#define _DYNARY_HXX
+
+#include tools/solar.h
+#include tools/contnr.hxx
+
+//
+// - DynArray -
+//
+
+#define DYNARRAY_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
+
+class DynArray : private Container
+{
+public:
+using Container::SetSize;
+using Container::GetSize;
+using Container::Clear;
+
+DynArray( sal_uIntPtr nSize = 16 ) : Container( nSize ) {}
+DynArray( const DynArray rAry ) : Container( rAry ) {}
+
+void* Put( sal_uIntPtr nIndex, void* p )
+{ return Container::Replace( p, nIndex ); }
+void* Get( sal_uIntPtr nIndex ) const
+{ return Container::GetObject( nIndex ); }
+
+sal_uIntPtr GetIndex( const void* p ) const
+{ return Container::GetPos( p ); }
+
+DynArray operator =( const DynArray rAry )
+{ Container::operator =( rAry ); return *this; }
+
+sal_Booloperator ==( const DynArray rAry ) const
+{ return Container::operator ==( rAry ); }
+sal_Booloperator !=( const DynArray rAry ) const
+{ return Container::operator !=( rAry ); }
+};
+
+//
+// - DECLARE_DYNARRAY -
+//
+
+#define DECLARE_DYNARRAY( ClassName, Type ) \
+class ClassName : private DynArray \
+{ \
+public: \
+using DynArray::SetSize;\
+using DynArray::GetSize;\
+using DynArray::Clear; \
+\
+ClassName( sal_uIntPtr nSize = 16 ) : \
+DynArray( nSize ) {}\
+ClassName( const ClassName rClassName ) : \
+DynArray( rClassName ) {} \
+\
+TypePut( sal_uIntPtr nIndex, Type p ) \
+{ return (Type)DynArray::Put( nIndex, (void*)p ); } \
+
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_xmloff
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx |1
binfilter/bf_svtools/source/config/svt_itemholder1.cxx |1
binfilter/bf_svtools/source/config/svt_itemholder2.cxx |1
binfilter/bf_svtools/source/config/svt_pathoptions.cxx | 21
++
binfilter/bf_svtools/source/config/svt_useroptions.cxx | 11
-
binfilter/bf_svtools/source/filter.vcl/filter/svt_FilterConfigItem.cxx |5
+-
binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx| 14
++
7 files changed, 14 insertions(+), 40 deletions(-)
New commits:
commit 533e3c648db45ba7c7804928a5759e2b60fdb9a2
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Nov 11 22:48:55 2011 +0100
Heavily simplified utl::ConfigManager.
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index 4082d8b..b101b63 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -200,7 +200,6 @@ Sequence OUString GetDefaultPropertyNames()
SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() : ConfigItem(
ASCII_STR(Office.Common/Path/Default) )
{
-/*ConfigManager* pCfgMgr =*/ ConfigManager::GetConfigManager();
Sequence OUString aNames = GetDefaultPropertyNames();
Sequence Any aValues = GetProperties( aNames );
EnableNotification( aNames );
diff --git a/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
b/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
index fa18956..68287e7 100644
--- a/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
+++ b/binfilter/bf_svtools/source/config/svt_itemholder1.cxx
@@ -94,7 +94,6 @@ ItemHolder1::ItemHolder1()
if (xCfg.is())
xCfg-addEventListener(static_cast css::lang::XEventListener*
(this));
}
-// #i37892 got errorhandling from ConfigManager::GetConfigurationProvider()
#ifdef DBG_UTIL
catch(css::uno::Exception rEx)
{
diff --git a/binfilter/bf_svtools/source/config/svt_itemholder2.cxx
b/binfilter/bf_svtools/source/config/svt_itemholder2.cxx
index 1aa981f..bdbe347 100644
--- a/binfilter/bf_svtools/source/config/svt_itemholder2.cxx
+++ b/binfilter/bf_svtools/source/config/svt_itemholder2.cxx
@@ -78,7 +78,6 @@ ItemHolder2::ItemHolder2()
if (xCfg.is())
xCfg-addEventListener(static_cast css::lang::XEventListener*
(this));
}
-// #i37892 got errorhandling from ConfigManager::GetConfigurationProvider()
catch(css::uno::RuntimeException rREx)
{
throw rREx;
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index 54ea6ae..1c86baf 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -512,22 +512,11 @@ SvtPathOptions_Impl::SvtPathOptions_Impl() :
}
// Set language type!
-Any aLocale = ConfigManager::GetConfigManager().GetDirectConfigProperty(
ConfigManager::LOCALE );
-OUString aLocaleStr;
-if ( aLocale = aLocaleStr )
-{
-sal_Int32 nIndex = 0;
-m_aLocale.Language = aLocaleStr.getToken(0, '-', nIndex );
-m_aLocale.Country = aLocaleStr.getToken(0, '-', nIndex );
-m_aLocale.Variant = aLocaleStr.getToken(0, '-', nIndex );
-}
-else
-{
-DBG_ERRORFILE( wrong any type );
-m_aLocale.Language = OStringToOUString(OString(en),
RTL_TEXTENCODING_UTF8);
-m_aLocale.Country = OStringToOUString(OString(US),
RTL_TEXTENCODING_UTF8);
-m_aLocale.Variant = OStringToOUString(OString(),
RTL_TEXTENCODING_UTF8);
-}
+OUString aLocaleStr( ConfigManager::getLocale() );
+sal_Int32 nIndex = 0;
+m_aLocale.Language = aLocaleStr.getToken(0, '-', nIndex );
+m_aLocale.Country = aLocaleStr.getToken(0, '-', nIndex );
+m_aLocale.Variant = aLocaleStr.getToken(0, '-', nIndex );
}
// ---
diff --git a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
index d358f86..00f870a 100644
--- a/binfilter/bf_svtools/source/config/svt_useroptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_useroptions.cxx
@@ -28,7 +28,6 @@
#include bf_svtools/useroptions.hxx
-#include unotools/configmgr.hxx
#include tools/debug.hxx
#include com/sun/star/uno/Any.hxx
#include com/sun/star/uno/Sequence.hxx
@@ -73,7 +72,6 @@ private:
String m_aEmptyString;
String m_aFullName;
-String m_aLocale;
sal_Boolm_bIsROCompany;
sal_Boolm_bIsROFirstName;
@@ -128,7 +126,6 @@ public:
const String GetApartment() const { return m_aApartment; }
const String GetFullName();
-const String GetLocale() const
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx
binfilter/bf_svtools/source/items1/svt_poolio.cxx |7 ---
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx |1 -
2 files changed, 8 deletions(-)
New commits:
commit e8c71c5ae20d33f8aa3bf67296b71c955fd11b34
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Oct 24 13:02:29 2011 +0200
Removed erroneously pushed debug printfs.
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 98c5cce..0d453dc 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -114,7 +114,6 @@ void SfxItemPool::readTheItems (
SvStream rStream, USHORT nItemCount, USHORT nVersion,
SfxPoolItem * pDefItem, SfxPoolItemArray_Impl ** ppArr)
{
-/*SB*/fprintf(stderr,SfxItemPool::readTheItems %d
%d\n,(int)nItemCount,(int)nVersion);
SfxMultiRecordReader aItemsRec( rStream, SFX_ITEMPOOL_REC_ITEMS );
SfxPoolItemArray_Impl *pNewArr = new SfxPoolItemArray_Impl( nItemCount );
@@ -137,7 +136,6 @@ void SfxItemPool::readTheItems (
USHORT nRef(0);
rStream nRef;
-/*SB*/fprintf(stderr,... X\n);
pItem = pDefItem-Create(rStream, nVersion);
pNewArr-C40_INSERT(SfxPoolItem, pItem, nSurrogate);
@@ -371,10 +369,8 @@ SvStream SfxItemPool::Load(SvStream rStream)
nWhich = GetNewWhich( nWhich );
// unbekanntes Item aus neuerer Version
-/*SB*/fprintf(stderr,nWhich = %d\n,(int)nWhich);
if ( !IsInRange(nWhich) )
continue;
-/*SB*/fprintf(stderr, ,,,\n);
rStream nVersion;
rStream nCount;
@@ -1163,7 +1159,6 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream
rStream, bool bDirect,
{
USHORT nWhich=0, nSlot=0; // nSurrogate;
rStream nWhich nSlot;
-/*SB*/fprintf(stderr,A nWhich = %d\n,(int)nWhich);
BOOL bDontPut = (SfxItemPool*)-1 == pRefPool;
if ( bDontPut || !pRefPool )
@@ -1193,7 +1188,6 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream
rStream, bool bDirect,
if ( !bCurVersion )
// Which-Id auf neue Version mappen
nWhich = pRefPool-GetNewWhich( nWhich );
-/*SB*/fprintf(stderr,B nWhich = %d\n,(int)nWhich);
DBG_ASSERT( !nWhich || !pImp-bInSetItem ||
!pRefPool-ppStaticDefaults[pRefPool-GetIndex_Impl(nWhich)]-ISA(SfxSetItem),
@@ -1227,7 +1221,6 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream
rStream, bool bDirect,
// Item direkt laden
SfxPoolItem *pNewItem =
pRefPool-GetDefaultItem(nWhich).Create(rStream, nVersion);
-/*SB*/fprintf(stderr,C nWhich = %d, pNewItem = %p\n,(int)nWhich,pNewItem);
if ( bDontPut )
pItem = pNewItem;
else
diff --git a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
index 5c2f357..3f11fd3 100644
--- a/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
+++ b/binfilter/bf_svx/source/xoutdev/svx_xattr.cxx
@@ -3880,7 +3880,6 @@ const XHatch XFillHatchItem::GetValue() const
/*N*/ SfxPoolItem* XFillAttrSetItem::Create( SvStream rStream, USHORT
/*nVersion*/ ) const
/*N*/ {
-/*SB*/fprintf(stderr,XFillAttrSetItem::Create\n);
/*N*/ SfxItemSet* _pSet = new SfxItemSet( *GetItemSet().GetPool(),
/*N*/ XATTR_FILL_FIRST, XATTR_FILL_LAST);
/*N*/ _pSet-Load( rStream );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_svtools/source/items1/svt_poolio.cxx |7 +++
binfilter/bf_svx/source/form/svx_fmobj.cxx|2 +-
binfilter/bf_svx/source/svdraw/svx_svdobj.cxx |2 +-
binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx|6 ++
binfilter/bf_svx/source/svdraw/svx_svdouno.cxx|2 +-
binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx|2 +-
binfilter/bf_svx/source/xoutdev/svx__ximp.cxx |6 +++---
binfilter/bf_svx/source/xoutdev/svx_xattr.cxx |1 +
binfilter/inc/bf_svx/svdouno.hxx |2 +-
binfilter/inc/bf_svx/svdpntv.hxx |2 +-
binfilter/inc/bf_svx/xoutx.hxx|2 +-
11 files changed, 20 insertions(+), 14 deletions(-)
New commits:
commit 61a94140d55feca593ba6a85984d40678f9de2ac
Author: Stephan Bergmann sberg...@redhat.com
Date: Sat Oct 15 11:23:34 2011 +0200
Some more warning cleanup.
diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
index 0d453dc..98c5cce 100644
--- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx
+++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx
@@ -114,6 +114,7 @@ void SfxItemPool::readTheItems (
SvStream rStream, USHORT nItemCount, USHORT nVersion,
SfxPoolItem * pDefItem, SfxPoolItemArray_Impl ** ppArr)
{
+/*SB*/fprintf(stderr,SfxItemPool::readTheItems %d
%d\n,(int)nItemCount,(int)nVersion);
SfxMultiRecordReader aItemsRec( rStream, SFX_ITEMPOOL_REC_ITEMS );
SfxPoolItemArray_Impl *pNewArr = new SfxPoolItemArray_Impl( nItemCount );
@@ -136,6 +137,7 @@ void SfxItemPool::readTheItems (
USHORT nRef(0);
rStream nRef;
+/*SB*/fprintf(stderr,... X\n);
pItem = pDefItem-Create(rStream, nVersion);
pNewArr-C40_INSERT(SfxPoolItem, pItem, nSurrogate);
@@ -369,8 +371,10 @@ SvStream SfxItemPool::Load(SvStream rStream)
nWhich = GetNewWhich( nWhich );
// unbekanntes Item aus neuerer Version
+/*SB*/fprintf(stderr,nWhich = %d\n,(int)nWhich);
if ( !IsInRange(nWhich) )
continue;
+/*SB*/fprintf(stderr, ,,,\n);
rStream nVersion;
rStream nCount;
@@ -1159,6 +1163,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream
rStream, bool bDirect,
{
USHORT nWhich=0, nSlot=0; // nSurrogate;
rStream nWhich nSlot;
+/*SB*/fprintf(stderr,A nWhich = %d\n,(int)nWhich);
BOOL bDontPut = (SfxItemPool*)-1 == pRefPool;
if ( bDontPut || !pRefPool )
@@ -1188,6 +1193,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream
rStream, bool bDirect,
if ( !bCurVersion )
// Which-Id auf neue Version mappen
nWhich = pRefPool-GetNewWhich( nWhich );
+/*SB*/fprintf(stderr,B nWhich = %d\n,(int)nWhich);
DBG_ASSERT( !nWhich || !pImp-bInSetItem ||
!pRefPool-ppStaticDefaults[pRefPool-GetIndex_Impl(nWhich)]-ISA(SfxSetItem),
@@ -1221,6 +1227,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream
rStream, bool bDirect,
// Item direkt laden
SfxPoolItem *pNewItem =
pRefPool-GetDefaultItem(nWhich).Create(rStream, nVersion);
+/*SB*/fprintf(stderr,C nWhich = %d, pNewItem = %p\n,(int)nWhich,pNewItem);
if ( bDontPut )
pItem = pNewItem;
else
diff --git a/binfilter/bf_svx/source/form/svx_fmobj.cxx
b/binfilter/bf_svx/source/form/svx_fmobj.cxx
index 76f2b23..4033a9a 100644
--- a/binfilter/bf_svx/source/form/svx_fmobj.cxx
+++ b/binfilter/bf_svx/source/form/svx_fmobj.cxx
@@ -56,7 +56,7 @@ using namespace ::binfilter::svxform;
//--
/*N*/ FmFormObj::FmFormObj(sal_Int32 _nType)
-/*N*/ :SdrUnoObj(String(), sal_False)
+/*N*/ :SdrUnoObj(sal_False)
/*N*/ ,pTempView(0)
/*N*/ ,nEvent(0)
/*N*/ ,nPos(-1)
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
index ce31226..48bf941 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx
@@ -2966,7 +2966,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
/*?*/ case USHORT(OBJ_FRAME ): pObj=new SdrOle2Obj(TRUE);
break;
/*N*/ case USHORT(OBJ_CAPTION): pObj=new SdrCaptionObj;
break;
/*N*/ case USHORT(OBJ_PAGE ): pObj=new SdrPageObj;
break;
-/*?*/ case USHORT(OBJ_UNO): pObj=new SdrUnoObj(String());
break;
+/*?*/ case USHORT(OBJ_UNO): pObj=new SdrUnoObj;break;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
index d48b9a1..36ed782 100644
--- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
+++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx
@@ -352,12 +352,10 @@ namespace binfilter {
/*N*/ void
